gdk/abicheck.sh filter out G_GNUC stuff when doing the compare.

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.

diff --git a/ChangeLog b/ChangeLog
index 51553b532f04cf0c5d07a9b2e2f7ef8597d2fc0d..95e70056155d69c0b0e2e84e59234a6d965263b7 100644 (file)
--- 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 51553b532f04cf0c5d07a9b2e2f7ef8597d2fc0d..95e70056155d69c0b0e2e84e59234a6d965263b7 100644 (file)
--- 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 51553b532f04cf0c5d07a9b2e2f7ef8597d2fc0d..95e70056155d69c0b0e2e84e59234a6d965263b7 100644 (file)
--- 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 51553b532f04cf0c5d07a9b2e2f7ef8597d2fc0d..95e70056155d69c0b0e2e84e59234a6d965263b7 100644 (file)
--- 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 e5fc5e6b873c1d98e4c5fe43689ccf87abc7b501..c902d5f8fc0b1b2cc150a7fbd3f1824c338bc920 100755 (executable)
--- 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 327c1b5308fc2f1bfcadfe46dfb6edc52ecd492b..0e9a85f10bf5a70bfedc637f49158c461dcef0b3 100755 (executable)
--- 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 a0e5f00debf6fb1222bad8e2d3618986ade950fd..0a740783680a1e001add9783c8dabe124e272656 100644 (file)
--- 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 &&