diff options
| author | Ted Gould <ted@gould.cx> | 2010-09-21 16:46:50 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-09-21 16:46:50 -0500 |
| commit | 6a3309870ae2d30433e1c3a414adb7cfee59cd33 (patch) | |
| tree | 6d24c1ec0d4732a0e86ef535ed7b9dc950ac9985 /libdbusmenu-glib | |
| parent | 1b019ddfbd7e08a5074f4eb4cb64b9b430a0f2b7 (diff) | |
| parent | f561d3f108970043aaeac0377e69453e3c6173d4 (diff) | |
| download | libdbusmenu-6a3309870ae2d30433e1c3a414adb7cfee59cd33.tar.gz libdbusmenu-6a3309870ae2d30433e1c3a414adb7cfee59cd33.tar.bz2 libdbusmenu-6a3309870ae2d30433e1c3a414adb7cfee59cd33.zip | |
* Upstream Merge
* Passing up About-to-show as an activate signal (LP: #637692)
Diffstat (limited to 'libdbusmenu-glib')
| -rw-r--r-- | libdbusmenu-glib/menuitem.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index ea69776..fb12163 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -97,6 +97,7 @@ static void get_property (GObject * obj, guint id, GValue * value, GParamSpec * static void g_value_transform_STRING_BOOLEAN (const GValue * in, GValue * out); static void g_value_transform_STRING_INT (const GValue * in, GValue * out); static void handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp); +static void send_about_to_show (DbusmenuMenuitem * mi, dbusmenu_menuitem_about_to_show_cb cb, gpointer cb_data); /* GObject stuff */ G_DEFINE_TYPE (DbusmenuMenuitem, dbusmenu_menuitem, G_TYPE_OBJECT); @@ -114,6 +115,7 @@ dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass) object_class->get_property = get_property; klass->handle_event = handle_event; + klass->send_about_to_show = send_about_to_show; /** DbusmenuMenuitem::property-changed: @@ -387,6 +389,28 @@ handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, g return; } +/* Handles our about to show signal on items that submenus + exist. This is sending just activate now, but we should + probably consider a special signal in the future if GTK + gets more sophisticated about this. */ +static void +send_about_to_show (DbusmenuMenuitem * mi, dbusmenu_menuitem_about_to_show_cb cb, gpointer cb_data) +{ + g_return_if_fail(DBUSMENU_IS_MENUITEM(mi)); + + if (dbusmenu_menuitem_get_children(mi) == NULL) { + g_warning("About to Show called on an item wihtout submenus. We're ignoring it."); + } else { + g_signal_emit(G_OBJECT(mi), signals[ITEM_ACTIVATED], 0, 0 /* timestamp */, TRUE); + } + + if (cb != NULL) { + cb(mi, cb_data); + } + + return; +} + /* Public interface */ /** |