diff options
| author | Ted Gould <ted@canonical.com> | 2009-10-01 20:45:39 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-10-01 20:45:39 -0500 |
| commit | 554f940007f2b7584f86dbce7ef214fabc69886e (patch) | |
| tree | be2d290fb7201c25847514127df7004a960a1114 | |
| parent | 312f10d92317873d2896d51dedea4b54c3b84945 (diff) | |
| parent | 5040095814d0bf27a6aa2e8b3f3f9a5c1c02f38a (diff) | |
| download | libdbusmenu-554f940007f2b7584f86dbce7ef214fabc69886e.tar.gz libdbusmenu-554f940007f2b7584f86dbce7ef214fabc69886e.tar.bz2 libdbusmenu-554f940007f2b7584f86dbce7ef214fabc69886e.zip | |
Reporting on request version vs. actual
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | libdbusmenu-gtk/menu.c | 34 |
2 files changed, 38 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 44deccf..5399458 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix13) UNRELEASED; urgency=low + + * Reporting on request version vs. actual + + -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 20:45:11 -0500 + libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix12) karmic; urgency=low * Adding a little reffing in. 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; } |