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 From 8844886e78007072117f2217c84f41033906751e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 10:21:47 -0500 Subject: debian/rules: Enabling massive debugging --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 791a8f7..7063cfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix1) UNRELEASED; urgency=low * Adding stuff, mostly debugging info + * debian/rules: Enabling massive debugging -- Ted Gould Thu, 01 Oct 2009 10:21:00 -0500 diff --git a/debian/rules b/debian/rules index 7f7f405..ebcbf31 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-massivedebugging LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk0 += -V 'libdbusmenu-gtk0 (>= 0.1.2)' -- cgit v1.2.3 From babe1961041c9c09ec16dd2e8010c7adb1f79ba7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 10:22:58 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2~bugfix1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7063cfb..63faba0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix1) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix1) karmic; urgency=low * Adding stuff, mostly debugging info * debian/rules: Enabling massive debugging - -- Ted Gould Thu, 01 Oct 2009 10:21:00 -0500 + -- Ted Gould Thu, 01 Oct 2009 10:22:56 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa1) karmic; urgency=low -- cgit v1.2.3 From 6ac0afb5f72cad7ec7f4bf2c123ae587eae0e54f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 11:59:21 -0500 Subject: Typo --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 00085b3..3e3b4fd 100644 --- a/configure.ac +++ b/configure.ac @@ -90,7 +90,7 @@ AM_GLIB_GNU_GETTEXT 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]) + AC_DEFINE([MASSIVEDEBUGGING], [1], [Print everyting]) fi ########################### -- 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(-) 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 161e7c3904951f093501a59b0c653d6ff17c7ff0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 12:03:31 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2~bugfix2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 568ee0c..ef8dfb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix2) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix2) karmic; urgency=low * Typo++ - -- Ted Gould Thu, 01 Oct 2009 11:59:36 -0500 + -- Ted Gould Thu, 01 Oct 2009 12:03:28 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix1) karmic; urgency=low -- 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(-) 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(-) 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(-) 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(-) 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 e0815cea6a6a45d7ff853797309f006a7fe002ae Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 12:36:46 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2~bugfix3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a7e8298..2f40b4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix3) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix3) karmic; urgency=low * Better messages - -- Ted Gould Thu, 01 Oct 2009 12:33:48 -0500 + -- Ted Gould Thu, 01 Oct 2009 12:36:44 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix2) karmic; urgency=low -- 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(-) 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(+) 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 ddef5c283ba3ea32701e59d4e2ce0fe4d2b93c34 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 13:19:47 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2~bugfix4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 85bb7c8..2312384 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix4) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix4) karmic; urgency=low * More debugging info - -- Ted Gould Thu, 01 Oct 2009 13:17:56 -0500 + -- Ted Gould Thu, 01 Oct 2009 13:19:44 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix3) karmic; urgency=low -- 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(+) 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 8bd2f70a979d0e0a6bc2f433dc69fd78e85d299b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 13:45:18 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2~bugfix5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1e4d16..84f356a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix5) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix5) karmic; urgency=low * More messages from client - -- Ted Gould Thu, 01 Oct 2009 13:43:57 -0500 + -- Ted Gould Thu, 01 Oct 2009 13:45:16 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix4) karmic; urgency=low -- 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(+) 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 25a7ba9fdee79959169f1acf2c31a14fa01260ff Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 13:54:22 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2~bugfix6 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 654ecca..122dcd8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix6) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix6) karmic; urgency=low * get_position messages - -- Ted Gould Thu, 01 Oct 2009 13:51:39 -0500 + -- Ted Gould Thu, 01 Oct 2009 13:54:20 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix5) karmic; urgency=low -- cgit v1.2.3 From 2ff78f4502e34fdaef08f0be11b020a8f564eabe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 14:15:52 -0500 Subject: Adding a couple massive debugging messages. --- libdbusmenu-gtk/client.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 901d739..35f5e61 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -195,6 +195,10 @@ new_menuitem (DbusmenuClient * client, DbusmenuMenuitem * mi, gpointer userdata) void dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem * item, GtkMenuItem * gmi, DbusmenuMenuitem * parent) { + #ifdef MASSIVEDEBUGGING + g_debug("GTK Client new item base for %d", dbusmenu_menuitem_get_id(item)); + #endif + /* Attach these two */ g_object_set_data(G_OBJECT(item), data_menuitem, gmi); @@ -222,6 +226,10 @@ dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem * static void new_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint position, DbusmenuGtkClient * gtkclient) { + #ifdef MASSIVEDEBUGGING + g_debug("GTK Client new child for %d on %d at %d", dbusmenu_menuitem_get_id(mi), dbusmenu_menuitem_get_id(child), position); + #endif + if (dbusmenu_menuitem_get_root(mi)) { return; } gpointer ann_menu = g_object_get_data(G_OBJECT(mi), data_menu); -- cgit v1.2.3 From cd25178ce4dc6acff33b19c863a5d83d3949b25f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 14:22:18 -0500 Subject: Adding a log domain for libdbusmenu-gtk --- libdbusmenu-gtk/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index 918d071..87a82a6 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -26,7 +26,7 @@ libdbusmenu_gtk_la_LDFLAGS = \ -export-symbols-regex "^[^_].*" libdbusmenu_gtk_la_CFLAGS = \ - $(DBUSMENUGTK_CFLAGS) -I$(srcdir)/.. -Wall -Werror + $(DBUSMENUGTK_CFLAGS) -I$(srcdir)/.. -Wall -Werror -DG_DISABLE_DEPRECATED -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\"" libdbusmenu_gtk_la_LIBADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ -- 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(-) 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 From 253fb436e952d8bc013dfa9c2f18adceda42d31a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 14:25:36 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2~bugfix8 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5efcb0f..69c4da3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix8) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix8) karmic; urgency=low * Better log domains and typos - -- Ted Gould Thu, 01 Oct 2009 14:24:12 -0500 + -- Ted Gould Thu, 01 Oct 2009 14:25:34 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix7) karmic; urgency=low -- cgit v1.2.3 From 79b35c31c76b75c16ad024d7ed002ea2e694b823 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 14:41:52 -0500 Subject: Message for realized --- libdbusmenu-gtk/menu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index 5bcf0a1..ba7ddc3 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -223,6 +223,7 @@ root_child_delete (DbusmenuMenuitem * root, DbusmenuMenuitem * child, DbusmenuGt static void child_realized (DbusmenuMenuitem * child, gpointer userdata) { + g_debug("Root child realized"); g_return_if_fail(DBUSMENU_IS_GTKMENU(userdata)); DbusmenuGtkMenu * menu = DBUSMENU_GTKMENU(userdata); -- cgit v1.2.3 From 618fd007fca561e2451ff0c31b4158178a150a7d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 14:50:36 -0500 Subject: Trying to handle the reorder part of child_added --- libdbusmenu-gtk/menu.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index ba7ddc3..612709e 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -192,7 +192,15 @@ static void root_child_added (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint position, DbusmenuGtkMenu * menu) { g_debug("Root new child"); + DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu); + g_signal_connect(G_OBJECT(child), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(child_realized), menu); + + GtkWidget * item = GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child)); + if (item != NULL) { + gtk_menu_append(GTK_MENU(menu), item); + gtk_menu_reorder_child(GTK_MENU(menu), item, dbusmenu_menuitem_get_position(root, child)); + } return; } -- cgit v1.2.3 From f1683d29c06357e95193b4eaaeee50ad5fda521d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 14:52:19 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2~bugfix9 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e83876b..1e0f8a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix9) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix9) karmic; urgency=low * Handling child added differently. - -- Ted Gould Thu, 01 Oct 2009 14:50:55 -0500 + -- Ted Gould Thu, 01 Oct 2009 14:52:17 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix8) karmic; urgency=low -- cgit v1.2.3 From d3f418fb7331fa431fef415be10a1c71b024e1fa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 15:05:10 -0500 Subject: Removing on delete --- libdbusmenu-gtk/menu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index 612709e..ff473dc 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -220,6 +220,12 @@ static void root_child_delete (DbusmenuMenuitem * root, DbusmenuMenuitem * child, DbusmenuGtkMenu * menu) { g_debug("Root child deleted"); + DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu); + GtkWidget * item = GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child)); + if (item != NULL) { + gtk_container_remove(GTK_CONTAINER(menu), item); + } + if (g_list_length(dbusmenu_menuitem_get_children(root)) == 0) { gtk_widget_hide(GTK_WIDGET(menu)); } -- cgit v1.2.3 From e4892eaa338107114cf9e7ba7d2fd29a15b821e4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 15:10:06 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2~bugfix10 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 48af9ab..648d68f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix10) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix10) karmic; urgency=low * Removing from the container - -- Ted Gould Thu, 01 Oct 2009 15:05:20 -0500 + -- Ted Gould Thu, 01 Oct 2009 15:10:04 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix9) karmic; urgency=low -- cgit v1.2.3 From ade76d21e26083ebd287564c321ee3a7600d1fe4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 15:34:26 -0500 Subject: Leaving abstract the data as long as possible to avoid GTK cast warnings. --- libdbusmenu-gtk/client.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 35f5e61..21da38e 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -324,14 +324,13 @@ dbusmenu_gtkclient_menuitem_get (DbusmenuGtkClient * client, DbusmenuMenuitem * g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), NULL); g_return_val_if_fail(DBUSMENU_IS_MENUITEM(item), NULL); - GtkMenuItem * mi = GTK_MENU_ITEM(g_object_get_data(G_OBJECT(item), data_menuitem)); - if (mi == NULL) { - // new_menuitem(DBUSMENU_CLIENT(client), item, NULL); + gpointer data = g_object_get_data(G_OBJECT(item), data_menuitem); + if (data == NULL) { g_warning("GTK not updated"); - mi = GTK_MENU_ITEM(g_object_get_data(G_OBJECT(item), data_menuitem)); + return NULL; } - return mi; + return GTK_MENU_ITEM(data); } /* The base type handler that builds a plain ol' -- cgit v1.2.3 From d0e28d7c6e98d91fc14398ea863bb378eb9cc9c7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 15:34:38 -0500 Subject: Checking to see if we got null before casting. --- libdbusmenu-gtk/menu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index ff473dc..8f97294 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -196,8 +196,9 @@ root_child_added (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint posit g_signal_connect(G_OBJECT(child), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(child_realized), menu); - GtkWidget * item = GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child)); - if (item != NULL) { + GtkMenuItem * mi = dbusmenu_gtkclient_menuitem_get(priv->client, child); + if (mi != NULL) { + GtkWidget * item = GTK_WIDGET(mi); gtk_menu_append(GTK_MENU(menu), item); gtk_menu_reorder_child(GTK_MENU(menu), item, dbusmenu_menuitem_get_position(root, child)); } -- cgit v1.2.3 From d4b4624d58c434696a206b8209f14075c4da7213 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 15:52:10 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2~bugfix11 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e82bab1..affbb6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix11) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix11) karmic; urgency=low * Killing some bad looking warnings that are stupid - -- Ted Gould Thu, 01 Oct 2009 15:50:41 -0500 + -- Ted Gould Thu, 01 Oct 2009 15:52:08 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix10) karmic; urgency=low -- cgit v1.2.3 From 5234d6f550335d177038062a9b0c361fa3043a0c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 16:51:18 -0500 Subject: Reffing the GTK menu item --- libdbusmenu-gtk/client.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 21da38e..18dcea8 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -201,6 +201,7 @@ dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem * /* Attach these two */ g_object_set_data(G_OBJECT(item), data_menuitem, gmi); + g_object_ref(G_OBJECT(gmi)); /* DbusmenuMenuitem signals */ g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_prop_change_cb), gmi); -- cgit v1.2.3 From 312f10d92317873d2896d51dedea4b54c3b84945 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 16:57:48 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2~bugfix12 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 42bb841..44deccf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix12) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix12) karmic; urgency=low * Adding a little reffing in. - -- Ted Gould Thu, 01 Oct 2009 16:51:33 -0500 + -- Ted Gould Thu, 01 Oct 2009 16:57:46 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix11) karmic; urgency=low -- cgit v1.2.3 From 5040095814d0bf27a6aa2e8b3f3f9a5c1c02f38a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 20:44:05 -0500 Subject: Reporting on the request pos vs. the actual. --- libdbusmenu-gtk/menu.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index 8f97294..2dd7a6e 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -185,6 +185,28 @@ get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec) /* Internal Functions */ +#ifdef MASSIVEDEBUGGING +typedef struct { + GtkMenuItem * mi; + gint finalpos; + gboolean found; +} menu_pos_t; + +static void +find_pos (GtkWidget * widget, gpointer data) +{ + menu_pos_t * menu_pos = (menu_pos_t *)data; + if (menu_pos->found) return; + if ((gpointer)(menu_pos->mi) == (gpointer)widget) { + menu_pos->found = TRUE; + } else { + menu_pos->finalpos++; + } + return; +} +#endif + + /* Called when a new child of the root item is added. Sets up a signal for when it's actually realized. */ @@ -199,8 +221,16 @@ root_child_added (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint posit GtkMenuItem * mi = dbusmenu_gtkclient_menuitem_get(priv->client, child); if (mi != NULL) { GtkWidget * item = GTK_WIDGET(mi); - gtk_menu_append(GTK_MENU(menu), item); - gtk_menu_reorder_child(GTK_MENU(menu), item, dbusmenu_menuitem_get_position(root, child)); + gtk_menu_insert(GTK_MENU(menu), item, position); + #ifdef MASSIVEDEBUGGING + menu_pos_t menu_pos; + menu_pos.mi = mi; + menu_pos.finalpos = 0; + menu_pos.found = FALSE; + + gtk_container_foreach(GTK_CONTAINER(menu), find_pos, &menu_pos); + g_debug("Menu position requested was %d but got %d", position, menu_pos.finalpos); + #endif } return; } -- cgit v1.2.3 From cad67044a087f036310291d6432bd2ec9f4befd3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 20:47:31 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2~bugfix13 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5399458..27c6ef6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix13) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix13) karmic; urgency=low * Reporting on request version vs. actual - -- Ted Gould Thu, 01 Oct 2009 20:45:11 -0500 + -- Ted Gould Thu, 01 Oct 2009 20:47:30 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix12) karmic; urgency=low -- cgit v1.2.3 From e605be140dfc165029c9230c65a8e3a15fa15aa0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 2 Oct 2009 08:52:39 -0500 Subject: We weren't checking to see if error wasn't null, and therefore we reacted on a bad hashtable which caused a crash. --- libdbusmenu-glib/client.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index e2679e1..f1504b7 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -565,6 +565,10 @@ get_properties_helper (gpointer key, gpointer value, gpointer data) static void menuitem_get_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data) { + if (error != NULL) { + g_warning("Error getting properties on a menuitem: %s", error->message); + return; + } g_hash_table_foreach(properties, get_properties_helper, data); g_hash_table_destroy(properties); return; @@ -575,6 +579,10 @@ menuitem_get_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError static void menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data) { + if (error != NULL) { + g_warning("Error getting properties on a new menuitem: %s", error->message); + return; + } g_return_if_fail(data != NULL); newItemPropData * propdata = (newItemPropData *)data; -- cgit v1.2.3 From e37049853e8a01f93cbcb05ccc6679a0a3d23308 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 2 Oct 2009 14:58:59 -0500 Subject: Printing when the GTK Menu item gets destroyed. --- libdbusmenu-gtk/client.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 18dcea8..377f9bc 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -176,6 +176,15 @@ new_menuitem (DbusmenuClient * client, DbusmenuMenuitem * mi, gpointer userdata) return; } +#ifdef MASSIVEDEBUGGING +static void +destroy_gmi (GtkMenuItem * gmi, DbusmenuMenuitem * mi) +{ + g_debug("Destorying GTK Menuitem for %d", dbusmenu_menuitem_get_id(mi)); + return; +} +#endif + /** dbusmenu_gtkclient_newitem_base: @client: The client handling everything on this connection @@ -202,6 +211,9 @@ dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem * /* Attach these two */ g_object_set_data(G_OBJECT(item), data_menuitem, gmi); g_object_ref(G_OBJECT(gmi)); + #ifdef MASSIVEDEBUGGING + g_signal_connect(G_OBJECT(gmi), "destroy", G_CALLBACK(destroy_gmi), item); + #endif /* DbusmenuMenuitem signals */ g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_prop_change_cb), gmi); -- cgit v1.2.3 From a1b3e6d9400764292ea6f4252e4fa93f98da3c5a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 2 Oct 2009 15:01:16 -0500 Subject: Putting the menuitem dying in massive debugging info. --- libdbusmenu-gtk/client.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 377f9bc..8489424 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -159,7 +159,9 @@ menu_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, gchar * value, GtkMenu static void destoryed_dbusmenuitem_cb (gpointer udata, GObject * dbusmenuitem) { - /* g_debug("DbusmenuMenuitem was destroyed"); */ + #ifdef MASSIVEDEBUGGING + g_debug("DbusmenuMenuitem was destroyed"); + #endif gtk_widget_destroy(GTK_WIDGET(udata)); return; } -- cgit v1.2.3 From 68386cf1710525178b43aaa05ab0e37de1e5089f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 2 Oct 2009 15:02:57 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2~bugfix14 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08efbbd..aa50083 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix14) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix14) karmic; urgency=low * Adding destroy messages - -- Ted Gould Fri, 02 Oct 2009 15:01:34 -0500 + -- Ted Gould Fri, 02 Oct 2009 15:02:55 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix13) karmic; urgency=low -- cgit v1.2.3 From 7367daba72850eb6c64f05a416a65256f3bac1e2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 2 Oct 2009 16:50:56 -0500 Subject: Cleaning up the tests after building them --- tests/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index ace4bf4..f111054 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -189,3 +189,6 @@ examples_DATA = \ EXTRA_DIST = \ $(examples_DATA) \ test-gtk-label.json + +DISTCLEANFILES = \ + $(TESTS) -- cgit v1.2.3 From 486c45ab42e2741d82594af5f5d982266c64f327 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 2 Oct 2009 16:51:10 -0500 Subject: Making a 0.1.6 --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 3e3b4fd..61eec35 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.1.5, ted@canonical.com) +AC_INIT(libdbusmenu, 0.1.6, ted@canonical.com) AC_COPYRIGHT([Copyright 2009 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.1.5) +AM_INIT_AUTOMAKE(libdbusmenu, 0.1.6) AM_MAINTAINER_MODE @@ -66,7 +66,7 @@ AC_SUBST(DBUSMENUTESTS_LIBS) ########################### LIBDBUSMENU_CURRENT=0 -LIBDBUSMENU_REVISION=5 +LIBDBUSMENU_REVISION=6 LIBDBUSMENU_AGE=0 AC_SUBST(LIBDBUSMENU_CURRENT) -- cgit v1.2.3 From caa6b665923ff1be5b8c33f9d69abeb8c09af1dd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 2 Oct 2009 16:58:18 -0500 Subject: releasing version 0.1.5-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3f0f274..57e1bc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libdbusmenu (0.1.5-0ubuntu1~ppa2) UNRELEASED; urgency=low +libdbusmenu (0.1.5-0ubuntu1~ppa2) karmic; urgency=low * Managing the life-cycle of the GTK Menu item better to ensure that it is positioned correctly and dies appropriately. (LP: #430904 and LP: #419953) - -- Ted Gould Fri, 02 Oct 2009 16:54:56 -0500 + -- Ted Gould Fri, 02 Oct 2009 16:58:16 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa1) karmic; urgency=low -- cgit v1.2.3 From 3f51b2b3f1550026d7b0af2dbbe007af6e89e302 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 2 Oct 2009 17:00:48 -0500 Subject: releasing version 0.1.6-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d9e20ef..76ef460 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdbusmenu (0.1.6-0ubuntu1~ppa1) UNRELEASED; urgency=low +libdbusmenu (0.1.6-0ubuntu1~ppa1) karmic; urgency=low * Upstream release 0.1.6 * Managing the life-cycle of the GTK Menu item better to @@ -7,7 +7,7 @@ libdbusmenu (0.1.6-0ubuntu1~ppa1) UNRELEASED; urgency=low * Checking returned properties to ensure that there wasn't DBus errors. (LP: #433719) - -- Ted Gould Fri, 02 Oct 2009 16:58:29 -0500 + -- Ted Gould Fri, 02 Oct 2009 17:00:45 -0500 libdbusmenu (0.1.5-0ubuntu1~ppa1) karmic; urgency=low -- cgit v1.2.3