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

[From: subversion at stage.maemo.org]

Author: manwari
Date: 2008-02-05 14:49:43 +0200 (Tue, 05 Feb 2008)
New Revision: 15137

Modified:
   projects/haf/trunk/hildon-input-method/ChangeLog
   projects/haf/trunk/hildon-input-method/debian/changelog
   projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c
Log:
2008-02-05  Mohammad Anwari  <Mohammad.Anwari at nokia.com>

        * src/hildon-im-ui.c: Remove control menu from the screen when the
        plugin is changed. Fixes NB#74819, NB#78863.




Modified: projects/haf/trunk/hildon-input-method/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-input-method/ChangeLog	2008-02-05 12:03:21 UTC (rev 15136)
+++ projects/haf/trunk/hildon-input-method/ChangeLog	2008-02-05 12:49:43 UTC (rev 15137)
@@ -1,3 +1,8 @@
+2008-02-05  Mohammad Anwari  <Mohammad.Anwari at nokia.com>
+
+	* src/hildon-im-ui.c: Remove control menu from the screen when the
+	plugin is changed. Fixes NB#74819, NB#78863.
+
 2008-02-05  Tomas Junnonen  <tomas.junnonen at nokia.com>
 
 	* src/hildon-im-ui.[c,h]: Added gconf option to treat stylus

Modified: projects/haf/trunk/hildon-input-method/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-input-method/debian/changelog	2008-02-05 12:03:21 UTC (rev 15136)
+++ projects/haf/trunk/hildon-input-method/debian/changelog	2008-02-05 12:49:43 UTC (rev 15137)
@@ -1,3 +1,9 @@
+hildon-input-method (1:2.0.1-1) UNRELEASED; urgency=low
+
+  * Fixes: NB#74819, NB#78863, NB#78312.
+
+ -- Mohammad Anwari <mohammad.anwari at nokia.com>  Tue, 05 Feb 2008 14:42:22 +0200
+
 hildon-input-method (1:2.0.0-1) unstable; urgency=low
 
   * New release. 

Modified: projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c
===================================================================
--- projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c	2008-02-05 12:03:21 UTC (rev 15136)
+++ projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c	2008-02-05 12:49:43 UTC (rev 15137)
@@ -325,6 +325,8 @@
 static void hildon_im_ui_foreach_plugin(HildonIMUI *self,
                                         void (*function) (HildonIMPlugin *));
 
+static void hide_controlmenu (HildonIMUI *self);
+
 G_DEFINE_TYPE(HildonIMUI, hildon_im_ui, GTK_TYPE_WINDOW)
 
 static gint
@@ -850,16 +852,7 @@
 
   gtk_widget_hide(GTK_WIDGET(self));
 
-  if (GTK_MENU(self->priv->buttons[HILDON_IM_BUTTON_INPUT_MENU].menu) 
-      != NULL &&
-      hildon_im_ui_button_get_active(self,
-        HILDON_IM_BUTTON_INPUT_MENU) == TRUE)
-  {
-    hildon_im_ui_button_set_active(self,
-        HILDON_IM_BUTTON_INPUT_MENU, FALSE);
-    gtk_menu_popdown (GTK_MENU (
-            self->priv->buttons [HILDON_IM_BUTTON_INPUT_MENU].menu));
-  }
+  hide_controlmenu (self);
 
   if (self->priv->current_plugin != NULL &&
       CURRENT_IM_WIDGET (self) != NULL)
@@ -2944,6 +2937,7 @@
   if (plugin->info->type == HILDON_IM_TYPE_SPECIAL)
     activate_special = TRUE;
 
+  hide_controlmenu (self);
   flush_plugins(self, plugin, FALSE);
 
   /* Make sure current plugin is created and packed! */
@@ -4317,3 +4311,18 @@
 		XFree(data);
 	}
 }
+
+static void
+hide_controlmenu (HildonIMUI *self)
+{
+  if (GTK_MENU(self->priv->buttons[HILDON_IM_BUTTON_INPUT_MENU].menu) 
+      != NULL &&
+      hildon_im_ui_button_get_active(self,
+        HILDON_IM_BUTTON_INPUT_MENU) == TRUE)
+  {
+    hildon_im_ui_button_set_active(self,
+        HILDON_IM_BUTTON_INPUT_MENU, FALSE);
+    gtk_menu_popdown (GTK_MENU (
+            self->priv->buttons [HILDON_IM_BUTTON_INPUT_MENU].menu));
+  }
+}