From 967ee6c8d454b83c96f720d8bd5827e9ce6f9a34 Mon Sep 17 00:00:00 2001 From: Aurelien Gateau Date: Fri, 2 Apr 2010 16:50:34 +0200 Subject: Document "visible" property --- libdbusmenu-glib/dbus-menu.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml index ad21f68..7937049 100644 --- a/libdbusmenu-glib/dbus-menu.xml +++ b/libdbusmenu-glib/dbus-menu.xml @@ -81,6 +81,12 @@ License version 3 and version 2.1 along with this program. If not, see Whether the item can be activated or not. true + + visible + boolean + True if the item is visible in the menu. + true + icon-name string -- cgit v1.2.3 From 3dbca0954d9f02df4c9a45a2d4573000d5b4a622 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 11:37:25 -0500 Subject: A couple of code review comments --- libdbusmenu-glib/client.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index f5546a2..3ce0ccb 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -748,6 +748,7 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it if (parent != NULL) { dbusmenu_menuitem_child_delete(parent, item); } + /* XXX: Should this be an unref? Who's reffing this that it exists without a parent? */ g_object_unref(G_OBJECT(item)); item = NULL; } @@ -773,6 +774,7 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it } } else { /* Refresh the properties */ + /* XXX: We shouldn't need to get the properties everytime we reuse an entry */ gchar * properties[1] = {NULL}; /* This gets them all */ org_ayatana_dbusmenu_get_properties_async(proxy, id, (const gchar **)properties, menuitem_get_properties_replace_cb, item); } -- cgit v1.2.3 From 2fe45ccfa9a884307de9fd87035c7a397ddf9571 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 14:41:30 -0500 Subject: debian/rules: Massive debugging --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4783d80..20d99bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1) UNRELEASED; urgency=low * Upstream Merge * Adding in visible property to docs * Helpful comments in the code + * debian/rules: Massive debugging -- Ted Gould Wed, 14 Apr 2010 14:40:26 -0500 diff --git a/debian/rules b/debian/rules index c23bde6..7399803 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-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.2.5)' -- cgit v1.2.3 From b7828c57bb679c28e14c955a19069451e156568a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 14:44:09 -0500 Subject: releasing version 0.2.9-0ubuntu1~ppa2~ordering1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 20d99bc..596124b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1) UNRELEASED; urgency=low +libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1) lucid; urgency=low * Upstream Merge * Adding in visible property to docs * Helpful comments in the code * debian/rules: Massive debugging - -- Ted Gould Wed, 14 Apr 2010 14:40:26 -0500 + -- Ted Gould Wed, 14 Apr 2010 14:44:04 -0500 libdbusmenu (0.2.9-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From 19dfb9380fc86a873a30a8c748c78689a2bf6d33 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 16:50:43 -0500 Subject: Fail if we add a child to a menu that already has that child. --- libdbusmenu-glib/menuitem.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index fce8ed5..2b4f9ca 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -533,6 +533,8 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); + g_return_val_if_fail(g_list_find(priv->children, child), FALSE); + priv->children = g_list_append(priv->children, child); #ifdef MASSIVEDEBUGGING 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); @@ -558,6 +560,8 @@ dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); + g_return_val_if_fail(g_list_find(priv->children, child), FALSE); + priv->children = g_list_prepend(priv->children, child); #ifdef MASSIVEDEBUGGING g_debug("Menuitem %d (%s) signalling child added %d (%s) at %d", ID(mi), LABEL(mi), ID(child), LABEL(child), 0); @@ -611,6 +615,8 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); + g_return_val_if_fail(g_list_find(priv->children, child), FALSE); + priv->children = g_list_insert(priv->children, child, position); #ifdef MASSIVEDEBUGGING g_debug("Menuitem %d (%s) signalling child added %d (%s) at %d", ID(mi), LABEL(mi), ID(child), LABEL(child), position); -- cgit v1.2.3 From a97cd5fdfba888c256b1bf0ec0fd28e869974281 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 16:58:17 -0500 Subject: Return error if we can't find parent in a buildxml routine --- libdbusmenu-glib/server.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index d87c024..02c9c57 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -404,6 +404,16 @@ _dbusmenu_server_get_layout (DbusmenuServer * server, gint parent, guint * revis } } else { DbusmenuMenuitem * item = dbusmenu_menuitem_find_id(priv->root, parent); + if (item == NULL) { + if (error != NULL) { + g_set_error(error, + error_quark(), + INVALID_MENUITEM_ID, + "The ID supplied %d does not refer to a menu item we have", + parent); + } + return FALSE; + } dbusmenu_menuitem_buildxml(item, xmlarray); } g_ptr_array_add(xmlarray, NULL); -- cgit v1.2.3 From 9284777a7a53b0aa247b63d8b99359be7dd88296 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 17:05:48 -0500 Subject: Keep an internal reference to the children. --- libdbusmenu-glib/menuitem.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 2b4f9ca..93d32a1 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -449,6 +449,7 @@ take_children_signal (gpointer data, gpointer user_data) #ifdef MASSIVEDEBUGGING g_debug("Menuitem %d (%s) signalling child removed %d (%s)", ID(user_data), LABEL(user_data), ID(data), LABEL(data)); #endif + g_object_unref(G_OBJECT(data)); g_signal_emit(G_OBJECT(user_data), signals[CHILD_REMOVED], 0, DBUSMENU_MENUITEM(data), TRUE); return; } @@ -539,6 +540,7 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) #ifdef MASSIVEDEBUGGING 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_object_ref(G_OBJECT(child)); g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, g_list_length(priv->children) - 1, TRUE); return TRUE; } @@ -566,6 +568,7 @@ dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child #ifdef MASSIVEDEBUGGING g_debug("Menuitem %d (%s) signalling child added %d (%s) at %d", ID(mi), LABEL(mi), ID(child), LABEL(child), 0); #endif + g_object_ref(G_OBJECT(child)); g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, 0, TRUE); return TRUE; } @@ -592,6 +595,7 @@ dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) #ifdef MASSIVEDEBUGGING g_debug("Menuitem %d (%s) signalling child removed %d (%s)", ID(mi), LABEL(mi), ID(child), LABEL(child)); #endif + g_object_unref(G_OBJECT(child)); g_signal_emit(G_OBJECT(mi), signals[CHILD_REMOVED], 0, child, TRUE); return TRUE; } @@ -621,6 +625,7 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * #ifdef MASSIVEDEBUGGING g_debug("Menuitem %d (%s) signalling child added %d (%s) at %d", ID(mi), LABEL(mi), ID(child), LABEL(child), position); #endif + g_object_ref(G_OBJECT(child)); g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, position, TRUE); return TRUE; } -- cgit v1.2.3 From ce2d71df4a6c4dac558ff87bf00cb14358a24267 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 17:07:44 -0500 Subject: Wrong version number --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 620ddd4..f701dcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1ubuntu1) UNRELEASED; urgency=low +libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering2) UNRELEASED; urgency=low * Upstream Merge * Don't allow setting children twice -- cgit v1.2.3 From 25d8905a105e39615aff76d9a96cc5cdd60bbed7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 17:10:33 -0500 Subject: releasing version 0.2.9-0ubuntu1~ppa2~ordering2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f701dcf..6a59eff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering2) UNRELEASED; urgency=low +libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering2) lucid; urgency=low * Upstream Merge * Don't allow setting children twice * Ref children of a menuitem * Return error when parent ID of getlayout can't be found - -- Ted Gould Wed, 14 Apr 2010 17:06:34 -0500 + -- Ted Gould Wed, 14 Apr 2010 17:10:29 -0500 libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1) lucid; urgency=low -- cgit v1.2.3 From 42c0196f242841499c9b464e9b1176c4ee048faa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 17:13:17 -0500 Subject: Truth sucks --- libdbusmenu-glib/menuitem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 93d32a1..e519473 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -534,7 +534,7 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); - g_return_val_if_fail(g_list_find(priv->children, child), FALSE); + g_return_val_if_fail(g_list_find(priv->children, child) != NULL, FALSE); priv->children = g_list_append(priv->children, child); #ifdef MASSIVEDEBUGGING @@ -562,7 +562,7 @@ dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); - g_return_val_if_fail(g_list_find(priv->children, child), FALSE); + g_return_val_if_fail(g_list_find(priv->children, child) != NULL, FALSE); priv->children = g_list_prepend(priv->children, child); #ifdef MASSIVEDEBUGGING @@ -619,7 +619,7 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); - g_return_val_if_fail(g_list_find(priv->children, child), FALSE); + g_return_val_if_fail(g_list_find(priv->children, child) != NULL, FALSE); priv->children = g_list_insert(priv->children, child, position); #ifdef MASSIVEDEBUGGING -- cgit v1.2.3 From 1d2607d298341bf89396b65adb2b4243651d08ef Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 17:16:03 -0500 Subject: releasing version 0.2.9-0ubuntu1~ppa2~ordering3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 89b6326..2e03a36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering3) UNRELEASED; urgency=low +libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering3) lucid; urgency=low * Upstream Merge * Fixing the truth - -- Ted Gould Wed, 14 Apr 2010 17:13:35 -0500 + -- Ted Gould Wed, 14 Apr 2010 17:16:01 -0500 libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering2) lucid; urgency=low -- cgit v1.2.3 From 2ace387168eb78ef8bc8e919619516e4f1cffdc6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 17:18:27 -0500 Subject: Man I suck --- libdbusmenu-glib/menuitem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index e519473..515fd36 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -534,7 +534,7 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); - g_return_val_if_fail(g_list_find(priv->children, child) != NULL, FALSE); + g_return_val_if_fail(g_list_find(priv->children, child) == NULL, FALSE); priv->children = g_list_append(priv->children, child); #ifdef MASSIVEDEBUGGING @@ -562,7 +562,7 @@ dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); - g_return_val_if_fail(g_list_find(priv->children, child) != NULL, FALSE); + g_return_val_if_fail(g_list_find(priv->children, child) == NULL, FALSE); priv->children = g_list_prepend(priv->children, child); #ifdef MASSIVEDEBUGGING @@ -619,7 +619,7 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); - g_return_val_if_fail(g_list_find(priv->children, child) != NULL, FALSE); + g_return_val_if_fail(g_list_find(priv->children, child) == NULL, FALSE); priv->children = g_list_insert(priv->children, child, position); #ifdef MASSIVEDEBUGGING -- cgit v1.2.3 From e1d826fcfb9bb619cf69e16f72616d8e396cc494 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 17:21:13 -0500 Subject: releasing version 0.2.9-0ubuntu1~ppa2~ordering4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d6a402..40c8222 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering4) UNRELEASED; urgency=low +libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering4) lucid; urgency=low * Upstream Merge * I really don't want to talk about it. - -- Ted Gould Wed, 14 Apr 2010 17:18:48 -0500 + -- Ted Gould Wed, 14 Apr 2010 17:21:11 -0500 libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering3) lucid; urgency=low -- cgit v1.2.3 From a2170ac67ad0f5065922108479ccce3338e777d8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 23:40:22 -0500 Subject: Adding two functions to set and get the realized state. --- libdbusmenu-glib/menuitem-private.h | 2 ++ libdbusmenu-glib/menuitem.c | 42 +++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/libdbusmenu-glib/menuitem-private.h b/libdbusmenu-glib/menuitem-private.h index 1c7c16a..3a0c026 100644 --- a/libdbusmenu-glib/menuitem-private.h +++ b/libdbusmenu-glib/menuitem-private.h @@ -34,6 +34,8 @@ License version 3 and version 2.1 along with this program. If not, see G_BEGIN_DECLS void dbusmenu_menuitem_buildxml (DbusmenuMenuitem * mi, GPtrArray * array); +gboolean dbusmenu_menuitem_realized (DbusmenuMenuitem * mi); +void dbusmenu_menuitem_set_realized (DbusmenuMenuitem * mi); G_END_DECLS diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 515fd36..dac491b 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -59,6 +59,7 @@ struct _DbusmenuMenuitemPrivate GList * children; GHashTable * properties; gboolean root; + gboolean realized; }; /* Signals */ @@ -278,6 +279,7 @@ dbusmenu_menuitem_init (DbusmenuMenuitem *self) priv->properties = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, _g_value_free); priv->root = FALSE; + priv->realized = FALSE; return; } @@ -422,6 +424,46 @@ dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi) return ret; } +/** + dbusmenu_menuitem_realized: + @mi: #DbusmenuMenuitem to check on + + This function returns whether the menuitem has been realized or + not. This is significant mostly in client implementations that + can use this additional state to see if the second layers of + the implementation have been built yet. + + Return value: Returns whether or not the menu item has been realized + yet or not. +*/ +gboolean +dbusmenu_menuitem_realized (DbusmenuMenuitem * mi) +{ + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE); + DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); + return priv->realized; +} + +/** + dbusmenu_menuitem_set_realized: + @mi: #DbusmenuMenuitem to realize + + Sets the internal variable tracking whether it's been realized and + signals the DbusmenuMenuitem::realized event. +*/ +void +dbusmenu_menuitem_set_realized (DbusmenuMenuitem * mi) +{ + g_return_if_fail(DBUSMENU_IS_MENUITEM(mi)); + DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); + if (priv->realized) { + g_warning("Realized entry realized again? ID: %d", dbusmenu_menuitem_get_id(mi)); + } + priv->realized = TRUE; + g_signal_emit(G_OBJECT(mi), signals[REALIZED], 0, TRUE); + return; +} + /** dbusmenu_menuitem_get_children: @mi: The #DbusmenuMenuitem to query. -- cgit v1.2.3 From 914b2a38181afb26ed2c8e1254c5bdb562f9e9df Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 23:41:32 -0500 Subject: Use the set realized function in the client. --- libdbusmenu-glib/client.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 3ce0ccb..d61b1ae 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -35,6 +35,7 @@ License version 3 and version 2.1 along with this program. If not, see #include "client.h" #include "menuitem.h" +#include "menuitem-private.h" #include "client-menuitem.h" #include "dbusmenu-client.h" #include "server-marshal.h" @@ -645,7 +646,7 @@ menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GEr #ifdef MASSIVEDEBUGGING 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); + dbusmenu_menuitem_set_realized(propdata->item); if (!handled) { g_signal_emit(G_OBJECT(propdata->client), signals[NEW_MENUITEM], 0, propdata->item, TRUE); -- cgit v1.2.3 From 5148e0fd0106c1012f19be45c4bf79b187ad4d96 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 23:47:01 -0500 Subject: Adding a function to only get the position in the children that are realized. --- libdbusmenu-glib/menuitem.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ libdbusmenu-glib/menuitem.h | 1 + 2 files changed, 45 insertions(+) diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index dac491b..220f7e5 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -559,6 +559,50 @@ dbusmenu_menuitem_get_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent return count; } +/** + dbusmenu_menuitem_get_position_realized: + @mi: The #DbusmenuMenuitem to find the position of + @parent: The #DbusmenuMenuitem who's children contain @mi + + This function is very similar to #dbusmenu_menuitem_get_position + except that it only counts in the children that have been realized. + + Return value: The position of @mi in the realized children of @parent. +*/ +guint +dbusmenu_menuitem_get_position_realized (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent) +{ + #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 + + /* 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); + + GList * childs = dbusmenu_menuitem_get_children(parent); + if (childs == NULL) return 0; + guint count = 0; + for ( ; childs != NULL; childs = childs->next, count++) { + if (!dbusmenu_menuitem_realized(DBUSMENU_MENUITEM(childs->data))) { + count--; + continue; + } + if (childs->data == mi) { + break; + } + } + + if (childs == NULL) return 0; + + #ifdef MASSIVEDEBUGGING + g_debug("Getting position of %d (%s), it's at: %d", ID(mi), LABEL(mi), count); + #endif + + return count; +} + /** dbusmenu_menuitem_child_append: @mi: The #DbusmenuMenuitem which will become a new parent diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h index cb6b8f4..e5b5ae2 100644 --- a/libdbusmenu-glib/menuitem.h +++ b/libdbusmenu-glib/menuitem.h @@ -148,6 +148,7 @@ gint dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi); GList * dbusmenu_menuitem_get_children (DbusmenuMenuitem * mi); GList * dbusmenu_menuitem_take_children (DbusmenuMenuitem * mi) G_GNUC_WARN_UNUSED_RESULT; guint dbusmenu_menuitem_get_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent); +guint dbusmenu_menuitem_get_position_realized (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent); gboolean dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child); gboolean dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child); -- cgit v1.2.3 From 9931bb8eddce86cae0896285b19a5830079923b8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 23:48:51 -0500 Subject: Using get_position_realized in the GTK layer to avoid realization races. --- libdbusmenu-gtk/client.c | 2 +- libdbusmenu-gtk/menu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 3de42fe..eabfa9b 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -308,7 +308,7 @@ dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem * /* Oh, we're a child, let's deal with that */ if (parent != NULL) { - new_child(parent, item, dbusmenu_menuitem_get_position(item, parent), DBUSMENU_GTKCLIENT(client)); + new_child(parent, item, dbusmenu_menuitem_get_position_realized(item, parent), DBUSMENU_GTKCLIENT(client)); } return; diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index 103ecfe..409b7ed 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -300,7 +300,7 @@ child_realized (DbusmenuMenuitem * child, gpointer userdata) if (child_widget != NULL) { gtk_menu_append(menu, child_widget); - gtk_menu_reorder_child(GTK_MENU(menu), child_widget, dbusmenu_menuitem_get_position(child, dbusmenu_client_get_root(DBUSMENU_CLIENT(priv->client)))); + gtk_menu_reorder_child(GTK_MENU(menu), child_widget, dbusmenu_menuitem_get_position_realized(child, dbusmenu_client_get_root(DBUSMENU_CLIENT(priv->client)))); } else { g_warning("Child is realized, but doesn't have a GTK Widget!"); } -- cgit v1.2.3 From e4edc21b3d2a65948b4fb4dc0ba714649850c167 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 23:56:40 -0500 Subject: releasing version 0.2.9-0ubuntu1~ppa2~ordering5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 03ce2e2..b8ca4fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering5) UNRELEASED; urgency=low +libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering5) lucid; urgency=low * Upstream Merge * Changing GTK layer to look at position in realized children to avoid realization races. - -- Ted Gould Wed, 14 Apr 2010 23:52:15 -0500 + -- Ted Gould Wed, 14 Apr 2010 23:56:36 -0500 libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering4) lucid; urgency=low -- cgit v1.2.3 From e4a3d964d9c5b57fe1f3488459545212891732b0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 15 Apr 2010 00:54:44 -0500 Subject: Making every insertion now use the realized position. It HAS to be one of these. --- libdbusmenu-gtk/client.c | 4 ++-- libdbusmenu-gtk/menu.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index eabfa9b..b13af6a 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -335,7 +335,7 @@ new_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint position, Dbus } GtkMenuItem * childmi = dbusmenu_gtkclient_menuitem_get(gtkclient, child); - gtk_menu_shell_insert(GTK_MENU_SHELL(menu), GTK_WIDGET(childmi), position); + gtk_menu_shell_insert(GTK_MENU_SHELL(menu), GTK_WIDGET(childmi), dbusmenu_menuitem_get_position_realized(child, mi)); gtk_widget_show(GTK_WIDGET(menu)); return; @@ -373,7 +373,7 @@ move_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint new, guint ol } GtkMenuItem * childmi = dbusmenu_gtkclient_menuitem_get(gtkclient, child); - gtk_menu_reorder_child(GTK_MENU(ann_menu), GTK_WIDGET(childmi), new); + gtk_menu_reorder_child(GTK_MENU(ann_menu), GTK_WIDGET(childmi), dbusmenu_menuitem_get_position_realized(child, mi)); return; } diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index 409b7ed..4fa546b 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -237,7 +237,7 @@ 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_insert(GTK_MENU(menu), item, position); + gtk_menu_insert(GTK_MENU(menu), item, dbusmenu_menuitem_get_position_realized(child, root)); #ifdef MASSIVEDEBUGGING menu_pos_t menu_pos; menu_pos.mi = mi; @@ -260,7 +260,7 @@ root_child_moved (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint newpo 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); + gtk_menu_reorder_child(GTK_MENU(menu), GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child)), dbusmenu_menuitem_get_position_realized(child, root)); return; } -- cgit v1.2.3 From 05de6403c4ddaba5aa5cf50ef97a3241fbdad251 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 15 Apr 2010 00:57:38 -0500 Subject: releasing version 0.2.9-0ubuntu1~ppa2~ordering6 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dfa52db..45b046d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering6) UNRELEASED; urgency=low +libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering6) lucid; urgency=low * Upstream Merge * A position functions using realized position - -- Ted Gould Thu, 15 Apr 2010 00:54:56 -0500 + -- Ted Gould Thu, 15 Apr 2010 00:57:35 -0500 libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering5) lucid; urgency=low -- cgit v1.2.3 From 209320abfce67eef832cfe30a8c24b9505cf9718 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 15 Apr 2010 01:25:47 -0500 Subject: releasing version 0.2.9-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 44c67ec..028e2a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdbusmenu (0.2.9-0ubuntu2~ppa1) UNRELEASED; urgency=low +libdbusmenu (0.2.9-0ubuntu2~ppa1) lucid; urgency=low * Upstream Merge * Changing GTK layer to look at position in realized @@ -9,7 +9,7 @@ libdbusmenu (0.2.9-0ubuntu2~ppa1) UNRELEASED; urgency=low * Adding in visible property to docs * Helpful comments in the code - -- Ted Gould Thu, 15 Apr 2010 01:17:34 -0500 + -- Ted Gould Thu, 15 Apr 2010 01:25:42 -0500 libdbusmenu (0.2.9-0ubuntu1) lucid; urgency=low -- cgit v1.2.3