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

[From: subversion at stage.maemo.org]

Author: timj
Date: 2007-01-23 15:59:42 +0200 (Tue, 23 Jan 2007)
New Revision: 9268

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.h
Log:
Tue Jan 23 14:59:06 2007  Tim Janik  <timj at imendio.com>

        * gtk/gtkmenushell.h: conditionalize maemo chanegs with MAEMO_CHANGES.




Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-23 13:59:19 UTC (rev 9267)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-23 13:59:42 UTC (rev 9268)
@@ -1,3 +1,7 @@
+Tue Jan 23 14:59:06 2007  Tim Janik  <timj at imendio.com>
+
+	* gtk/gtkmenushell.h: conditionalize maemo chanegs with MAEMO_CHANGES.
+
 Tue Jan 23 14:33:33 2007  Tim Janik  <timj at imendio.com>
 
 	* gtk/gtkstyle.c (gtk_default_render_icon): fixed MAEMO_CHANGES

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.h	2007-01-23 13:59:19 UTC (rev 9267)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.h	2007-01-23 13:59:42 UTC (rev 9268)
@@ -85,17 +85,15 @@
 			    gint          position);
   gint (*get_popup_delay)  (GtkMenuShell *menu_shell);
 
-  /* MAEMO START */
-  void (*close)            (GtkMenuShell *menu_shell);
-  /* MAEMO END */
-
   /* Padding for future expansion */
+#ifdef MAEMO_CHANGES
+  void (*close)            (GtkMenuShell *menu_shell);
+#else   /* !MAEMO_CHANGES */
   void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
+#endif  /* !MAEMO_CHANGES */
 
-  /* MAEMO START */
-  /* void (*_gtk_reserved3) (void); */
-  /* MAEMO END */
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
 };