[maemo-commits] [maemo-commits] r9347 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: timj
Date: 2007-01-25 15:46:26 +0200 (Thu, 25 Jan 2007)
New Revision: 9347

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmodule.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmodule.h
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmulticontext.h
Log:
Thu Jan 25 14:44:44 2007  Tim Janik  <timj at imendio.com>

        * gtk/gtkimmulticontext.h: 
        * gtk/gtkimmodule.h:
        * gtk/gtkimmodule.c: fixed MAEMO_CHANGES guarding const.




Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-25 13:41:18 UTC (rev 9346)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-25 13:46:26 UTC (rev 9347)
@@ -1,3 +1,9 @@
+Thu Jan 25 14:44:44 2007  Tim Janik  <timj at imendio.com>
+
+	* gtk/gtkimmulticontext.h: 
+	* gtk/gtkimmodule.h:
+	* gtk/gtkimmodule.c: fixed MAEMO_CHANGES guarding const.
+
 Thu Jan 25 14:08:30 2007  Tim Janik  <timj at imendio.com>
 
 	* gtk/gtktreeselection.c: conditionalize with MAEMO_CHANGES.

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmodule.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmodule.c	2007-01-25 13:41:18 UTC (rev 9346)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmodule.c	2007-01-25 13:46:26 UTC (rev 9347)
@@ -525,6 +525,9 @@
  *    the value is newly allocated and must be freed
  *    with g_free().
  **/
+#ifndef MAEMO_CHANGES
+const
+#endif /* MAEMO_CHANGES */
 gchar *
 _gtk_im_module_get_default_context_id (const gchar *locale)
 {

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmodule.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmodule.h	2007-01-25 13:41:18 UTC (rev 9346)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmodule.h	2007-01-25 13:46:26 UTC (rev 9347)
@@ -41,7 +41,7 @@
 void          _gtk_im_module_list                   (const GtkIMContextInfo ***contexts,
 						    guint                    *n_contexts);
 GtkIMContext *_gtk_im_module_create                 (const gchar             *context_id);
-#ifdef MAEMO_CHANGES
+#ifndef MAEMO_CHANGES
 const
 #endif /* MAEMO_CHANGES */
 gchar        * _gtk_im_module_get_default_context_id (const gchar             *lang);

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmulticontext.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmulticontext.h	2007-01-25 13:41:18 UTC (rev 9346)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmulticontext.h	2007-01-25 13:46:26 UTC (rev 9347)
@@ -45,7 +45,7 @@
 
   GtkIMMulticontextPrivate *priv;
 
-#ifdef MAEMO_CHANGES
+#ifndef MAEMO_CHANGES
   const
 #endif /* MAEMO_CHANGES */
   gchar *context_id;