[maemo-commits] [maemo-commits] r9098 - in projects/haf/tags/gtk+2.0: . 2.10.6-0osso2test1 2.10.6-0osso2test1/debian 2.10.6-0osso2test1/gdk 2.10.6-0osso2test1/gtk
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Jan 15 18:39:18 EET 2007
- Previous message: [maemo-commits] r9097 - projects/haf/tags/gtk+2.0
- Next message: [maemo-commits] r9099 - projects/haf/branches/gtk+/maemo-gtk-2-10/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: tko
Date: 2007-01-15 18:39:17 +0200 (Mon, 15 Jan 2007)
New Revision: 9098
Added:
projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/
Modified:
projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/ChangeLog
projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/debian/changelog
projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/debian/rules
projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gdk/gdkwindow.h
projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtkentry.h
projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtkimcontext.h
projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtkmenushell.h
projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtktoolbutton.h
projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtktreeview.h
Log:
gtk+2.0 (2:2.10.6-0osso2test1) unstable; urgency=low
* !!ABI BREAK!! Restore the ABI to be compatible with stock gtk+ 2.10
* Move added enums and vtable entries to the end (or beyond) to be safe
against upstream additions
- GtkTreeView::row-insensitive signal
- GtkToolButton::insensitive-press signal
- GtkIMContext signals
- GtkEntry::invalid-input signal
- GtkMenuShell::close signal
- GDK_WINDOW_TYPE_HINT_MESSAGE
* debian/rules: update shlibs to >= 2:2.10.6-0osso2test1
Copied: projects/haf/tags/gtk+2.0/2.10.6-0osso2test1 (from rev 9097, projects/haf/tags/gtk+2.0/2.10.6-0osso2)
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/ChangeLog
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.6-0osso2/ChangeLog 2007-01-15 16:33:36 UTC (rev 9097)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/ChangeLog 2007-01-15 16:39:17 UTC (rev 9098)
@@ -1,3 +1,16 @@
+2007-01-15 Michael Natterer <mitch at imendio.com>
+
+ * gdk/gdkwindow.h: move GDK_WINDOW_TYPE_HINT_MESSAGE to the end of
+ the enum and changed its value to 1000 to be safe against upstream
+ value additions.
+
+ * gtk/gtktreeview.h
+ * gtk/gtktoolbutton.h
+ * gtk/gtkimcontext.h
+ * gtk/gtkentry.h
+ * gtk/gtkmenushell.h: move maemo vtable entries to the end of the
+ class structs to be safe against upstream vtable additions.
+
2007-01-14 Kristian Rietveld <kris at imendio.com>
* gtk/gtktreeselection.c (tree_column_is_sensitive),
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/debian/changelog
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.6-0osso2/debian/changelog 2007-01-15 16:33:36 UTC (rev 9097)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/debian/changelog 2007-01-15 16:39:17 UTC (rev 9098)
@@ -1,3 +1,20 @@
+gtk+2.0 (2:2.10.6-0osso2test1) unstable; urgency=low
+
+ * !!ABI BREAK!! Restore the ABI to be compatible with stock gtk+ 2.10
+
+ * Move added enums and vtable entries to the end (or beyond) to be safe
+ against upstream additions
+ - GtkTreeView::row-insensitive signal
+ - GtkToolButton::insensitive-press signal
+ - GtkIMContext signals
+ - GtkEntry::invalid-input signal
+ - GtkMenuShell::close signal
+ - GDK_WINDOW_TYPE_HINT_MESSAGE
+
+ * debian/rules: update shlibs to >= 2:2.10.6-0osso2test1
+
+ -- Tommi Komulainen <tommi.komulainen at nokia.com> Mon, 15 Jan 2007 18:36:07 +0200
+
gtk+2.0 (2:2.10.6-0osso2) unstable; urgency=low
* Restore API compatibility with maemo gtk+ 2.6
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/debian/rules
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.6-0osso2/debian/rules 2007-01-15 16:33:36 UTC (rev 9097)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/debian/rules 2007-01-15 16:39:17 UTC (rev 9098)
@@ -268,7 +268,7 @@
dh_compress -a
dh_fixperms -a
dh_makeshlibs -a -Nlibgtk$(apiver)-$(soname)-dbg
- dh_makeshlibs -n -X usr/lib/gtk-$(apiver) -plibgtk$(apiver)-$(soname)$(suffix) -V "libgtk${apiver}-${soname}${suffix} (>= 2:2.10.6)"
+ dh_makeshlibs -n -X usr/lib/gtk-$(apiver) -plibgtk$(apiver)-$(soname)$(suffix) -V "libgtk${apiver}-${soname}${suffix} (>= 2:2.10.6-0osso2test1)"
dh_installdeb -a
dh_shlibdeps -l$(libpath) -a
cat debian/*/DEBIAN/shlibs > debian/shlibs.local
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gdk/gdkwindow.h
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.6-0osso2/gdk/gdkwindow.h 2007-01-15 16:33:36 UTC (rev 9097)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gdk/gdkwindow.h 2007-01-15 16:39:17 UTC (rev 9098)
@@ -133,15 +133,15 @@
GDK_WINDOW_TYPE_HINT_UTILITY,
GDK_WINDOW_TYPE_HINT_DOCK,
GDK_WINDOW_TYPE_HINT_DESKTOP,
- /* MEAMO START */
- GDK_WINDOW_TYPE_HINT_MESSAGE,
- /* MAEMO END */
- GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU = GDK_WINDOW_TYPE_HINT_MESSAGE, /* A drop down menu (from a menubar) */
+ GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU, /* A drop down menu (from a menubar) */
GDK_WINDOW_TYPE_HINT_POPUP_MENU, /* A popup menu (from right-click) */
GDK_WINDOW_TYPE_HINT_TOOLTIP,
GDK_WINDOW_TYPE_HINT_NOTIFICATION,
GDK_WINDOW_TYPE_HINT_COMBO,
GDK_WINDOW_TYPE_HINT_DND
+ /* MAEMO START */
+ , GDK_WINDOW_TYPE_HINT_MESSAGE = 1000
+ /* MAEMO END */
} GdkWindowTypeHint;
/* The next two enumeration values current match the
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtkentry.h
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.6-0osso2/gtk/gtkentry.h 2007-01-15 16:33:36 UTC (rev 9097)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtkentry.h 2007-01-15 16:39:17 UTC (rev 9098)
@@ -135,17 +135,14 @@
void (* paste_clipboard) (GtkEntry *entry);
void (* toggle_overwrite) (GtkEntry *entry);
- /* MAEMO START */
- void (* invalid_input) (GtkEntry *entry,
- GtkInvalidInputType invalid_input_type);
- /* MAEMO END */
-
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
/* MAEMO START */
/* void (*_gtk_reserved3) (void); */
+ void (* invalid_input) (GtkEntry *entry,
+ GtkInvalidInputType invalid_input_type);
/* MAEMO END */
};
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtkimcontext.h
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.6-0osso2/gtk/gtkimcontext.h 2007-01-15 16:33:36 UTC (rev 9097)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtkimcontext.h 2007-01-15 16:39:17 UTC (rev 9098)
@@ -92,7 +92,17 @@
gchar **text,
gint *cursor_index);
+ /* Padding for future expansion */
+ void (*_gtk_reserved1) (void);
+
/* MAEMO START */
+#if 0
+ void (*_gtk_reserved2) (void);
+ void (*_gtk_reserved3) (void);
+ void (*_gtk_reserved4) (void);
+ void (*_gtk_reserved5) (void);
+ void (*_gtk_reserved6) (void);
+#endif
void (*show) (GtkIMContext *context);
void (*hide) (GtkIMContext *context);
@@ -105,19 +115,6 @@
gboolean (*filter_event) (GtkIMContext *context,
GdkEvent *event);
/* MAEMO END */
-
- /* Padding for future expansion */
- void (*_gtk_reserved1) (void);
-
- /* MAEMO START */
-#if 0
- void (*_gtk_reserved2) (void);
- void (*_gtk_reserved3) (void);
- void (*_gtk_reserved4) (void);
- void (*_gtk_reserved5) (void);
- void (*_gtk_reserved6) (void);
-#endif
- /* MAEMO END */
};
GType gtk_im_context_get_type (void) G_GNUC_CONST;
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtkmenushell.h
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.6-0osso2/gtk/gtkmenushell.h 2007-01-15 16:33:36 UTC (rev 9097)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtkmenushell.h 2007-01-15 16:39:17 UTC (rev 9098)
@@ -85,16 +85,13 @@
gint position);
gint (*get_popup_delay) (GtkMenuShell *menu_shell);
- /* MAEMO START */
- void (*close) (GtkMenuShell *menu_shell);
- /* MAEMO END */
-
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
/* MAEMO START */
/* void (*_gtk_reserved3) (void); */
+ void (*close) (GtkMenuShell *menu_shell);
/* MAEMO END */
};
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtktoolbutton.h
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.6-0osso2/gtk/gtktoolbutton.h 2007-01-15 16:33:36 UTC (rev 9097)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtktoolbutton.h 2007-01-15 16:39:17 UTC (rev 9098)
@@ -55,10 +55,6 @@
/* signal */
void (* clicked) (GtkToolButton *tool_item);
- /* MAEMO START */
- void (* insensitive_press) (GtkToolButton *tool_item);
- /* MAEMO END */
-
/* Padding for future expansion */
void (* _gtk_reserved1) (void);
void (* _gtk_reserved2) (void);
@@ -66,6 +62,7 @@
/* MAEMO START */
/* void (* _gtk_reserved4) (void); */
+ void (* insensitive_press) (GtkToolButton *tool_item);
/* MAEMO END */
};
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtktreeview.h
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.6-0osso2/gtk/gtktreeview.h 2007-01-15 16:33:36 UTC (rev 9097)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso2test1/gtk/gtktreeview.h 2007-01-15 16:39:17 UTC (rev 9098)
@@ -103,11 +103,6 @@
gboolean (* select_cursor_parent) (GtkTreeView *tree_view);
gboolean (* start_interactive_search) (GtkTreeView *tree_view);
- /* MAEMO START */
- void (* row_insensitive) (GtkTreeView *tree_view,
- GtkTreePath *path);
- /* MAEMO END */
-
/* Padding for future expansion */
void (*_gtk_reserved0) (void);
void (*_gtk_reserved1) (void);
@@ -116,6 +111,8 @@
/* MAEMO START */
/* void (*_gtk_reserved4) (void); */
+ void (* row_insensitive) (GtkTreeView *tree_view,
+ GtkTreePath *path);
/* MAEMO END */
};
- Previous message: [maemo-commits] r9097 - projects/haf/tags/gtk+2.0
- Next message: [maemo-commits] r9099 - projects/haf/branches/gtk+/maemo-gtk-2-10/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]