From bc17eec1b436a9768a41414ac05d337d0872d147 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 30 Sep 2009 14:58:04 -0500 Subject: Not sure what this test was supposed to do, but it creates some items. Could be a good property test. Anyway, now it exits. --- tests/test-glib-simple-items.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/test-glib-simple-items.c b/tests/test-glib-simple-items.c index 56536e9..5b9f538 100644 --- a/tests/test-glib-simple-items.c +++ b/tests/test-glib-simple-items.c @@ -25,6 +25,13 @@ dummy_users (DbusmenuMenuitem * root) { return; } +static gboolean +quititall (gpointer data) +{ + g_main_quit(mainloop); + return FALSE; +} + int main (int argc, char ** argv) { @@ -37,6 +44,8 @@ main (int argc, char ** argv) dummy_users(root_menuitem); + g_timeout_add_seconds(1, quititall, NULL); + mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From ef964f38b92cc6151549fd5e7aed33776cdb567d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 30 Sep 2009 15:02:59 -0500 Subject: Cleaning up the tests so that they run and check their values in a friendly way. --- tests/Makefile.am | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8c47a93..e96098f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,12 +1,14 @@ SUBDIRS = dbusmenu-gtk -check: tests - DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf -tests: test-glib-layout test-glib-properties test-gtk-label test-glib-simple-items +TESTS = \ + test-glib-layout \ + test-glib-properties \ + test-gtk-label \ + test-glib-simple-items -libexec_PROGRAMS = \ +check_PROGRAMS = \ glib-server-nomenu \ test-glib-layout-client \ test-glib-layout-server \ @@ -27,10 +29,14 @@ glib_server_nomenu_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ $(DBUSMENUGLIB_LIBS) - +###################### +# Test Glib Layout +###################### test-glib-layout: test-glib-layout-client test-glib-layout-server - $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return + @echo "#!/bin/sh" > test-glib-layout + @echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> test-glib-layout + @chmod +x test-glib-layout test_glib_layout_server_SOURCES = \ test-glib-layout.h \ @@ -57,9 +63,14 @@ test_glib_layout_client_LDADD = \ $(DBUSMENUGLIB_LIBS) +###################### +# Test Glib Properties +###################### test-glib-properties: test-glib-properties-client test-glib-properties-server - $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return + @echo "#!/bin/sh" > test-glib-properties + @echo $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> test-glib-properties + @chmod +x test-glib-properties test_glib_properties_server_SOURCES = \ test-glib-properties.h \ @@ -85,6 +96,9 @@ test_glib_properties_client_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ $(DBUSMENUGLIB_LIBS) +######################### +# Test Glib Simple Items +######################### test_glib_simple_items_SOURCES = \ test-glib-simple-items.c @@ -97,9 +111,14 @@ test_glib_simple_items_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ $(DBUSMENUGLIB_LIBS) +######################### +# Test GTK Label +######################### test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json - $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return + @echo "#!/bin/sh" > test-gtk-label + @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-label + @chmod +x test-gtk-label test_gtk_label_server_SOURCES = \ test-gtk-label-server.c @@ -132,6 +151,9 @@ test_gtk_label_client_LDADD = \ $(DBUSMENUTESTS_LIBS) +######################### +# Other +######################### examplesdir = $(docdir)/examples/ -- cgit v1.2.3 From a0fffdde33cd9d1ceea852a20c3406e3166cc3f3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 30 Sep 2009 15:45:54 -0500 Subject: Ignoring generated test scripts --- .bzrignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.bzrignore b/.bzrignore index 08391f4..6cfba5d 100644 --- a/.bzrignore +++ b/.bzrignore @@ -42,3 +42,7 @@ dbusmenu.py mago.results test-glib-simple-items libdbusmenu-gtk/libdbusmenu_gtk_la-menuitem.lo +tests/test-glib-layout +tests/test-glib-properties +tests/test-gtk-label +tests/test-gtk-reorder-server.c -- cgit v1.2.3 From ad7737b4cec428bc1f97b1f2223e7b83be67f1e6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 30 Sep 2009 15:52:42 -0500 Subject: Building a test for reordering. --- .bzrignore | 2 + tests/Makefile.am | 30 ++++++++++++++- tests/test-gtk-reorder-server.c | 84 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 tests/test-gtk-reorder-server.c diff --git a/.bzrignore b/.bzrignore index 6cfba5d..37d9ae8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -46,3 +46,5 @@ tests/test-glib-layout tests/test-glib-properties tests/test-gtk-label tests/test-gtk-reorder-server.c +tests/test-gtk-reorder-server +tests/test-gtk-reorder diff --git a/tests/Makefile.am b/tests/Makefile.am index e96098f..ace4bf4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,7 +6,8 @@ TESTS = \ test-glib-layout \ test-glib-properties \ test-gtk-label \ - test-glib-simple-items + test-glib-simple-items \ + test-gtk-reorder check_PROGRAMS = \ glib-server-nomenu \ @@ -16,7 +17,8 @@ check_PROGRAMS = \ test-glib-properties-server \ test-gtk-label-client \ test-gtk-label-server \ - test-glib-simple-items + test-glib-simple-items \ + test-gtk-reorder-server glib_server_nomenu_SOURCES = \ glib-server-nomenu.c @@ -150,6 +152,30 @@ test_gtk_label_client_LDADD = \ $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) +######################### +# Test GTK Reorder +######################### + +test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server + @echo "#!/bin/sh" > test-gtk-reorder + @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-reorder + @chmod +x test-gtk-reorder + +test_gtk_reorder_server_SOURCES = \ + test-gtk-reorder-server.c + +test_gtk_reorder_server_CFLAGS = \ + -I $(srcdir)/.. \ + $(DBUSMENUGTK_CFLAGS) \ + $(DBUSMENUTESTS_CFLAGS) \ + $(DBUSMENUGLIB_CFLAGS) -Wall -Werror + +test_gtk_reorder_server_LDADD = \ + ../libdbusmenu-glib/libdbusmenu-glib.la \ + ../libdbusmenu-gtk/libdbusmenu-gtk.la \ + $(DBUSMENUGTK_LIBS) \ + $(DBUSMENUTESTS_LIBS) + ######################### # Other diff --git a/tests/test-gtk-reorder-server.c b/tests/test-gtk-reorder-server.c new file mode 100644 index 0000000..2d159f4 --- /dev/null +++ b/tests/test-gtk-reorder-server.c @@ -0,0 +1,84 @@ +/* +A test for libdbusmenu to ensure its quality. + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program. If not, see . +*/ + +#include + +#include +#include +#include +#include + +#include +#include + +static void +menuitem_click(DbusmenuMenuitem * mi, gpointer user_data) +{ + g_debug("Clicked on: %d", dbusmenu_menuitem_get_id(mi)); + return; +} + +static DbusmenuServer * server = NULL; +static GMainLoop * mainloop = NULL; + +static gboolean +timer_func (gpointer data) +{ + menuitem_click(NULL, NULL); + return FALSE; +} + +int +main (int argc, char ** argv) +{ + GError * error = NULL; + + g_type_init(); + + DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); + g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL)))); + + DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); + guint nameret = 0; + + if (!org_freedesktop_DBus_request_name(bus_proxy, "glib.label.test", 0, &nameret, &error)) { + g_error("Unable to call to request name"); + return 1; + } + + if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { + g_error("Unable to get name"); + return 1; + } + + server = dbusmenu_server_new("/org/test"); + + timer_func(NULL); + g_timeout_add_seconds(5, timer_func, NULL); + + mainloop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(mainloop); + + g_debug("Quiting"); + + return 0; +} + -- cgit v1.2.3 From d1e6a58edd604e1803374be9b59b7cd79e41042b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 30 Sep 2009 16:30:00 -0500 Subject: Making a bunch of reordering tests. No fails. --- tests/test-gtk-reorder-server.c | 50 ++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/tests/test-gtk-reorder-server.c b/tests/test-gtk-reorder-server.c index 2d159f4..1a2d713 100644 --- a/tests/test-gtk-reorder-server.c +++ b/tests/test-gtk-reorder-server.c @@ -29,12 +29,25 @@ with this program. If not, see . #include #include -static void -menuitem_click(DbusmenuMenuitem * mi, gpointer user_data) -{ - g_debug("Clicked on: %d", dbusmenu_menuitem_get_id(mi)); - return; -} +#define NUMBER_TESTS 5 +#define NUMBER_ENTRIES 5 + +guint ordering [NUMBER_TESTS][NUMBER_ENTRIES] = { + {0, 1, 2, 3, 4}, + {1, 2, 3, 4, 0}, + {3, 1, 4, 2, 0}, + {4, 3, 2, 1, 0}, + {0, 1, 2, 3, 4} +}; + +gchar * names [NUMBER_ENTRIES] = { + "One", "Two", "Three", "Four", "Five" +}; + +DbusmenuMenuitem * entries[NUMBER_ENTRIES] = {0}; +DbusmenuMenuitem * root = NULL; + +gint test = 0; static DbusmenuServer * server = NULL; static GMainLoop * mainloop = NULL; @@ -42,8 +55,21 @@ static GMainLoop * mainloop = NULL; static gboolean timer_func (gpointer data) { - menuitem_click(NULL, NULL); - return FALSE; + if (test == NUMBER_TESTS) { + g_main_quit(mainloop); + return FALSE; + } + + g_debug("Testing pattern %d", test); + + int i; + for (i = 0; i < NUMBER_ENTRIES; i++) { + dbusmenu_menuitem_child_reorder(root, entries[i], ordering[test][i]); + dbusmenu_menuitem_property_set(entries[i], "label", names[i]); + } + + test++; + return TRUE; } int @@ -70,6 +96,14 @@ main (int argc, char ** argv) } server = dbusmenu_server_new("/org/test"); + root = dbusmenu_menuitem_new(); + dbusmenu_server_set_root(server, root); + + int i; + for (i = 0; i < NUMBER_ENTRIES; i++) { + entries[i] = dbusmenu_menuitem_new(); + dbusmenu_menuitem_child_append(root, entries[i]); + } timer_func(NULL); g_timeout_add_seconds(5, timer_func, NULL); -- cgit v1.2.3 From ffc186aab01578f1380802958077acfbd966d768 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 30 Sep 2009 16:53:08 -0500 Subject: Adding a print out. But it still passses. --- tests/test-gtk-reorder-server.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test-gtk-reorder-server.c b/tests/test-gtk-reorder-server.c index 1a2d713..2fd9bf7 100644 --- a/tests/test-gtk-reorder-server.c +++ b/tests/test-gtk-reorder-server.c @@ -64,6 +64,7 @@ timer_func (gpointer data) int i; for (i = 0; i < NUMBER_ENTRIES; i++) { + g_debug("Putting entry '%d' at position '%d'", i, ordering[test][i]); dbusmenu_menuitem_child_reorder(root, entries[i], ordering[test][i]); dbusmenu_menuitem_property_set(entries[i], "label", names[i]); } -- cgit v1.2.3 From 1e19ab10790ca563234c30aa727106744e9a287c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 10:02:05 -0500 Subject: Adding in a massive debugging flag for generating massive debugging. --- configure.ac | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac index 0448f80..00085b3 100644 --- a/configure.ac +++ b/configure.ac @@ -83,6 +83,16 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default get AM_GLIB_GNU_GETTEXT +########################### +# Massive Debugging +########################### + +with_massivedebugging="no" +AC_ARG_ENABLE(massivedebugging, AS_HELP_STRING([--enable-massivedebugging], [Print out so much information your brain will hurt]), with_massivedebugging=$enableval, with_massivedebugging=no) +if test "x$with_massivedebugging" = "xyes"; then + AC_DEFINE([MASSIVEDBUGGING], [1], [Print everyting]) +fi + ########################### # Files ########################### @@ -109,5 +119,6 @@ AC_MSG_NOTICE([ libdbusmenu Configuration: Prefix: $prefix + Massive Debugging: $with_massivedebugging ]) -- cgit v1.2.3 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(-) 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