diff options
| author | Ted Gould <ted@gould.cx> | 2010-04-01 09:09:51 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-04-01 09:09:51 -0500 |
| commit | 187a33539569163ee953903010169356b8d57beb (patch) | |
| tree | bef8679b4997713c15ac3ce8ef84f7571020d1e8 /libdbusmenu-gtk/client.c | |
| parent | 63a5d2daa865aa68b4ea152a92373e3c187e13af (diff) | |
| parent | 122de5e9d523e6327b44609b634a6e30d48370da (diff) | |
| download | libdbusmenu-187a33539569163ee953903010169356b8d57beb.tar.gz libdbusmenu-187a33539569163ee953903010169356b8d57beb.tar.bz2 libdbusmenu-187a33539569163ee953903010169356b8d57beb.zip | |
Import upstream version 0.2.9
Diffstat (limited to 'libdbusmenu-gtk/client.c')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 98f1cb2..3de42fe 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -109,10 +109,16 @@ static const gchar * data_menu = "dbusmenugtk-data-gtkmenu"; static gboolean menu_pressed_cb (GtkMenuItem * gmi, DbusmenuMenuitem * mi) { - GValue value = {0}; - g_value_init(&value, G_TYPE_INT); - g_value_set_int(&value, 0); - dbusmenu_menuitem_handle_event(mi, "clicked", &value, gtk_get_current_event_time()); + if (gtk_menu_item_get_submenu(gmi) == NULL) { + GValue value = {0}; + g_value_init(&value, G_TYPE_INT); + g_value_set_int(&value, 0); + dbusmenu_menuitem_handle_event(mi, "clicked", &value, gtk_get_current_event_time()); + } else { + /* TODO: We need to stop the display of the submenu + until this callback returns. */ + dbusmenu_menuitem_send_about_to_show(mi, NULL, NULL); + } return TRUE; } |