[maemo-commits] [maemo-commits] r8975 - in projects/haf/tags/gtk+2.0: . 2.10.6-0osso1test2 2.10.6-0osso1test2/gtk

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-01-05 16:41:43 +0200 (Fri, 05 Jan 2007)
New Revision: 8975

Added:
   projects/haf/tags/gtk+2.0/2.10.6-0osso1test2/
Modified:
   projects/haf/tags/gtk+2.0/2.10.6-0osso1test2/ChangeLog
   projects/haf/tags/gtk+2.0/2.10.6-0osso1test2/gtk/gtkimmodule.c
Log:
gtk+2.0 (2:2.10.6-0osso1test2) 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
    - GtkMenuShell::close signal
    - GDK_WINDOW_TYPE_HINT_MESSAGE

  * debian/rules: update shlibs to >= 2:2.10.6-0osso1test2


Copied: projects/haf/tags/gtk+2.0/2.10.6-0osso1test2 (from rev 8971, projects/haf/tags/gtk+2.0/2.10.6-0osso1test2)

Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso1test2/ChangeLog
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.6-0osso1test2/ChangeLog	2007-01-05 14:14:48 UTC (rev 8971)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso1test2/ChangeLog	2007-01-05 14:41:43 UTC (rev 8975)
@@ -1,3 +1,8 @@
+2006-01-05  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* gtk/gtkimmodule.c (_gtk_im_module_get_default_context_id): Drop
+	'const' also in the .c file to avoid compile errors.
+
 2006-01-04  Michael Natterer  <mitch at imendio.com>
 
 	* gdk/gdkwindow.h: move GDK_WINDOW_TYPE_HINT_MESSAGE to the end of

Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso1test2/gtk/gtkimmodule.c
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.6-0osso1test2/gtk/gtkimmodule.c	2007-01-05 14:14:48 UTC (rev 8971)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso1test2/gtk/gtkimmodule.c	2007-01-05 14:41:43 UTC (rev 8975)
@@ -525,7 +525,8 @@
  *    the value is newly allocated and must be freed
  *    with g_free().
  **/
-const gchar *
+/* MAEMO CHANGE: dropped const */
+gchar *
 _gtk_im_module_get_default_context_id (const gchar *locale)
 {
   GSList *tmp_list;