From 79f8505edd8fd05373275f2835e2400d7611fcf5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 31 Mar 2010 13:49:32 -0500 Subject: Fixing the calls into the about_to_show stuff so that we can add callbacks. --- libdbusmenu-gtk/client.c | 4 +++- libdbusmenu-gtk/menu.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 4c82f40..bef27dd 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -115,7 +115,9 @@ menu_pressed_cb (GtkMenuItem * gmi, DbusmenuMenuitem * mi) g_value_set_int(&value, 0); dbusmenu_menuitem_handle_event(mi, "clicked", &value, gtk_get_current_event_time()); } else { - dbusmenu_menuitem_send_about_to_show(mi); + /* 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; } diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index 8a2b318..103ecfe 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -100,7 +100,9 @@ menu_focus_cb(DbusmenuGtkMenu * menu, gpointer userdata) { DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu); if (priv->client != NULL) { - dbusmenu_client_send_about_to_show(DBUSMENU_CLIENT(priv->client), 0); + /* TODO: We should stop the display of the menu + until the about to show call returns. */ + dbusmenu_client_send_about_to_show(DBUSMENU_CLIENT(priv->client), 0, NULL, NULL); } return; } -- cgit v1.2.3