[maemo-commits] [maemo-commits] r9892 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-02-15 11:58:05 +0200 (Thu, 15 Feb 2007)
New Revision: 9892

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.c
Log:
2007-02-15  Michael Natterer  <mitch at imendio.com>

	Merged from upstream trunk:

	* gtk/gtkmenushell.c: remove two antique function typedefs that
	are probably obsolete for ages.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-15 09:55:13 UTC (rev 9891)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-15 09:58:05 UTC (rev 9892)
@@ -1,5 +1,12 @@
 2007-02-15  Michael Natterer  <mitch at imendio.com>
 
+	Merged from upstream trunk:
+
+	* gtk/gtkmenushell.c: remove two antique function typedefs that
+	are probably obsolete for ages.
+
+2007-02-15  Michael Natterer  <mitch at imendio.com>
+
 	Port over the remaining logic changes from maemo-gtk-2-6. The
 	menus should behave as specified now.
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.c	2007-02-15 09:55:13 UTC (rev 9891)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.c	2007-02-15 09:58:05 UTC (rev 9892)
@@ -67,13 +67,6 @@
   PROP_TAKE_FOCUS
 };
 
-typedef void (*GtkMenuShellSignal1) (GtkObject           *object,
-				     GtkMenuDirectionType arg1,
-				     gpointer             data);
-typedef void (*GtkMenuShellSignal2) (GtkObject *object,
-				     gboolean   arg1,
-				     gpointer   data);
-
 /* Terminology:
  * 
  * A menu item can be "selected", this means that it is displayed