[maemo-commits] [maemo-commits] r18537 - in projects/haf/branches/gtk+/upgrade-gtk-2-14: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2009-05-29 11:10:45 +0300 (Fri, 29 May 2009)
New Revision: 18537

Modified:
   projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog.pre-2-14.maemo
   projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtkimmodule.c
   projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtkimmodule.h
   projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtkimmulticontext.c
Log:
2009-05-29  Michael Natterer  <mitch at imendio.com>

	* gtk/gtkimmodule.[ch] (_gtk_im_module_get_default_context_id):
	return a const string again, effectively reverting the files
	to upstream.

	* gtk/gtkimmulticontext.c (get_global_context_id): dup the string
	returned by above function, so we always return an allocated
	string that can be freed.



Modified: projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog.pre-2-14.maemo
===================================================================
--- projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog.pre-2-14.maemo	2009-05-29 08:07:10 UTC (rev 18536)
+++ projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog.pre-2-14.maemo	2009-05-29 08:10:45 UTC (rev 18537)
@@ -1,8 +1,18 @@
+2009-05-29  Michael Natterer  <mitch at imendio.com>
+
+	* gtk/gtkimmodule.[ch] (_gtk_im_module_get_default_context_id):
+	return a const string again, effectively reverting the files
+	to upstream.
+
+	* gtk/gtkimmulticontext.c (get_global_context_id): dup the string
+	returned by above function, so we always return an allocated
+	string that can be freed.
+
 2009-05-27  Claudio Saavedra  <csaavedra at igalia.com>
 
-        Released 2:2.12.12-1maemo18
+	Released 2:2.12.12-1maemo18
 
-        * debian/changelog: Updates.
+	* debian/changelog: Updates.
 
 2009-05-22  Sven Herzberg  <herzi at lanedo.com>
 

Modified: projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtkimmodule.c
===================================================================
--- projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtkimmodule.c	2009-05-29 08:07:10 UTC (rev 18536)
+++ projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtkimmodule.c	2009-05-29 08:10:45 UTC (rev 18537)
@@ -647,10 +647,7 @@
  * 
  * Return value: the context ID (will never be %NULL)
  **/
-#ifndef MAEMO_CHANGES
-const
-#endif /* MAEMO_CHANGES */
-gchar *
+const gchar *
 _gtk_im_module_get_default_context_id (GdkWindow *client_window)
 {
   GSList *tmp_list;

Modified: projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtkimmodule.h
===================================================================
--- projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtkimmodule.h	2009-05-29 08:07:10 UTC (rev 18536)
+++ projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtkimmodule.h	2009-05-29 08:10:45 UTC (rev 18537)
@@ -40,10 +40,7 @@
 void           _gtk_im_module_list                   (const GtkIMContextInfo ***contexts,
 						      guint                    *n_contexts);
 GtkIMContext * _gtk_im_module_create                 (const gchar              *context_id);
-#ifndef MAEMO_CHANGES
-const
-#endif /* MAEMO_CHANGES */
-gchar        * _gtk_im_module_get_default_context_id (GdkWindow                *client_window);
+const gchar  * _gtk_im_module_get_default_context_id (GdkWindow                *client_window);
 
 /* The following entry points are exported by each input method module
  */

Modified: projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtkimmulticontext.c
===================================================================
--- projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtkimmulticontext.c	2009-05-29 08:07:10 UTC (rev 18536)
+++ projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtkimmulticontext.c	2009-05-29 08:10:45 UTC (rev 18537)
@@ -137,7 +137,7 @@
   if (!succeeded)
     {
       /* Fall back to default locale */
-      context_id = _gtk_im_module_get_default_context_id (NULL);
+      context_id = g_strdup (_gtk_im_module_get_default_context_id (NULL));
     }
 
   return context_id;