From 7d9dfbd20e912f1596b041e71b2208a1ddfc35fa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 13 Dec 2004 19:53:19 +0000 Subject: [PATCH] Fix the signature to avoid overwriting a pspec. 2004-12-13 Matthias Clasen * gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature to avoid overwriting a pspec. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtktearoffmenuitem.c | 5 ++++- 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ce929d11d2..926249eabf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-12-13 Matthias Clasen + * gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature + to avoid overwriting a pspec. + * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Revert a change which prevented torn-off menus from being shown normally. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ce929d11d2..926249eabf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-12-13 Matthias Clasen + * gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature + to avoid overwriting a pspec. + * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Revert a change which prevented torn-off menus from being shown normally. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ce929d11d2..926249eabf 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-12-13 Matthias Clasen + * gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature + to avoid overwriting a pspec. + * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Revert a change which prevented torn-off menus from being shown normally. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ce929d11d2..926249eabf 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-12-13 Matthias Clasen + * gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature + to avoid overwriting a pspec. + * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Revert a change which prevented torn-off menus from being shown normally. diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c index 375005de74..9df9ea9d90 100644 --- a/gtk/gtktearoffmenuitem.c +++ b/gtk/gtktearoffmenuitem.c @@ -257,8 +257,11 @@ gtk_tearoff_menu_item_activate (GtkMenuItem *menu_item) static void tearoff_state_changed (GtkMenu *menu, - GtkTearoffMenuItem *tearoff_menu_item) + GParamSpec *pspec, + gpointer data) { + GtkTearoffMenuItem *tearoff_menu_item = GTK_TEAROFF_MENU_ITEM (data); + tearoff_menu_item->torn_off = gtk_menu_get_tearoff_state (menu); }