diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-31 13:58:29 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-31 13:58:29 -0500 |
| commit | 1f308a47c578baec7ba7bfebb880e0ecf0a17688 (patch) | |
| tree | e6aaa5fd904fbb136625714c1643381b5baa26ce /libdbusmenu-gtk/client.c | |
| parent | 04ad3cb433ac8ed581998ea6ce69bd0e7d1dbb68 (diff) | |
| parent | 0bec1d5af5d3d61ffc24913e0257f724765e5563 (diff) | |
| download | libdbusmenu-1f308a47c578baec7ba7bfebb880e0ecf0a17688.tar.gz libdbusmenu-1f308a47c578baec7ba7bfebb880e0ecf0a17688.tar.bz2 libdbusmenu-1f308a47c578baec7ba7bfebb880e0ecf0a17688.zip | |
Merging in support for sending AboutToShow events.
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; } |