Hi, Takao:

Thanks for the revision. I included the latest changes.
I tested in C locale with IIIM daemon disabled in 
gnome-session-properties, and GTK_IM_MODULE is not set now.
> Index: 0210.im
> ===================================================================
> --- 0210.im     (revision 21004)
> +++ 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,43 @@
>    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$LANG" = "xC" ] ; then
> +      im_module=
> +    elif [ -x /usr/bin/iiimx ] ; then
> +      im_module="iiim"
> +    fi
>    fi
>  fi
>
> -GTK_IM_MODULE=${im_module:-"iiim"}
> -export GTK_IM_MODULE
> +GTK_IM_MODULE=$im_module
> +if [ "x$GTK_IM_MODULE" != x ] ; then
> +  export GTK_IM_MODULE
> +fi
>
>  #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

Takao Fujiwara wrote:
> Please let me revise the patch with the attachment again.
>
> % diff 0210.im.diff.bak2 0210.im.diff
> 14c14
> < @@ -80,26 +80,39 @@
> ---
> > @@ -80,26 +80,43 @@
> 21c21,23
> < +    if [ -x /usr/bin/iiimx ] ; then
> ---
> > +    if [ "x$LANG" = "xC" ] ; then
> > +      im_module=
> > +    elif [ -x /usr/bin/iiimx ] ; then
> 27a30
> > -export GTK_IM_MODULE
> 29c32,34
> <  export GTK_IM_MODULE
> ---
> > +if [ "x$GTK_IM_MODULE" != x ] ; then
> > +  export GTK_IM_MODULE
> > +fi
>
> Thanks,
> fujiwara
>
> (03/19/10 15:25), FU Ning-san wrote:
>> Hi,
>>
>> Below is the fix for d.o.o. #14989 -- gnome-terminal still looking for
>> absent iiim.

Reply via email to