[jds-review] Fix for bug 14989 -- gnome-terminal still looking for absent iiim

[FU Ning]

Hi,

Below is the fix for d.o.o. #14989 -- gnome-terminal still looking for 
absent iiim.
Index: 0210.im
===================================================================
--- 0210.im     (revision 21003)
+++ 0210.im     (working copy)
@@ -50,7 +50,7 @@
         echo "$id"
         return 0
     fi
-    for locale in `echo $def_locales | tr "," " "`
+    for locale in `echo $def_locales | tr ",:" " "`
     do
       if [ "x$LING" = "x$locale" -a "x$id" != x ] ; then
         echo "$id"
@@ -80,26 +80,39 @@
   im_module=`parse_gtk_im_module_file /etc/gtk-2.0/gtk.immodules`

   # Remote IM is xim.
-  if [ "x$im_module" = "xxim" ] ; then
-    im_module="iiim"
+  if [ "x$im_module" = "xxim" ] || [ "x$im_module" = x ] ; then
+    if [ -x /usr/bin/iiimx ] ; then
+      im_module="iiim"
+    fi
   fi
 fi

-GTK_IM_MODULE=${im_module:-"iiim"}
+GTK_IM_MODULE=$im_module
 export GTK_IM_MODULE

 #Startup Input methods (SCIM->XIM)
-if [ -f /etc/scim/xsession ]; then
+if [ "x$GTK_IM_MODULE" = xscim ] ; then
+  if [ -f /etc/scim/xsession ]; then
         . /etc/scim/xsession
+  fi
 fi

 #Startup Input methods (IIIM->XIM)
-if [ "x$DISABLE_IIIM_PANEL" != x  ] && [ -x /usr/bin/iiimx ] ; then
+if [ "x$GTK_IM_MODULE" = xiiim ] ; then
+  if [ "x$DISABLE_IIIM_PANEL" != x  ] && [ -x /usr/bin/iiimx ] ; then
         /usr/bin/iiimx -iiimd

         DTSTARTIMS=False
         export DTSTARTIMS
-elif [ -f /etc/iiim/xsession ]; then
+  elif [ -f /etc/iiim/xsession ]; then
         . /etc/iiim/xsession
+  fi
 fi

+#Startup Input methods (IBus->XIM)
+if [ "x$GTK_IM_MODULE" = xibus ] ; then
+  if [ -x /usr/bin/ibus-daemon ] ; then
+        /usr/bin/ibus-daemon --xim &
+  fi
+fi
+

Best Regards,
Harry Fu