diff --git a/ChangeLog b/ChangeLog
index 51553b532f..95e7005615 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Nov 25 14:32:35 2004  Manish Singh  <yosh@gimp.org>
+
+	* gdk/abicheck.sh
+	* gtk/abicheck.sh: filter out G_GNUC stuff when doing the compare.
+
+	* gtk/gtkmenuitem.c (gtk_menu_shell_button_release): add
+	GTK_MENU_ITEM() cast.
+
 2004-11-25  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* configure.in: Add forgotten «nb» to ALL_LINGUAS.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 51553b532f..95e7005615 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Thu Nov 25 14:32:35 2004  Manish Singh  <yosh@gimp.org>
+
+	* gdk/abicheck.sh
+	* gtk/abicheck.sh: filter out G_GNUC stuff when doing the compare.
+
+	* gtk/gtkmenuitem.c (gtk_menu_shell_button_release): add
+	GTK_MENU_ITEM() cast.
+
 2004-11-25  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* configure.in: Add forgotten «nb» to ALL_LINGUAS.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 51553b532f..95e7005615 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Thu Nov 25 14:32:35 2004  Manish Singh  <yosh@gimp.org>
+
+	* gdk/abicheck.sh
+	* gtk/abicheck.sh: filter out G_GNUC stuff when doing the compare.
+
+	* gtk/gtkmenuitem.c (gtk_menu_shell_button_release): add
+	GTK_MENU_ITEM() cast.
+
 2004-11-25  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* configure.in: Add forgotten «nb» to ALL_LINGUAS.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 51553b532f..95e7005615 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Thu Nov 25 14:32:35 2004  Manish Singh  <yosh@gimp.org>
+
+	* gdk/abicheck.sh
+	* gtk/abicheck.sh: filter out G_GNUC stuff when doing the compare.
+
+	* gtk/gtkmenuitem.c (gtk_menu_shell_button_release): add
+	GTK_MENU_ITEM() cast.
+
 2004-11-25  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* configure.in: Add forgotten «nb» to ALL_LINGUAS.
diff --git a/gdk/abicheck.sh b/gdk/abicheck.sh
index e5fc5e6b87..c902d5f8fc 100755
--- a/gdk/abicheck.sh
+++ b/gdk/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' | sort > expected-abi
+cpp -P -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort > expected-abi
 nm -D .libs/libgdk-x11-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi
diff --git a/gtk/abicheck.sh b/gtk/abicheck.sh
index 327c1b5308..0e9a85f10b 100755
--- a/gtk/abicheck.sh
+++ b/gtk/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' | sort > expected-abi
+cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort > expected-abi
 nm -D .libs/libgtk-x11-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index a0e5f00deb..0a74078368 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -510,7 +510,7 @@ gtk_menu_shell_button_release (GtkWidget      *widget,
 	      if (GTK_MENU_ITEM (menu_item)->submenu == NULL)
 		gtk_menu_shell_activate_item (menu_shell, menu_item, TRUE);
 	      else
-		gtk_menu_item_select (menu_item);
+		gtk_menu_item_select (GTK_MENU_ITEM (menu_item));
 	      return TRUE;
 	    }
 	  else if (menu_item &&