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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-03-13 16:47:52 +0200 (Tue, 13 Mar 2007)
New Revision: 10552

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h
Log:

	* gtk/gtkentry.h:
	* gtk/gtkimcontext.h:
	* gtk/gtktreeview.h:

	Restore the upstream ABI compatibility.


Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-13 14:46:55 UTC (rev 10551)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-13 14:47:52 UTC (rev 10552)
@@ -1,5 +1,13 @@
 2007-03-13  Xan Lopez  <xan.lopez at nokia.com>
 
+	* gtk/gtkentry.h:
+	* gtk/gtkimcontext.h:
+	* gtk/gtktreeview.h:
+
+	Restore the upstream ABI compatibility.
+	
+2007-03-13  Xan Lopez  <xan.lopez at nokia.com>
+
 	* gtk/gtkenums.h:
 	* gtk/gtkiconfactory.c:
 	* gtk/gtkstyle.c:

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h	2007-03-13 14:46:55 UTC (rev 10551)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h	2007-03-13 14:47:52 UTC (rev 10552)
@@ -135,18 +135,16 @@
   void (* paste_clipboard)    (GtkEntry       *entry);
   void (* toggle_overwrite)   (GtkEntry       *entry);
 
-#ifdef MAEMO_CHANGES
-  void (* invalid_input) (GtkEntry            *entry,
-                          GtkInvalidInputType  invalid_input_type);
-#endif /* MAEMO_CHANGES */
-
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
 
-#ifndef MAEMO_CHANGES
+#ifdef MAEMO_CHANGES
+  void (* invalid_input) (GtkEntry            *entry,
+                          GtkInvalidInputType  invalid_input_type);
+#else
   void (*_gtk_reserved3) (void);
-#endif /* !MAEMO_CHANGES */
+#endif /* MAEMO_CHANGES */
 };
 
 GType      gtk_entry_get_type       		(void) G_GNUC_CONST;

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h	2007-03-13 14:46:55 UTC (rev 10551)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h	2007-03-13 14:47:52 UTC (rev 10552)
@@ -92,6 +92,9 @@
 				   gchar         **text,
 				   gint           *cursor_index);
 
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+
 #ifdef MAEMO_CHANGES
   void     (*show)                (GtkIMContext   *context);
   void     (*hide)                (GtkIMContext   *context);
@@ -105,14 +108,12 @@
   gboolean (*filter_event)        (GtkIMContext   *context,
                                    GdkEvent       *event);
 #else   /* MAEMO_CHANGES */
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
   void (*_gtk_reserved5) (void);
+  void (*_gtk_reserved6) (void);
 #endif /* MAEMO_CHANGES */
-  void (*_gtk_reserved6) (void);
 };
 
 GType    gtk_im_context_get_type            (void) G_GNUC_CONST;

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h	2007-03-13 14:46:55 UTC (rev 10551)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h	2007-03-13 14:47:52 UTC (rev 10552)
@@ -104,14 +104,17 @@
   gboolean (* start_interactive_search)   (GtkTreeView       *tree_view);
 
   /* Padding for future expansion */
+  void (*_gtk_reserved0) (void);
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+
 #ifdef MAEMO_CHANGES
   void     (* row_insensitive)            (GtkTreeView       *tree_view,
                                            GtkTreePath       *path);
+#else
+  void (*_gtk_reserved4) (void);
 #endif /* MAEMO_CHANGES */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
 };