diff options
| author | Ted Gould <ted@gould.cx> | 2010-04-14 23:53:11 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-04-14 23:53:11 -0500 |
| commit | 764876064692680897cbf76435085d67ed25436e (patch) | |
| tree | cc2bc7008cedfc12c5cccf8af2b0e58a0092969b /libdbusmenu-glib/client.c | |
| parent | e1d826fcfb9bb619cf69e16f72616d8e396cc494 (diff) | |
| parent | 9931bb8eddce86cae0896285b19a5830079923b8 (diff) | |
| download | libdbusmenu-764876064692680897cbf76435085d67ed25436e.tar.gz libdbusmenu-764876064692680897cbf76435085d67ed25436e.tar.bz2 libdbusmenu-764876064692680897cbf76435085d67ed25436e.zip | |
* Upstream Merge
* Changing GTK layer to look at position in realized
children to avoid realization races.
Diffstat (limited to 'libdbusmenu-glib/client.c')
| -rw-r--r-- | libdbusmenu-glib/client.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |