Accepting request 104872 from home:ftake:branches:M17N

fix bnc#746612

OBS-URL: https://build.opensuse.org/request/show/104872
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=35

ibus-fix-default-preload-engines.patch

@@ -0,0 +1,18 @@
+diff -ru ibus-1.4.0.org/bus/ibusimpl.c ibus-1.4.0/bus/ibusimpl.c
+--- ibus-1.4.0.org/bus/ibusimpl.c	2011-12-01 01:45:56.453139058 +0900
++++ ibus-1.4.0/bus/ibusimpl.c	2011-12-01 01:55:53.941669370 +0900
+@@ -530,9 +530,12 @@
+ 
+     GVariant *variant = ibus_config_get_value (ibus->config, "general", "preload_engines");
+     if (variant != NULL) {
+-        done = TRUE;
++        if (g_variant_n_children (variant) > 0) {
++            done = TRUE;
++            g_variant_unref (variant);
++            return;
++        }
+         g_variant_unref (variant);
+-        return;
+     }
+ 
+     done = TRUE;

ibus.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Feb 12 17:29:16 UTC 2012 - ftake@geeko.jp
+
+- Fix problem default preload engines do not work (bnc#746612)
+- Fix slow down issue after "source xim.d/ibus" in a SSH session 
+
 -------------------------------------------------------------------
 Tue Jan 24 10:12:30 UTC 2012 - vuntz@opensuse.org
 

ibus.spec

@@ -30,6 +30,7 @@ Source2:        ibus-README.suse
 Source3:        xim.ibus.suse.template
 Source4:        xim.d-ibus-121
 Patch0:         ibus-python-install-dir.patch
+Patch1:         ibus-fix-default-preload-engines.patch
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1+
 Group:          System/I18n/Chinese
@@ -118,8 +119,7 @@ docs for ibus.
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
+%patch1 -p1
 
 %build
 autoreconf -fi

xim.d-ibus-121

@@ -46,8 +46,9 @@ esac
                     export QT_IM_MODULE=xim
             fi
 
-            MACHINEID=`cat /var/lib/dbus/machine-id`
-            eval `dbus-launch --sh-syntax --autolaunch=$MACHINEID --close-stderr`
+            if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
+                    eval `dbus-launch --sh-syntax --exit-with-session --close-stderr < /dev/null`
+            fi
 
             ibus-daemon --xim -d