Hello community, here is the log from the commit of package ibus for openSUSE:Factory checked in at 2012-02-16 16:16:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus (Old) and /work/SRC/openSUSE:Factory/.ibus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus/ibus.changes 2012-01-26 14:05:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ibus.new/ibus.changes 2012-02-16 16:16:33.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Feb 12 17:29:16 UTC 2012 - [email protected] + +- Fix problem default preload engines do not work (bnc#746612) +- Fix slow down issue after "source xim.d/ibus" in a SSH session + +------------------------------------------------------------------- New: ---- ibus-fix-default-preload-engines.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus.spec ++++++ --- /var/tmp/diff_new_pack.32Z3Ag/_old 2012-02-16 16:16:34.000000000 +0100 +++ /var/tmp/diff_new_pack.32Z3Ag/_new 2012-02-16 16:16:34.000000000 +0100 @@ -30,6 +30,7 @@ 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 @@ %prep %setup -q %patch0 -p1 -#%patch1 -p1 -#%patch2 -p1 +%patch1 -p1 %build autoreconf -fi ++++++ ibus-fix-default-preload-engines.patch ++++++ 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; ++++++ xim.d-ibus-121 ++++++ --- /var/tmp/diff_new_pack.32Z3Ag/_old 2012-02-16 16:16:34.000000000 +0100 +++ /var/tmp/diff_new_pack.32Z3Ag/_new 2012-02-16 16:16:34.000000000 +0100 @@ -46,8 +46,9 @@ 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
