diff options
| author | Ted Gould <ted@gould.cx> | 2011-04-12 22:06:12 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-04-12 22:06:12 -0500 |
| commit | 67446eb71e8f89b435f3163d49f805d4625d0802 (patch) | |
| tree | 93441b03db70a2a1e343461cd7b2bf859ad227f1 /libdbusmenu-glib | |
| parent | 315fc6407f03ee9447bb468a1b23ce34a75a12f8 (diff) | |
| parent | 8a38a4ed3fec68e37b59d3be722683b3a348db06 (diff) | |
| download | libdbusmenu-67446eb71e8f89b435f3163d49f805d4625d0802.tar.gz libdbusmenu-67446eb71e8f89b435f3163d49f805d4625d0802.tar.bz2 libdbusmenu-67446eb71e8f89b435f3163d49f805d4625d0802.zip | |
* Upstream Merge
* Handle cases where labels are added later as subwidgets in
the menuitem (LP: #758759)
* Fix the destruction of the attached GTK menuitem (LP: #746091)
Diffstat (limited to 'libdbusmenu-glib')
| -rw-r--r-- | libdbusmenu-glib/client-menuitem.c | 2 | ||||
| -rw-r--r-- | libdbusmenu-glib/client-private.h | 3 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.c | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libdbusmenu-glib/client-menuitem.c b/libdbusmenu-glib/client-menuitem.c index 60f8637..483470a 100644 --- a/libdbusmenu-glib/client-menuitem.c +++ b/libdbusmenu-glib/client-menuitem.c @@ -106,7 +106,7 @@ static void handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp) { DbusmenuClientMenuitemPrivate * priv = DBUSMENU_CLIENT_MENUITEM_GET_PRIVATE(mi); - dbusmenu_client_send_event(priv->client, dbusmenu_menuitem_get_id(mi), name, variant, timestamp); + dbusmenu_client_send_event(priv->client, dbusmenu_menuitem_get_id(mi), name, variant, timestamp, mi); return; } diff --git a/libdbusmenu-glib/client-private.h b/libdbusmenu-glib/client-private.h index f6df372..44c0066 100644 --- a/libdbusmenu-glib/client-private.h +++ b/libdbusmenu-glib/client-private.h @@ -37,7 +37,8 @@ void dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name, GVariant * variant, - guint timestamp); + guint timestamp, + DbusmenuMenuitem * mi); void dbusmenu_client_send_about_to_show(DbusmenuClient * client, gint id, void (*cb) (gpointer user_data), diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 45cf0d1..2e6b09a 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -1516,14 +1516,13 @@ menuitem_call_cb (GObject * proxy, GAsyncResult * res, gpointer userdata) /* Sends the event over DBus to the server on the other side of the bus. */ void -dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name, GVariant * variant, guint timestamp) +dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name, GVariant * variant, guint timestamp, DbusmenuMenuitem * mi) { g_return_if_fail(DBUSMENU_IS_CLIENT(client)); g_return_if_fail(id >= 0); g_return_if_fail(name != NULL); DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); - DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, id); if (mi == NULL) { g_warning("Asked to activate a menuitem %d that we don't know about", id); return; |