diff options
| author | Ted Gould <ted@gould.cx> | 2010-08-25 13:21:31 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-08-25 13:21:31 -0500 |
| commit | 4370a56e946329492be29a50811d9015fa529e17 (patch) | |
| tree | 0da570c1eb80878346ab4d429b9328b93f115c19 /libdbusmenu-glib/server.c | |
| parent | 65e8b999069536a87428abbae7f17ce9e63422a8 (diff) | |
| parent | 3bd4b8dce9460159945a9cc24f0bc8aba7e62898 (diff) | |
| download | libdbusmenu-4370a56e946329492be29a50811d9015fa529e17.tar.gz libdbusmenu-4370a56e946329492be29a50811d9015fa529e17.tar.bz2 libdbusmenu-4370a56e946329492be29a50811d9015fa529e17.zip | |
* Upstream Merge
* Support activation of menus client side
* Autogen
Diffstat (limited to 'libdbusmenu-glib/server.c')
| -rw-r--r-- | libdbusmenu-glib/server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index d1b4888..26e7a0d 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -410,7 +410,7 @@ menuitem_child_moved (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, guint /* Called when a menu item emits its activated signal so it gets passed across the bus. */ static void -menuitem_activated (DbusmenuMenuitem * mi, guint timestamp, DbusmenuServer * server) +menuitem_shown (DbusmenuMenuitem * mi, guint timestamp, DbusmenuServer * server) { g_signal_emit(G_OBJECT(server), signals[ITEM_ACTIVATION], 0, dbusmenu_menuitem_get_id(mi), timestamp, TRUE); return; @@ -425,7 +425,7 @@ menuitem_signals_create (DbusmenuMenuitem * mi, gpointer data) g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED, G_CALLBACK(menuitem_child_removed), data); g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED, G_CALLBACK(menuitem_child_moved), data); g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menuitem_property_changed), data); - g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(menuitem_activated), data); + g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_SHOW_TO_USER, G_CALLBACK(menuitem_shown), data); return; } |