From 75b60575be726c73ace0700c52e526f869c1448f Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 6 Feb 2003 23:22:50 +0000 Subject: (e_auto_kill_popup_menu_on_selection_done): Rename from e_auto_kill_popup_menu_on_hide(). Connect to "deactivate" instead of destroy. (e_popup_menu): Use e_auto_kill_popup_menu_on_selection_done() instead of e_auto_kill_popup_menu_on_hide(). svn path=/trunk/; revision=19833 --- widgets/misc/e-gui-utils.c | 6 +++--- widgets/misc/e-gui-utils.h | 47 ++++++++++++++++++++++++---------------------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c index 9b4e3f3db2..6747ae2cff 100644 --- a/widgets/misc/e-gui-utils.c +++ b/widgets/misc/e-gui-utils.c @@ -58,11 +58,11 @@ e_notice (GtkWindow *parent, GtkMessageType type, const char *format, ...) } void -e_auto_kill_popup_menu_on_hide (GtkMenu *menu) +e_auto_kill_popup_menu_on_selection_done (GtkMenu *menu) { g_return_if_fail (GTK_IS_MENU (menu)); - g_signal_connect (menu, "hide", G_CALLBACK (gtk_widget_destroy), menu); + g_signal_connect (menu, "selection_done", G_CALLBACK (gtk_widget_destroy), menu); } void @@ -70,7 +70,7 @@ e_popup_menu (GtkMenu *menu, GdkEvent *event) { g_return_if_fail (GTK_IS_MENU (menu)); - e_auto_kill_popup_menu_on_hide (menu); + e_auto_kill_popup_menu_on_selection_done (menu); if (event->type == GDK_KEY_PRESS) gtk_menu_popup (menu, NULL, NULL, 0, NULL, 0, event->key.time); diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h index b401748e20..149fecdee6 100644 --- a/widgets/misc/e-gui-utils.h +++ b/widgets/misc/e-gui-utils.h @@ -32,29 +32,32 @@ G_BEGIN_DECLS -void e_popup_menu (GtkMenu *menu, - GdkEvent *event); -void e_auto_kill_popup_menu_on_hide (GtkMenu *menu); -void e_notice (GtkWindow *window, - GtkMessageType type, - const char *format, - ...); -void e_container_foreach_leaf (GtkContainer *container, - GtkCallback callback, - gpointer closure); -void e_container_focus_nth_entry (GtkContainer *container, - int n); -gint e_container_change_tab_order (GtkContainer *container, - GList *widgets); +void e_popup_menu (GtkMenu *menu, + GdkEvent *event); +void e_auto_kill_popup_menu_on_selection_done (GtkMenu *menu); + +void e_notice (GtkWindow *window, + GtkMessageType type, + const char *format, + ...); + +void e_container_foreach_leaf (GtkContainer *container, + GtkCallback callback, + gpointer closure); +void e_container_focus_nth_entry (GtkContainer *container, + int n); +gint e_container_change_tab_order (GtkContainer *container, + GList *widgets); + /* Returns TRUE on success. */ -gboolean e_glade_xml_connect_widget (GladeXML *gui, - char *name, - char *signal, - GtkSignalFunc cb, - gpointer closure); -gboolean e_glade_xml_set_sensitive (GladeXML *gui, - char *name, - gboolean sensitive); +gboolean e_glade_xml_connect_widget (GladeXML *gui, + char *name, + char *signal, + GtkSignalFunc cb, + gpointer closure); +gboolean e_glade_xml_set_sensitive (GladeXML *gui, + char *name, + gboolean sensitive); G_END_DECLS -- cgit