[maemo-commits] [maemo-commits] r9496 - in projects/haf/tags/gtk+2.0: . 2.10.6-0osso3test1/debian 2.10.6-0osso3test1/gdk 2.10.6-0osso3test1/gtk
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Jan 31 15:19:58 EET 2007
- Previous message: [maemo-commits] r9495 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r9497 - projects/haf/hafbuildbot
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: xan
Date: 2007-01-31 15:19:56 +0200 (Wed, 31 Jan 2007)
New Revision: 9496
Added:
projects/haf/tags/gtk+2.0/2.10.6-0osso3test1/
Modified:
projects/haf/tags/gtk+2.0/2.10.6-0osso3test1/debian/changelog
projects/haf/tags/gtk+2.0/2.10.6-0osso3test1/gdk/gdkwindow.h
projects/haf/tags/gtk+2.0/2.10.6-0osso3test1/gtk/gtkentry.h
projects/haf/tags/gtk+2.0/2.10.6-0osso3test1/gtk/gtkimcontext.h
projects/haf/tags/gtk+2.0/2.10.6-0osso3test1/gtk/gtktreeview.h
Log:
New release.
Copied: projects/haf/tags/gtk+2.0/2.10.6-0osso3test1 (from rev 9495, projects/haf/branches/gtk+/maemo-gtk-2-10)
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso3test1/debian/changelog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/debian/changelog 2007-01-31 12:37:43 UTC (rev 9495)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso3test1/debian/changelog 2007-01-31 13:19:56 UTC (rev 9496)
@@ -1,5 +1,7 @@
-gtk+2.0 (2:2.10.6-0osso3) unstable; urgency=low
+gtk+2.0 (2:2.10.6-0osso3test1) unstable; urgency=low
+ ** REMEMBER: This release is ABI incompatible with maemo-gtk-2.6 **
+
* Backport from trunk:
- GtkComboBox keynav.
- Infrastructure and notification of failed navigation.
@@ -7,10 +9,12 @@
- GtkWidget::insensitive-press signal.
- gtkrc files parsing order.
- revert generic disabling of PRELIGHT state.
+ - Change GtkMenu window type, auto-select first item, various
+ drawing updates.
* Misc:
- Change MAEMO_CHANGES comments to #ifdef/#endif to allow conditionalized
inclusion of maemo-gtk changes during compilation.
-
+
-- Xan Lopez <xan.lopez at nokia.com> Thu, 25 Jan 2007 11:53:23 +0200
gtk+2.0 (2:2.10.6-0osso2) unstable; urgency=low
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso3test1/gdk/gdkwindow.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h 2007-01-31 12:37:43 UTC (rev 9495)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso3test1/gdk/gdkwindow.h 2007-01-31 13:19:56 UTC (rev 9496)
@@ -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-0osso3test1/gtk/gtkentry.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h 2007-01-31 12:37:43 UTC (rev 9495)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso3test1/gtk/gtkentry.h 2007-01-31 13:19:56 UTC (rev 9496)
@@ -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-0osso3test1/gtk/gtkimcontext.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h 2007-01-31 12:37:43 UTC (rev 9495)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso3test1/gtk/gtkimcontext.h 2007-01-31 13:19:56 UTC (rev 9496)
@@ -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-0osso3test1/gtk/gtktreeview.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h 2007-01-31 12:37:43 UTC (rev 9495)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso3test1/gtk/gtktreeview.h 2007-01-31 13:19:56 UTC (rev 9496)
@@ -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);
};
- Previous message: [maemo-commits] r9495 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r9497 - projects/haf/hafbuildbot
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]