diff options
| author | Ted Gould <ted@canonical.com> | 2009-10-05 14:16:03 -0400 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-10-05 14:16:03 -0400 |
| commit | c00c5f0e3e2b04f3e6b3b5fd39cef578b4cfce0e (patch) | |
| tree | c2a469495ca82b4055945362ad382bebc92019eb | |
| parent | 38c9adcb94c6ab0d273815705b474a801f56a59d (diff) | |
| parent | 7c11185882c3799ff68da31271b12c93ffe0534b (diff) | |
| download | libdbusmenu-c00c5f0e3e2b04f3e6b3b5fd39cef578b4cfce0e.tar.gz libdbusmenu-c00c5f0e3e2b04f3e6b3b5fd39cef578b4cfce0e.tar.bz2 libdbusmenu-c00c5f0e3e2b04f3e6b3b5fd39cef578b4cfce0e.zip | |
Fixing the reorder test.
| -rw-r--r-- | libdbusmenu-gtk/menu.c | 8 | ||||
| -rw-r--r-- | tests/test-gtk-reorder-server.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index 2dd7a6e..d2a8620 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -213,7 +213,9 @@ find_pos (GtkWidget * widget, gpointer data) static void root_child_added (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint position, DbusmenuGtkMenu * menu) { + #ifdef MASSIVEDEBUGGING g_debug("Root new child"); + #endif DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu); g_signal_connect(G_OBJECT(child), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(child_realized), menu); @@ -240,7 +242,9 @@ root_child_added (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint posit static void root_child_moved (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint newposition, guint oldposition, DbusmenuGtkMenu * menu) { + #ifdef MASSIVEDEBUGGING g_debug("Root child moved"); + #endif DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu); gtk_menu_reorder_child(GTK_MENU(menu), GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child)), newposition); return; @@ -250,7 +254,9 @@ root_child_moved (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint newpo static void root_child_delete (DbusmenuMenuitem * root, DbusmenuMenuitem * child, DbusmenuGtkMenu * menu) { + #ifdef MASSIVEDEBUGGING g_debug("Root child deleted"); + #endif DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu); GtkWidget * item = GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child)); if (item != NULL) { @@ -268,7 +274,9 @@ root_child_delete (DbusmenuMenuitem * root, DbusmenuMenuitem * child, DbusmenuGt static void child_realized (DbusmenuMenuitem * child, gpointer userdata) { + #ifdef MASSIVEDEBUGGING g_debug("Root child realized"); + #endif g_return_if_fail(DBUSMENU_IS_GTKMENU(userdata)); DbusmenuGtkMenu * menu = DBUSMENU_GTKMENU(userdata); diff --git a/tests/test-gtk-reorder-server.c b/tests/test-gtk-reorder-server.c index 2fd9bf7..eee9bb8 100644 --- a/tests/test-gtk-reorder-server.c +++ b/tests/test-gtk-reorder-server.c @@ -66,7 +66,7 @@ timer_func (gpointer data) 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]); + dbusmenu_menuitem_property_set(entries[i], "label", names[ordering[test][i]]); } test++; |