callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup using gtk_menu_attach_to_widget. Also fixes leak, see #133411.

Browse Source 
2004-02-06  Morten Welinder  <terra@gnome.org>

	* gtk/gtktoolbar.c (show_menu): Cleanup using
	gtk_menu_attach_to_widget.  Also fixes leak, see #133411.
This commit is contained in:
Morten Welinder 2004-02-06 21:18:50 +00:00 committed by Morten Welinder
parent d8b6a89a12
commit 95ba48b38f
6 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-02-06 Morten Welinder <terra@gnome.org>
* gtk/gtktoolbar.c (show_menu): Cleanup using
gtk_menu_attach_to_widget. Also fixes leak, see #133411.
2004-02-06 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Free the

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2004-02-06 Morten Welinder <terra@gnome.org>
* gtk/gtktoolbar.c (show_menu): Cleanup using
gtk_menu_attach_to_widget. Also fixes leak, see #133411.
2004-02-06 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Free the

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
2004-02-06 Morten Welinder <terra@gnome.org>
* gtk/gtktoolbar.c (show_menu): Cleanup using
gtk_menu_attach_to_widget. Also fixes leak, see #133411.
2004-02-06 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Free the

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
2004-02-06 Morten Welinder <terra@gnome.org>
* gtk/gtktoolbar.c (show_menu): Cleanup using
gtk_menu_attach_to_widget. Also fixes leak, see #133411.
2004-02-06 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Free the

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2004-02-06 Morten Welinder <terra@gnome.org>
* gtk/gtktoolbar.c (show_menu): Cleanup using
gtk_menu_attach_to_widget. Also fixes leak, see #133411.
2004-02-06 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Free the

18
gtk/gtktoolbar.c
View File

@ -2422,10 +2422,17 @@ menu_deactivated (GtkWidget *menu,
GtkToolbar *toolbar)
{
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->arrow_button), FALSE);
}
static void
menu_detached (GtkWidget *toolbar,
GtkMenu *menu)
{
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
priv->menu = NULL;
}
static void
remove_item (GtkWidget *menu_item,
gpointer data)
@ -2445,10 +2452,13 @@ show_menu (GtkToolbar *toolbar,
gtk_container_foreach (GTK_CONTAINER (priv->menu), remove_item, NULL);
gtk_widget_destroy (GTK_WIDGET (priv->menu));
}
priv->menu = GTK_MENU (gtk_menu_new ());
gtk_menu_attach_to_widget (priv->menu,
GTK_WIDGET (toolbar),
menu_detached);
g_signal_connect (priv->menu, "deactivate", G_CALLBACK (menu_deactivated), toolbar);
for (list = priv->content; list != NULL; list = list->next)
{
ToolbarContent *content = list->data;
@ -2466,8 +2476,6 @@ show_menu (GtkToolbar *toolbar,
}
}
gtk_window_set_screen (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (priv->menu))),
gtk_widget_get_screen (GTK_WIDGET (toolbar)));
gtk_widget_show_all (GTK_WIDGET (priv->menu));
gtk_menu_popup (priv->menu, NULL, NULL,