summaryrefslogtreecommitdiffstats
path: root/vcl/unx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-04-11 23:59:36 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-04-17 16:25:57 +0200
commit74eca0778402a966ee628c998555d4512e6a5048 (patch)
tree138e089777c4aaf305bb4c31a3883975a08359ed /vcl/unx
parentmove gtkframe to gtksalframe to match class name (diff)
downloadcore-74eca0778402a966ee628c998555d4512e6a5048.tar.gz
core-74eca0778402a966ee628c998555d4512e6a5048.zip
some more debug info
Change-Id: Icabdaab665ac969c9ba6240d2e825d1e62776249
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/gtk/window/gloactiongroup.cxx11
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx1
-rw-r--r--vcl/unx/gtk/window/gtksalmenu.cxx4
3 files changed, 16 insertions, 0 deletions
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx
index cce66c87c28f..810ac3d1035c 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
@@ -135,6 +135,7 @@ g_lo_action_group_query_action (GActionGroup *group,
GVariant **state_hint,
GVariant **state)
{
+ //SAL_INFO("vcl.unity", "g_lo_action_group_query_action on " << group);
GLOActionGroup *lo_group = G_LO_ACTION_GROUP (group);
GLOAction* action;
@@ -166,6 +167,8 @@ g_lo_action_group_perform_submenu_action (GLOActionGroup *group,
const gchar *action_name,
GVariant *state)
{
+ SAL_INFO("vcl.unity", "g_lo_action_group_perform_submenu_action on " << group);
+
GtkSalFrame* pFrame = group->priv->frame;
if (pFrame == NULL)
@@ -188,6 +191,7 @@ g_lo_action_group_change_state (GActionGroup *group,
const gchar *action_name,
GVariant *value)
{
+ SAL_INFO("vcl.unity", "g_lo_action_group_perform_submenu_action on " << group);
g_return_if_fail (value != NULL);
g_variant_ref_sink (value);
@@ -239,6 +243,7 @@ g_lo_action_group_activate (GActionGroup *group,
{
GLOActionGroup *lo_group = G_LO_ACTION_GROUP (group);
GtkSalFrame *pFrame = lo_group->priv->frame;
+ SAL_INFO("vcl.unity", "g_lo_action_group_activate on group " << group << " for frame " << pFrame << " with parameter " << parameter);
if ( parameter != NULL )
g_action_group_change_action_state( group, action_name, parameter );
@@ -246,10 +251,12 @@ g_lo_action_group_activate (GActionGroup *group,
if ( pFrame != NULL )
{
GtkSalMenu* pSalMenu = static_cast< GtkSalMenu* >( pFrame->GetMenu() );
+ SAL_INFO("vcl.unity", "g_lo_action_group_activate for menu " << pSalMenu);
if ( pSalMenu != NULL )
{
GLOAction* action = G_LO_ACTION (g_hash_table_lookup (lo_group->priv->table, action_name));
+ SAL_INFO("vcl.unity", "g_lo_action_group_activate dispatching action " << action << " named " << action_name << " on menu " << pSalMenu);
pSalMenu->DispatchCommand( action->item_id, action_name );
}
}
@@ -320,6 +327,7 @@ g_lo_action_group_finalize (GObject *object)
static void
g_lo_action_group_init (GLOActionGroup *group)
{
+ SAL_INFO("vcl.unity", "g_lo_action_group_init on " << group);
group->priv = G_TYPE_INSTANCE_GET_PRIVATE (group,
G_TYPE_LO_ACTION_GROUP,
GLOActionGroupPrivate);
@@ -361,6 +369,7 @@ g_lo_action_group_set_action_enabled (GLOActionGroup *group,
const gchar *action_name,
gboolean enabled)
{
+ SAL_INFO("vcl.unity", "g_lo_action_group_set_action_enabled on " << group);
g_return_if_fail (G_IS_LO_ACTION_GROUP (group));
g_return_if_fail (action_name != NULL);
@@ -378,6 +387,7 @@ void
g_lo_action_group_remove (GLOActionGroup *group,
const gchar *action_name)
{
+ SAL_INFO("vcl.unity", "g_lo_action_group_remove on " << group);
g_return_if_fail (G_IS_LO_ACTION_GROUP (group));
if (action_name != NULL)
@@ -390,6 +400,7 @@ g_lo_action_group_remove (GLOActionGroup *group,
void
g_lo_action_group_clear (GLOActionGroup *group)
{
+ SAL_INFO("vcl.unity", "g_lo_action_group_clear on " << group);
g_return_if_fail (G_IS_LO_ACTION_GROUP (group));
GList* keys = g_hash_table_get_keys (group->priv->table);
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index edb37a39388c..c659939babad 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -569,6 +569,7 @@ gboolean ensure_dbus_setup( gpointer data )
// Publish the menu model and the action group.
SAL_INFO("vcl.unity", "exporting menu model at " << pMenuModel << " for window " << windowId);
pSalFrame->m_nMenuExportId = g_dbus_connection_export_menu_model (pSessionBus, aDBusMenubarPath, pMenuModel, NULL);
+ SAL_INFO("vcl.unity", "exporting action group at " << pActionGroup << " for window " << windowId);
pSalFrame->m_nActionGroupExportId = g_dbus_connection_export_action_group( pSessionBus, aDBusPath, pActionGroup, NULL);
pSalFrame->m_nHudAwarenessId = hud_awareness_register( pSessionBus, aDBusMenubarPath, hud_activated, pSalFrame, NULL, NULL );
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 5ca2e47d84ed..c79aee25f8b3 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -249,12 +249,14 @@ void GtkSalMenu::ImplUpdate( gboolean bRecurse )
{
SolarMutexGuard aGuard;
+ SAL_INFO("vcl.unity", "ImplUpdate pre PrepUpdate");
if( !PrepUpdate() )
return;
Menu* pVCLMenu = mpVCLMenu;
GLOMenu* pLOMenu = G_LO_MENU( mpMenuModel );
GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP( mpActionGroup );
+ SAL_INFO("vcl.unity", "Syncing vcl menu " << pVCLMenu << " to menu model " << pLOMenu << " and action group " << pActionGroup);
GList *pOldCommandList = NULL;
GList *pNewCommandList = NULL;
@@ -348,6 +350,7 @@ void GtkSalMenu::ImplUpdate( gboolean bRecurse )
if ( bRecurse )
{
+ SAL_INFO("vcl.unity", "preparing submenu " << pSubMenuModel << " to menu model " << G_MENU_MODEL(pSubMenuModel) << " and action group " << G_ACTION_GROUP(pActionGroup));
pSubmenu->SetMenuModel( G_MENU_MODEL( pSubMenuModel ) );
pSubmenu->SetActionGroup( G_ACTION_GROUP( pActionGroup ) );
@@ -475,6 +478,7 @@ void GtkSalMenu::SetFrame( const SalFrame* pFrame )
GLOMenu* pMenuModel = G_LO_MENU( g_object_get_data( G_OBJECT( gdkWindow ), "g-lo-menubar" ) );
GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP( g_object_get_data( G_OBJECT( gdkWindow ), "g-lo-action-group" ) );
+ SAL_INFO("vcl.unity", "Found menu model: " << pMenuModel << " and action group: " << pActionGroup);
if ( pMenuModel )
{