[maemo-commits] [maemo-commits] r12710 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-07-11 12:59:51 +0300 (Wed, 11 Jul 2007)
New Revision: 12710

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkentry.c
   projects/haf/trunk/gtk+/gtk/gtkimcontext.c
   projects/haf/trunk/gtk+/gtk/gtktextview.c
Log:
2007-07-10  Tomas Junnonen  <tomas.junnonen at nokia.com>

	* gtk/gtktextview.c (gtk_text_view_class_init):
	* gtk/gtkentry.c (gtk_entry_class_init):
	* gtk/gtk/gtkimcontext.c (gtk_im_context_class_init),
	(gtk_im_context_init):
	Set hildon-input-mode property upon object construction.
	Fixes NB#62955.

	* gtk/gtktextview.c (gtk_text_view_set_property),
	(gtk_text_view_get_property): Fix wrong value type being used
	for hildon-input-mode property.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-07-10 13:44:42 UTC (rev 12709)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-07-11 09:59:51 UTC (rev 12710)
@@ -1,3 +1,16 @@
+2007-07-10  Tomas Junnonen  <tomas.junnonen at nokia.com>
+
+	* gtk/gtktextview.c (gtk_text_view_class_init):
+	* gtk/gtkentry.c (gtk_entry_class_init):
+	* gtk/gtk/gtkimcontext.c (gtk_im_context_class_init),
+	(gtk_im_context_init):
+	Set hildon-input-mode property upon object construction.
+	Fixes NB#62955.
+
+	* gtk/gtktextview.c (gtk_text_view_set_property),
+	(gtk_text_view_get_property): Fix wrong value type being used
+	for hildon-input-mode property.
+
 2007-07-06  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
 	* gtk/gtkmenushell.c (gtk_menu_shell_insensitive_press): Avoid

Modified: projects/haf/trunk/gtk+/gtk/gtkentry.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkentry.c	2007-07-10 13:44:42 UTC (rev 12709)
+++ projects/haf/trunk/gtk+/gtk/gtkentry.c	2007-07-11 09:59:51 UTC (rev 12710)
@@ -629,7 +629,7 @@
                                                        HILDON_GTK_INPUT_MODE_FULL |
                                                        HILDON_GTK_INPUT_MODE_AUTOCAP |
                                                        HILDON_GTK_INPUT_MODE_DICTIONARY,
-                                                       GTK_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 #endif /* MAEMO_CHANGES */
  
   signals[POPULATE_POPUP] =

Modified: projects/haf/trunk/gtk+/gtk/gtkimcontext.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkimcontext.c	2007-07-10 13:44:42 UTC (rev 12709)
+++ projects/haf/trunk/gtk+/gtk/gtkimcontext.c	2007-07-11 09:59:51 UTC (rev 12710)
@@ -225,20 +225,13 @@
 						       HILDON_GTK_INPUT_MODE_FULL |
 						       HILDON_GTK_INPUT_MODE_AUTOCAP |
 						       HILDON_GTK_INPUT_MODE_DICTIONARY,
-						       G_PARAM_READWRITE));
+						       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 #endif /* MAEMO_CHANGES */
 }
 
 static void
 gtk_im_context_init (GtkIMContext *im_context)
 {
-#ifdef MAEMO_CHANGES
-  GtkIMContextPrivate *priv = GTK_IM_CONTEXT_GET_PRIVATE (im_context);
-
-  priv->mode = HILDON_GTK_INPUT_MODE_FULL |
-               HILDON_GTK_INPUT_MODE_AUTOCAP |
-               HILDON_GTK_INPUT_MODE_DICTIONARY;
-#endif /* MAEMO_CHANGES */
 }
 
 #ifdef MAEMO_CHANGES

Modified: projects/haf/trunk/gtk+/gtk/gtktextview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktextview.c	2007-07-10 13:44:42 UTC (rev 12709)
+++ projects/haf/trunk/gtk+/gtk/gtktextview.c	2007-07-11 09:59:51 UTC (rev 12710)
@@ -676,7 +676,7 @@
                                                        HILDON_GTK_INPUT_MODE_MULTILINE |
                                                        HILDON_GTK_INPUT_MODE_AUTOCAP |
                                                        HILDON_GTK_INPUT_MODE_DICTIONARY,
-                                                       GTK_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 #endif /* MAEMO_CHANGES */
 
   /*
@@ -2697,7 +2697,7 @@
 
 #ifdef MAEMO_CHANGES
     case PROP_HILDON_INPUT_MODE:
-      hildon_gtk_text_view_set_input_mode (text_view, g_value_get_int (value));
+      hildon_gtk_text_view_set_input_mode (text_view, g_value_get_flags (value));
       break;
 #endif /* MAEMO_CHANGES */
 
@@ -2777,7 +2777,7 @@
 
 #ifdef MAEMO_CHANGES
     case PROP_HILDON_INPUT_MODE:
-      g_value_set_int (value, hildon_gtk_text_view_get_input_mode (text_view));
+      g_value_set_flags (value, hildon_gtk_text_view_get_input_mode (text_view));
       break;
 #endif /* MAEMO_CHANGES */