Fix the signature to avoid overwriting a pspec.

2004-12-13  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature
	to avoid overwriting a pspec.

diff --git a/ChangeLog b/ChangeLog
index ce929d11d264ddf2116408d268ea535898880485..926249eabfcf7391305401eba3212ed4d2f03a26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 ce929d11d264ddf2116408d268ea535898880485..926249eabfcf7391305401eba3212ed4d2f03a26 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 ce929d11d264ddf2116408d268ea535898880485..926249eabfcf7391305401eba3212ed4d2f03a26 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 ce929d11d264ddf2116408d268ea535898880485..926249eabfcf7391305401eba3212ed4d2f03a26 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 375005de7464750d5d50d2962e88f85df863b4b0..9df9ea9d908b22ce9949584786e43a0e07a20270 100644 (file)
--- 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);
 }