[maemo-commits] [maemo-commits] r9686 - in projects/haf/tags/gtk+2.0: . 2.10.6-0osso4test1/debian 2.10.6-0osso4test1/gdk 2.10.6-0osso4test1/gtk

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-02-06 15:59:36 +0200 (Tue, 06 Feb 2007)
New Revision: 9686

Added:
   projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/
Modified:
   projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/debian/changelog
   projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/gdk/gdkwindow.h
   projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/gtk/gtkentry.h
   projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/gtk/gtkimcontext.h
   projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/gtk/gtktreeview.h
Log:
2.10.6-0osso4test1.



Copied: projects/haf/tags/gtk+2.0/2.10.6-0osso4test1 (from rev 9685, projects/haf/branches/gtk+/maemo-gtk-2-10)

Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/debian/changelog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/debian/changelog	2007-02-06 13:54:17 UTC (rev 9685)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/debian/changelog	2007-02-06 13:59:36 UTC (rev 9686)
@@ -1,3 +1,9 @@
+gtk+2.0 (2:2.10.6-0osso4test1) experimental; urgency=low
+
+  * Restore the ABI compatibility with stock GTK+.
+
+ -- Xan Lopez <xan.lopez at nokia.com>  Tue,  6 Feb 2007 14:01:18 +0200
+
 gtk+2.0 (2:2.10.6-0osso4) experimental; urgency=low
 
   NOTE: Please remember you need to add "MAEMO_CHANGES" to your compilation

Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/gdk/gdkwindow.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h	2007-02-06 13:54:17 UTC (rev 9685)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/gdk/gdkwindow.h	2007-02-06 13:59:36 UTC (rev 9686)
@@ -140,7 +140,7 @@
   GDK_WINDOW_TYPE_HINT_COMBO,
   GDK_WINDOW_TYPE_HINT_DND,
 #ifdef MAEMO_CHANGES
-  GDK_WINDOW_TYPE_HINT_MESSAGE = GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU,
+  GDK_WINDOW_TYPE_HINT_MESSAGE = 1000
 #endif /* MAEMO_CHANGES */
 } GdkWindowTypeHint;
 

Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/gtk/gtkentry.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h	2007-02-06 13:54:17 UTC (rev 9685)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/gtk/gtkentry.h	2007-02-06 13:59:36 UTC (rev 9686)
@@ -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/tags/gtk+2.0/2.10.6-0osso4test1/gtk/gtkimcontext.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h	2007-02-06 13:54:17 UTC (rev 9685)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/gtk/gtkimcontext.h	2007-02-06 13:59:36 UTC (rev 9686)
@@ -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/tags/gtk+2.0/2.10.6-0osso4test1/gtk/gtktreeview.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h	2007-02-06 13:54:17 UTC (rev 9685)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso4test1/gtk/gtktreeview.h	2007-02-06 13:59:36 UTC (rev 9686)
@@ -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);
 };