ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #00464
[Merge] lp:~ted/dbusmenu/reorder-test-fix into lp:dbusmenu
Ted Gould has proposed merging lp:~ted/dbusmenu/reorder-test-fix into lp:dbusmenu.
Requested reviews:
DBus Menu Team (dbusmenu-team)
Fixing our test. Now it works :)
--
https://code.launchpad.net/~ted/dbusmenu/reorder-test-fix/+merge/12876
Your team ayatana-commits is subscribed to branch lp:dbusmenu.
=== modified file 'libdbusmenu-gtk/menu.c'
--- libdbusmenu-gtk/menu.c 2009-10-02 01:44:05 +0000
+++ libdbusmenu-gtk/menu.c 2009-10-05 15:30:21 +0000
@@ -213,7 +213,9 @@
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 @@
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 @@
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 @@
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);
=== modified file 'tests/test-gtk-reorder-server.c'
--- tests/test-gtk-reorder-server.c 2009-09-30 21:53:08 +0000
+++ tests/test-gtk-reorder-server.c 2009-10-05 15:30:21 +0000
@@ -66,7 +66,7 @@
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++;
Follow ups