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

[From: subversion at stage.maemo.org]

Author: manwari
Date: 2008-03-11 11:40:07 +0200 (Tue, 11 Mar 2008)
New Revision: 15287

Modified:
   projects/haf/trunk/hildon-input-method/ChangeLog
   projects/haf/trunk/hildon-input-method/configure.ac
   projects/haf/trunk/hildon-input-method/debian/changelog
   projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c
Log:
* Version 2.0.2
        * src/hildon-im-ui.c: Added checks to the existence of the current
        plugin. Fixes NB#82208.



Modified: projects/haf/trunk/hildon-input-method/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-input-method/ChangeLog	2008-03-10 18:49:32 UTC (rev 15286)
+++ projects/haf/trunk/hildon-input-method/ChangeLog	2008-03-11 09:40:07 UTC (rev 15287)
@@ -1,3 +1,9 @@
+2008-02-11  Mohammad Anwari  <mohammad.anwari at nokia.com>
+
+	* Version 2.0.2
+	* src/hildon-im-ui.c: Added checks to the existence of the current
+	plugin. Fixes NB#82208.
+
 2008-02-06  Tomas Junnonen  <tomas.junnonen at nokia.com>
 
 	* Version 2.0.1

Modified: projects/haf/trunk/hildon-input-method/configure.ac
===================================================================
--- projects/haf/trunk/hildon-input-method/configure.ac	2008-03-10 18:49:32 UTC (rev 15286)
+++ projects/haf/trunk/hildon-input-method/configure.ac	2008-03-11 09:40:07 UTC (rev 15287)
@@ -1,6 +1,6 @@
 # This file is part of hildon-input-method
 #
-# Copyright (C) 2005-2007 Nokia Corporation.
+# Copyright (C) 2005-2008 Nokia Corporation.
 #
 # Contact: Mohammad Anwari <Mohammad.Anwari at nokia.com>
 #
@@ -8,7 +8,7 @@
 #
 
 AC_INIT(Makefile.am)
-VERSION=2.0.1
+VERSION=2.0.2
 LIBVERSION=3
 MAJORVERSION=`echo $VERSION|cut -d . -f1`
 AC_SUBST(VERSION)

Modified: projects/haf/trunk/hildon-input-method/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-input-method/debian/changelog	2008-03-10 18:49:32 UTC (rev 15286)
+++ projects/haf/trunk/hildon-input-method/debian/changelog	2008-03-11 09:40:07 UTC (rev 15287)
@@ -1,3 +1,9 @@
+hildon-input-method (1:2.0.2-1) unstable; urgency=low
+
+  * Fixes: NB#82208
+
+ -- Mohammad Anwari <mohammad.anwari at nokia.com>  Tue, 11 Mar 2008 11:30:17 +0200
+
 hildon-input-method (1:2.0.1-1) unstable; urgency=low
 
   * Fixes: NB#74819, NB#78863, NB#78312.

Modified: projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c
===================================================================
--- projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c	2008-03-10 18:49:32 UTC (rev 15286)
+++ projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c	2008-03-11 09:40:07 UTC (rev 15287)
@@ -5,7 +5,7 @@
 /*
  * This file is part of hildon-input-method
  *
- * Copyright (C) 2005-2007 Nokia Corporation.
+ * Copyright (C) 2005-2008 Nokia Corporation.
  *
  * Contact: Mohammad Anwari <Mohammad.Anwari at nokia.com>
  *
@@ -1033,6 +1033,9 @@
 
   info = CURRENT_PLUGIN (self);
 
+  if (self->priv->current_plugin == NULL)
+    return;
+
   hildon_im_plugin_button_activated(CURRENT_IM_PLUGIN (self),
                                     button, long_press);
 
@@ -2024,7 +2027,8 @@
                   window_value.window[0]))
           {
             /* dialog / normal window,  */
-            if (GTK_WIDGET_DRAWABLE(GTK_WIDGET(self)))
+            if (GTK_WIDGET_DRAWABLE(GTK_WIDGET(self)) && 
+                self->priv->current_plugin != NULL)
             {
               /* Do not hide the UI when the window is another IM plugin */
               if (CURRENT_PLUGIN_IS_FULLSCREEN(self) == FALSE)