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

[From: subversion at stage.maemo.org]

Author: timj
Date: 2007-01-24 15:14:19 +0200 (Wed, 24 Jan 2007)
New Revision: 9293

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.h
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktoolbutton.h
Log:
Wed Jan 24 14:11:58 2007  Tim Janik  <timj at imendio.com>                                                                                                       
                                                                                                                                                              
        * gtk/gtktoolbutton.h (struct _GtkToolButtonClass):                                                                                                   
        * gtk/gtkmenushell.h (struct _GtkMenuShellClass): removed unused MAEMO                                                                                
        function pointers. they didn't really change ABI since they were simple                                                                               
        renames from gtk_reserved* and keeping the symbol names would just hide                                                                               
        erroneous uses in third-party components.                                                                                                             
                                                                                                                                                              



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-24 13:09:20 UTC (rev 9292)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-24 13:14:19 UTC (rev 9293)
@@ -1,3 +1,11 @@
+Wed Jan 24 14:11:58 2007  Tim Janik  <timj at imendio.com>
+
+	* gtk/gtktoolbutton.h (struct _GtkToolButtonClass): 
+	* gtk/gtkmenushell.h (struct _GtkMenuShellClass): removed unused MAEMO
+	function pointers. they didn't really change ABI since they were simple
+	renames from gtk_reserved* and keeping the symbol names would just hide
+	erroneous uses in third-party components.
+
 Wed Jan 24 13:37:41 2007  Tim Janik  <timj at imendio.com>
 
 	* gtkwidget.c: ported GtkWidget::insensitive-press from maemo-gtk-2-6,

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-24 13:09:20 UTC (rev 9292)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.h	2007-01-24 13:14:19 UTC (rev 9293)
@@ -86,12 +86,7 @@
   gint (*get_popup_delay)  (GtkMenuShell *menu_shell);
 
   /* Padding for future expansion */
-#ifdef MAEMO_CHANGES
-  void (*close)            (GtkMenuShell *menu_shell);
-#else   /* !MAEMO_CHANGES */
   void (*_gtk_reserved1) (void);
-#endif  /* !MAEMO_CHANGES */
-
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
 };

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktoolbutton.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktoolbutton.h	2007-01-24 13:09:20 UTC (rev 9292)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktoolbutton.h	2007-01-24 13:14:19 UTC (rev 9293)
@@ -56,11 +56,7 @@
   void       (* clicked)             (GtkToolButton    *tool_item);
 
   /* Padding for future expansion */
-#ifdef MAEMO_CHANGES
-  void       (* UNUSED_insensitive_press)   (GtkToolButton    *tool_item);
-#else
   void (* _gtk_reserved1) (void);
-#endif /* MAEMO_CHANGES */
   void (* _gtk_reserved2) (void);
   void (* _gtk_reserved3) (void);
   void (* _gtk_reserved4) (void);