From 2ea44010b225b32705ca21fe2a7cf491fc0c1f4f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 10:17:11 -0500 Subject: Creating some massive debugging on basically every event from these folks. We want to know it all. --- libdbusmenu-glib/client.c | 30 +++++++++++++++++++++++++++++- libdbusmenu-glib/menuitem.c | 24 ++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index e2679e1..be80886 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -322,6 +322,10 @@ layout_update (DBusGProxy * proxy, gint revision, DbusmenuClient * client) static void id_prop_update (DBusGProxy * proxy, guint id, gchar * property, gchar * value, DbusmenuClient * client) { + #ifdef MASSIVEDEBUGGING + g_debug("Property change sent to client for item %d property %s value %s", id, property, value); + #endif + DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); g_return_if_fail(priv->root != NULL); @@ -337,6 +341,10 @@ id_prop_update (DBusGProxy * proxy, guint id, gchar * property, gchar * value, D static void id_update (DBusGProxy * proxy, guint id, DbusmenuClient * client) { + #ifdef MASSIVEDEBUGGING + g_debug("Client side ID update: %d", id); + #endif + DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); g_return_if_fail(priv->root != NULL); @@ -414,6 +422,9 @@ proxy_destroyed (GObject * gobj_proxy, gpointer userdata) if (priv->root != NULL) { g_object_unref(G_OBJECT(priv->root)); priv->root = NULL; + #ifdef MASSIVEDEBUGGING + g_debug("Proxies destroyed, signaling a root change and a layout update."); + #endif g_signal_emit(G_OBJECT(userdata), signals[ROOT_CHANGED], 0, NULL, TRUE); g_signal_emit(G_OBJECT(userdata), signals[LAYOUT_UPDATED], 0, TRUE); } @@ -598,6 +609,9 @@ menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GEr handled = newfunc(propdata->item, propdata->parent, propdata->client); } + #ifdef MASSIVEDEBUGGING + g_debug("Client has realized a menuitem: %d", dbusmenu_meunitem_get_id(propdata->item)); + #endif g_signal_emit(G_OBJECT(propdata->item), DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID, 0, TRUE); if (!handled) { @@ -635,7 +649,9 @@ static DbusmenuMenuitem * parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * item, DbusmenuMenuitem * parent, DBusGProxy * proxy) { guint id = parse_node_get_id(node); - /* g_debug("Looking at node with id: %d", id); */ + #ifdef MASSIVEDEBUGGING + g_debug("Client looking at node with id: %d", id); + #endif if (item == NULL || dbusmenu_menuitem_get_id(item) != id || id == 0) { if (item != NULL) { if (parent != NULL) { @@ -699,7 +715,9 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it GList * oldchildleft = NULL; for (oldchildleft = oldchildren; oldchildleft != NULL; oldchildleft = g_list_next(oldchildleft)) { DbusmenuMenuitem * oldmi = DBUSMENU_MENUITEM(oldchildleft->data); + #ifdef MASSIVEDEBUGGING g_debug("Unref'ing menu item with layout update. ID: %d", dbusmenu_menuitem_get_id(oldmi)); + #endif g_object_unref(G_OBJECT(oldmi)); } g_list_free(oldchildren); @@ -712,6 +730,10 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it static gint parse_layout (DbusmenuClient * client, const gchar * layout) { + #ifdef MASSIVEDEBUGGING + g_debug("Client Parsing a new layout"); + #endif + DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); xmlDocPtr xmldoc; @@ -730,6 +752,9 @@ parse_layout (DbusmenuClient * client, const gchar * layout) } if (priv->root != oldroot) { + #ifdef MASSIVEDEBUGGING + g_debug("Client signaling root changed."); + #endif g_signal_emit(G_OBJECT(client), signals[ROOT_CHANGED], 0, priv->root, TRUE); } @@ -764,6 +789,9 @@ update_layout_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) priv->my_revision = rev; /* g_debug("Root is now: 0x%X", (unsigned int)priv->root); */ + #ifdef MASSIVEDEBUGGING + g_debug("Client signaling layout has changed."); + #endif g_signal_emit(G_OBJECT(client), signals[LAYOUT_UPDATED], 0, TRUE); if (priv->my_revision < priv->current_revision) { diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 0c44e3c..a6dba37 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -362,6 +362,9 @@ dbusmenu_menuitem_get_children (DbusmenuMenuitem * mi) static void take_children_signal (gpointer data, gpointer user_data) { + #ifdef MASSIVEDEBUGGING + g_debug("Menuitem %d signalling child removed %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(data)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(user_data))); + #endif g_signal_emit(G_OBJECT(user_data), signals[CHILD_REMOVED], 0, DBUSMENU_MENUITEM(data), TRUE); return; } @@ -438,6 +441,9 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_append(priv->children, child); + #ifdef MASSIVEDEBUGGING + g_debug("Menuitem %d signalling child added %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child))); + #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, g_list_length(priv->children) - 1, TRUE); return TRUE; } @@ -460,6 +466,9 @@ dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_prepend(priv->children, child); + #ifdef MASSIVEDEBUGGING + g_debug("Menuitem %d signalling child added %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child))); + #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, 0, TRUE); return TRUE; } @@ -483,6 +492,9 @@ dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_remove(priv->children, child); + #ifdef MASSIVEDEBUGGING + g_debug("Menuitem %d signalling child removed %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child))); + #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_REMOVED], 0, child, TRUE); return TRUE; } @@ -507,6 +519,9 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_insert(priv->children, child, position); + #ifdef MASSIVEDEBUGGING + g_debug("Menuitem %d signalling child added %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child))); + #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, position, TRUE); return TRUE; } @@ -543,6 +558,9 @@ dbusmenu_menuitem_child_reorder(DbusmenuMenuitem * mi, DbusmenuMenuitem * child, priv->children = g_list_remove(priv->children, child); priv->children = g_list_insert(priv->children, child, position); + #ifdef MASSIVEDEBUGGING + g_debug("Menuitem %d signalling child moved %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child))); + #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_MOVED], 0, child, position, oldpos, TRUE); return TRUE; @@ -658,6 +676,9 @@ dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, c gchar * lval = g_strdup(value); g_hash_table_insert(priv->properties, lprop, lval); + #ifdef MASSIVEDEBUGGING + g_debug("Menuitem %d signalling property '%s' changed to '%s'", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), property, value); + #endif g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, property, value, TRUE); return TRUE; @@ -882,6 +903,9 @@ void dbusmenu_menuitem_activate (DbusmenuMenuitem * mi) { g_return_if_fail(DBUSMENU_IS_MENUITEM(mi)); + #ifdef MASSIVEDEBUGGING + g_debug("Menuitem %d activated", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi))); + #endif g_signal_emit(G_OBJECT(mi), signals[ITEM_ACTIVATED], 0, TRUE); return; } -- cgit v1.2.3 From 7dbf3b82ca88a28453e3177b84bcc76f05283141 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 12:01:54 -0500 Subject: Another, typo --- libdbusmenu-glib/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index be80886..de01146 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -610,7 +610,7 @@ menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GEr } #ifdef MASSIVEDEBUGGING - g_debug("Client has realized a menuitem: %d", dbusmenu_meunitem_get_id(propdata->item)); + g_debug("Client has realized a menuitem: %d", dbusmenu_menuitem_get_id(propdata->item)); #endif g_signal_emit(G_OBJECT(propdata->item), DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID, 0, TRUE); -- cgit v1.2.3 From 4c62a2032479fd4596042711556ef4964bfe6b61 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 12:09:47 -0500 Subject: Got our cast on backwards. --- libdbusmenu-glib/menuitem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index a6dba37..4146bda 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -363,7 +363,7 @@ static void take_children_signal (gpointer data, gpointer user_data) { #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d signalling child removed %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(data)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(user_data))); + g_debug("Menuitem %d signalling child removed %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(user_data)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(data))); #endif g_signal_emit(G_OBJECT(user_data), signals[CHILD_REMOVED], 0, DBUSMENU_MENUITEM(data), TRUE); return; -- cgit v1.2.3 From 68ffd551dc9155e61a1a9e1927c1b43214448a09 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 12:21:31 -0500 Subject: Being more explicity about the position that things are placed in. --- libdbusmenu-glib/menuitem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 4146bda..4d68aff 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -442,7 +442,7 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_append(priv->children, child); #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d signalling child added %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child))); + g_debug("Menuitem %d signalling child added %d at %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child)), g_list_length(priv->children) - 1); #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, g_list_length(priv->children) - 1, TRUE); return TRUE; @@ -467,7 +467,7 @@ dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_prepend(priv->children, child); #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d signalling child added %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child))); + g_debug("Menuitem %d signalling child added %d at %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child)), 0); #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, 0, TRUE); return TRUE; @@ -520,7 +520,7 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_insert(priv->children, child, position); #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d signalling child added %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child))); + g_debug("Menuitem %d signalling child added %d at %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child)), position); #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, position, TRUE); return TRUE; @@ -559,7 +559,7 @@ dbusmenu_menuitem_child_reorder(DbusmenuMenuitem * mi, DbusmenuMenuitem * child, priv->children = g_list_insert(priv->children, child, position); #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d signalling child moved %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child))); + g_debug("Menuitem %d signalling child %d moved from %d to %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child)), oldpos, position); #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_MOVED], 0, child, position, oldpos, TRUE); -- cgit v1.2.3 From 814c6b73f011a0bc6dbd6ed444869caedd1f0d6c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 12:24:17 -0500 Subject: Truncating property values if they're too long. --- libdbusmenu-glib/menuitem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 4d68aff..4346743 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -677,7 +677,7 @@ dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, c g_hash_table_insert(priv->properties, lprop, lval); #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d signalling property '%s' changed to '%s'", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), property, value); + g_debug("Menuitem %d signalling property '%s' changed to '%s'", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), property, g_utf8_strlen(value, 50) < 25 ? value : ""); #endif g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, property, value, TRUE); -- cgit v1.2.3 From 9efd8c2c35b87625e3fc3539fb074869a9ece8b5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 12:33:13 -0500 Subject: Adding labels to all of the printout lines to make it easier to debug. --- libdbusmenu-glib/menuitem.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 4346743..bfc1a20 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -32,6 +32,11 @@ License version 3 and version 2.1 along with this program. If not, see #include "menuitem.h" #include "menuitem-marshal.h" +#ifdef MASSIVEDEBUGGING +#define LABEL(x) dbusmenu_menuitem_property_get(DBUSMENU_MENUITEM(x), DBUSMENU_MENUITEM_PROP_LABEL) +#define ID(x) dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(x)) +#endif + /* Private */ /** DbusmenuMenuitemPrivate: @@ -363,7 +368,7 @@ static void take_children_signal (gpointer data, gpointer user_data) { #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d signalling child removed %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(user_data)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(data))); + g_debug("Menuitem %d (%s) signalling child removed %d (%s)", ID(user_data), LABEL(user_data), ID(data), LABEL(data)); #endif g_signal_emit(G_OBJECT(user_data), signals[CHILD_REMOVED], 0, DBUSMENU_MENUITEM(data), TRUE); return; @@ -442,7 +447,7 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_append(priv->children, child); #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d signalling child added %d at %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child)), g_list_length(priv->children) - 1); + g_debug("Menuitem %d (%s) signalling child added %d (%s) at %d", ID(mi), LABEL(mi), ID(child), LABEL(child), g_list_length(priv->children) - 1); #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, g_list_length(priv->children) - 1, TRUE); return TRUE; @@ -467,7 +472,7 @@ dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_prepend(priv->children, child); #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d signalling child added %d at %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child)), 0); + g_debug("Menuitem %d (%s) signalling child added %d (%s) at %d", ID(mi), LABEL(mi), ID(child), LABEL(child), 0); #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, 0, TRUE); return TRUE; @@ -493,7 +498,7 @@ dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_remove(priv->children, child); #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d signalling child removed %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child))); + g_debug("Menuitem %d (%s) signalling child removed %d (%s)", ID(mi), LABEL(mi), ID(child), LABEL(child)); #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_REMOVED], 0, child, TRUE); return TRUE; @@ -520,7 +525,7 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_insert(priv->children, child, position); #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d signalling child added %d at %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child)), position); + g_debug("Menuitem %d (%s) signalling child added %d (%s) at %d", ID(mi), LABEL(mi), ID(child), LABEL(child), position); #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, position, TRUE); return TRUE; @@ -559,7 +564,7 @@ dbusmenu_menuitem_child_reorder(DbusmenuMenuitem * mi, DbusmenuMenuitem * child, priv->children = g_list_insert(priv->children, child, position); #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d signalling child %d moved from %d to %d", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(child)), oldpos, position); + g_debug("Menuitem %d (%s) signalling child %d (%s) moved from %d to %d", ID(mi), LABEL(mi), ID(child), LABEL(child), oldpos, position); #endif g_signal_emit(G_OBJECT(mi), signals[CHILD_MOVED], 0, child, position, oldpos, TRUE); @@ -677,7 +682,7 @@ dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, c g_hash_table_insert(priv->properties, lprop, lval); #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d signalling property '%s' changed to '%s'", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi)), property, g_utf8_strlen(value, 50) < 25 ? value : ""); + g_debug("Menuitem %d (%s) signalling property '%s' changed to '%s'", ID(mi), LABEL(mi), property, g_utf8_strlen(value, 50) < 25 ? value : ""); #endif g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, property, value, TRUE); @@ -904,7 +909,7 @@ dbusmenu_menuitem_activate (DbusmenuMenuitem * mi) { g_return_if_fail(DBUSMENU_IS_MENUITEM(mi)); #ifdef MASSIVEDEBUGGING - g_debug("Menuitem %d activated", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(mi))); + g_debug("Menuitem %d (%s) activated", ID(mi), LABEL(mi)); #endif g_signal_emit(G_OBJECT(mi), signals[ITEM_ACTIVATED], 0, TRUE); return; -- cgit v1.2.3 From 06366b84231af30bff721c70b7178e35e75f014e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 12:47:54 -0500 Subject: Axing long props --- libdbusmenu-glib/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index de01146..2c5e571 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -323,7 +323,7 @@ static void id_prop_update (DBusGProxy * proxy, guint id, gchar * property, gchar * value, DbusmenuClient * client) { #ifdef MASSIVEDEBUGGING - g_debug("Property change sent to client for item %d property %s value %s", id, property, value); + g_debug("Property change sent to client for item %d property %s value %s", id, property, g_utf8_strlen(value, 50) < 25 ? value : ""); #endif DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); -- cgit v1.2.3 From 117c858195254ad2debaaf0edc116d85f6d8c4f5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 13:17:16 -0500 Subject: Printing out the position when we ask for it. --- libdbusmenu-glib/menuitem.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index bfc1a20..5088efb 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -425,6 +425,10 @@ dbusmenu_menuitem_get_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent if (childs == NULL) return 0; + #ifdef MASSIVEDEBUG + g_debug("Getting position of %d (%s), it's at: %d", ID(mi), LABEL(mi), count); + #endif + return count; } -- cgit v1.2.3 From b460b4f1596852355cfbf8828160f8e221547c3a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 13:43:41 -0500 Subject: Adding in printing for type handlers and getting root. --- libdbusmenu-glib/client.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 2c5e571..1a018a8 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -880,6 +880,10 @@ dbusmenu_client_get_root (DbusmenuClient * client) return NULL; } + #ifdef MASSIVEDEBUGGING + g_debug("Client get root: %X", (guint)priv->root); + #endif + return priv->root; } @@ -912,6 +916,10 @@ dbusmenu_client_add_type_handler (DbusmenuClient * client, const gchar * type, D DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); + #ifdef MASSIVEDEBUGGING + g_debug("Adding a type handler for '%s'", type); + #endif + if (priv->type_handlers == NULL) { g_warning("Type handlers hashtable not built"); return FALSE; -- cgit v1.2.3 From 79f2db841bd7c24631c0c7d24ce2a6ddda46b53b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 13:51:07 -0500 Subject: More getting messages in get_position --- libdbusmenu-glib/menuitem.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 5088efb..47b59a2 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -412,6 +412,11 @@ dbusmenu_menuitem_take_children (DbusmenuMenuitem * mi) guint dbusmenu_menuitem_get_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent) { + #ifdef MASSIVEDEBUG + if (!DBUSMENU_IS_MENUITEM(mi)) g_warning("Getting position of %d (%s), it's at: %d (mi fail)", ID(mi), LABEL(mi), 0); + if (!DBUSMENU_IS_MENUITEM(parent)) g_warning("Getting position of %d (%s), it's at: %d (parent fail)", ID(mi), LABEL(mi), 0); + #endif + /* TODO: I'm not too happy returning zeros here. But that's all I've got */ g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), 0); g_return_val_if_fail(DBUSMENU_IS_MENUITEM(parent), 0); -- cgit v1.2.3 From 0f3d719fc377db5ee37b100c9750545cb014b7ce Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 14:23:35 -0500 Subject: Typo in define name --- libdbusmenu-glib/menuitem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 47b59a2..fdf5608 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -412,7 +412,7 @@ dbusmenu_menuitem_take_children (DbusmenuMenuitem * mi) guint dbusmenu_menuitem_get_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent) { - #ifdef MASSIVEDEBUG + #ifdef MASSIVEDEBUGGING if (!DBUSMENU_IS_MENUITEM(mi)) g_warning("Getting position of %d (%s), it's at: %d (mi fail)", ID(mi), LABEL(mi), 0); if (!DBUSMENU_IS_MENUITEM(parent)) g_warning("Getting position of %d (%s), it's at: %d (parent fail)", ID(mi), LABEL(mi), 0); #endif @@ -430,7 +430,7 @@ dbusmenu_menuitem_get_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent if (childs == NULL) return 0; - #ifdef MASSIVEDEBUG + #ifdef MASSIVEDEBUGGING g_debug("Getting position of %d (%s), it's at: %d", ID(mi), LABEL(mi), count); #endif -- cgit v1.2.3