[maemo-commits] [maemo-commits] r13661 - in projects/haf/trunk/hildon-input-method: . src

[From: subversion at stage.maemo.org]

Author: tjunnone
Date: 2007-09-07 11:31:44 +0300 (Fri, 07 Sep 2007)
New Revision: 13661

Modified:
   projects/haf/trunk/hildon-input-method/ChangeLog
   projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c
Log:
* src/hildon-im-ui.c: Fixed plugins being enabled without the
  init parameter at input method startup in some cases


Modified: projects/haf/trunk/hildon-input-method/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-input-method/ChangeLog	2007-09-07 08:27:46 UTC (rev 13660)
+++ projects/haf/trunk/hildon-input-method/ChangeLog	2007-09-07 08:31:44 UTC (rev 13661)
@@ -1,3 +1,8 @@
+2007-09-07  Tomas Junnonen  <tomas.junnonen at nokia.com>
+
+	* src/hildon-im-ui.c: Fixed plugins being enabled without the
+	init parameter at input method startup in some cases
+
 2007-09-06  Tomas Junnonen  <tomas.junnonen at nokia.com>
 
 	* src/hildon-im-ui.c: Fixed stylus plugin being unconditionally loaded at startup

Modified: projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c
===================================================================
--- projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c	2007-09-07 08:27:46 UTC (rev 13660)
+++ projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c	2007-09-07 08:31:44 UTC (rev 13661)
@@ -520,7 +520,7 @@
     {
       plugin->widget =
         GTK_WIDGET(hildon_im_plugin_create(self, plugin->filename));
-      hildon_im_plugin_enable(HILDON_IM_PLUGIN(plugin->widget), FALSE);
+      hildon_im_plugin_enable(HILDON_IM_PLUGIN(plugin->widget), TRUE);
     }
   }
 }
@@ -960,8 +960,7 @@
 
   if (GTK_WIDGET_VISIBLE(self) == TRUE)
   {
-    activate_plugin (self, self->priv->current_plugin,
-                                     TRUE);
+    activate_plugin (self, self->priv->current_plugin, TRUE);
   }
  
   if (CURRENT_IM_WIDGET (self) != NULL)
@@ -2506,7 +2505,7 @@
   if (supported_by_current == FALSE &&
       latest_supported != NULL)
   {
-     activate_plugin (self, latest_supported, FALSE);
+     activate_plugin (self, latest_supported, TRUE);
   }
 }
 
@@ -2830,7 +2829,7 @@
 
 static void
 flush_plugins(HildonIMUI *self,
-    PluginData *current, gboolean force)
+              PluginData *current, gboolean force)
 {
   GSList *iter;
 
@@ -2871,11 +2870,10 @@
 }
 
 static void
-activate_plugin (HildonIMUI *self, PluginData *plugin,
-    gboolean init)
+activate_plugin (HildonIMUI *self, PluginData *plugin, gboolean init)
 {
   gboolean need_packing, activate_special = FALSE;
-  
+
   g_return_if_fail (HILDON_IM_IS_UI(self));
   g_return_if_fail (plugin != NULL);
 
@@ -2959,9 +2957,7 @@
 }
 
 void 
-hildon_im_ui_activate_plugin (HildonIMUI *self, 
-    gchar *name,
-    gboolean init)
+hildon_im_ui_activate_plugin (HildonIMUI *self, gchar *name, gboolean init)
 {
   PluginData *plugin;