Hello community, here is the log from the commit of package ibus for openSUSE:Factory checked in at Mon Jun 27 13:34:27 CEST 2011.
-------- --- ibus/ibus.changes 2011-03-09 12:30:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/ibus/ibus.changes 2011-06-19 14:48:24.000000000 +0200 @@ -1,0 +2,28 @@ +Sun Jun 19 12:43:54 UTC 2011 - [email protected] + +- Change files in package, some should move to devel subpackage and libibus package + +------------------------------------------------------------------- +Thu Jun 16 07:37:21 CEST 2011 - [email protected] + +- Fix xim.d locale directories of ja and ko +- Add xim.d selections for more locales to replace with SCIM + +------------------------------------------------------------------- +Wed Jun 15 11:50:47 CEST 2011 - [email protected] + +- Add provides tag for supported locales (ja, ko, zh) +- Add proper supplements tags to gtk immodule packages + +------------------------------------------------------------------- +Mon Jun 13 16:15:29 UTC 2011 - [email protected] + +- Update to ibus 1.3.9 +- Set priority to 40, if we want to use ibus as default input method, + better use a lower priority, so if any other input method framework + installed, system can use other input method instead. +- Update README +- Remove kimpanel script from start up script +- Add gtk3 immodule + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ibus-1.3.8.tar.gz New: ---- baselibs.conf ibus-1.3.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus.spec ++++++ --- /var/tmp/diff_new_pack.StYhQb/_old 2011-06-27 13:26:32.000000000 +0200 +++ /var/tmp/diff_new_pack.StYhQb/_new 2011-06-27 13:26:32.000000000 +0200 @@ -18,8 +18,8 @@ Name: ibus -Version: 1.3.8 -Release: 6 +Version: 1.3.9 +Release: 1 License: LGPL V2+ Url: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz @@ -27,23 +27,19 @@ Source2: ibus-README.suse Source3: xim.ibus.suse.template Patch0: ibus-python-install-dir.patch -Patch1: ibus-disable-portability-check.patch -Patch2: ibus-disable-introspect.patch +#Patch1: ibus-disable-portability-check.patch +#Patch2: ibus-disable-introspect.patch Group: System/I18n/Chinese Summary: Intelligent Input Bus for Linux OS BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /usr/bin/touch -#Provides: locale(ja;ko;zh) -#Recommends: ibus-gtk ibus-qt +Provides: locale(ja;ko;zh) BuildRequires: gettext-devel gtk-doc libtool python BuildRequires: dbus-1-devel dbus-1-glib-devel dbus-1-python-devel gtk2-devel BuildRequires: gconf2-devel python-gobject2-devel update-desktop-files BuildRequires: fdupes gobject-introspection-devel intltool iso-codes-devel -%if %suse_version >= 1100 -BuildRequires: pcre-devel -%endif -Requires: glib2 python-gtk dbus-1-python notification-daemon iso-codes gconf2 python-xdg python-notify gobject-introspection +Requires: python-gtk dbus-1-python notification-daemon iso-codes gconf2 python-xdg python-notify gobject-introspection %gconf_schemas_prereq %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") @@ -57,7 +53,7 @@ %package -n libibus2 License: LGPL V2+ Summary: IBus libraries -Group: System Environment/Libraries +Group: System/I18n/Chinese %description -n libibus2 This package contains the libraries for IBus @@ -65,17 +61,33 @@ %package gtk License: LGPL V2+ Summary: IBus im module for gtk2 -Group: System Environment/Libraries +Group: System/I18n/Chinese Requires: %{name} = %{version}-%{release} %gtk2_immodule_requires +Supplements: packageand(ibus:gtk2) %description gtk This package contains ibus im module for gtk2 +%if %suse_version >= 1140 + +%package gtk3 + +Summary: IBus im module for gtk3 +Group: System/I18n/Chinese +Requires: %{name} = %{version}-%{release} +BuildRequires: gtk3-devel +%gtk3_immodule_requires +Supplements: packageand(ibus:gtk3) + +%description gtk3 +This package contains ibus im module for gtk3 +%endif + %package devel License: LGPL V2+ Summary: Development tools for ibus -Group: Development/Libraries +Group: Development/Libraries/other Requires: libibus2 = %{version}-%{release} Requires: glib2-devel Requires: dbus-1-devel @@ -89,18 +101,26 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 +#%patch1 -p1 +#%patch2 -p1 %build autoreconf -fi intltoolize -f +%if %suse_version >= 1140 +%configure --disable-static \ + --disable-iso-codes-check \ + --disable-gobject-introspection \ + --enable-gtk-doc \ + --libexecdir=%{_prefix}/%{_lib}/ibus \ + --enable-gtk3 +%else %configure --disable-static \ --disable-iso-codes-check \ --disable-gobject-introspection \ --enable-gtk-doc \ - --disable-qt4-immodule \ --libexecdir=%{_prefix}/%{_lib}/ibus +%endif make %{?jobs:-j %jobs} %install @@ -109,14 +129,18 @@ install -m 644 $RPM_SOURCE_DIR/xim.d-ibus $RPM_BUILD_ROOT/etc/X11/xim.d/ibus sed -i 1i"SYS_LIB=%{_lib}" $RPM_BUILD_ROOT/etc/X11/xim.d/ibus - pushd $RPM_BUILD_ROOT/etc/X11/xim.d/ - for lang in en zh_TW zh_HK zh_CN zh_SG ko_KR ja_JP ; do +PRIORITY=40 +pushd $RPM_BUILD_ROOT/etc/X11/xim.d/ + for lang in am ar as bn el fa gu he hi hr ja ka kk kn ko lo ml my \ + pa ru sk vi zh_TW zh_CN zh_HK zh_SG \ + de fr it es nl cs pl da nn nb fi en sv + do mkdir $lang pushd $lang - ln -s ../ibus 10-ibus + ln -s ../ibus $PRIORITY-ibus popd done - popd +popd rm -f $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.*a rm -f $RPM_BUILD_ROOT/%{_libdir}/libibus.*a @@ -153,13 +177,22 @@ %postun -n libibus2 -p /sbin/ldconfig +%if %suse_version >= 1140 + +%post gtk3 +%gtk3_immodule_post + +%postun gtk3 +%gtk3_immodule_postun +%endif + %files -f %{name}.lst %defattr(-,root,root,-) %doc AUTHORS COPYING README %doc $RPM_SOURCE_DIR/xim.ibus.suse.template %doc $RPM_SOURCE_DIR/ibus-README.suse %dir /etc/X11/xim.d -/etc/X11/xim.d/* +%config /etc/X11/xim.d/* %{python_sitelib}/ibus %dir %{_datadir}/ibus/ %{_bindir}/ibus-daemon @@ -169,22 +202,31 @@ %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/pixmaps/* %{_prefix}/%{_lib}/ibus -%dir %{_datadir}/vala -%{_datadir}/vala/* %files -n libibus2 %defattr(-,root,root,-) %{_libdir}/lib*.so.* +%{_libdir}/girepository-1.0/IBus-1.0.typelib %files gtk %defattr(-,root,root,-) %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so +%if %suse_version >= 1140 + +%files gtk3 +%defattr(-,root,root,-) +%{_libdir}/gtk-3.0/3.0.0/immodules/* +%endif + %files devel %defattr(-,root,root,-) %{_libdir}/lib*.so %{_includedir}/* %{_datadir}/gtk-doc/html/* %{_libdir}/pkgconfig/* +%{_datadir}/gir-1.0/IBus-1.0.gir +%dir %{_datadir}/vala +%{_datadir}/vala/* %changelog ++++++ baselibs.conf ++++++ ibus-gtk ibus-gtk3 libibus2++++++ ibus-1.3.8.tar.gz -> ibus-1.3.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/aclocal.m4 new/ibus-1.3.9/aclocal.m4 --- old/ibus-1.3.8/aclocal.m4 2010-10-22 08:16:22.000000000 +0200 +++ new/ibus-1.3.9/aclocal.m4 2010-11-25 03:25:44.000000000 +0100 @@ -157,14 +157,14 @@ int main () { - int major, minor, micro; + unsigned int major, minor, micro; char *tmp_version; fclose (fopen ("conf.glibtest", "w")); /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_glib_version"); exit(1); } @@ -203,9 +203,9 @@ } else { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", + printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", + printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", major, minor, micro); printf("*** GLIB is always available from ftp://ftp.gtk.org.\n";); printf("***\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/autogen.sh new/ibus-1.3.9/autogen.sh --- old/ibus-1.3.8/autogen.sh 2010-10-22 07:44:59.000000000 +0200 +++ new/ibus-1.3.9/autogen.sh 2010-11-25 03:24:56.000000000 +0100 @@ -22,4 +22,4 @@ touch $srcdir/ChangeLog } -ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.8 CFLAGS="-Wall -Werror" . gnome-autogen.sh +ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.10 CFLAGS="-Wall -Werror" . gnome-autogen.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/bindings/Makefile.in new/ibus-1.3.9/bindings/Makefile.in --- old/ibus-1.3.8/bindings/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/bindings/Makefile.in 2010-11-25 03:25:45.000000000 +0100 @@ -153,7 +153,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/bindings/vala/Makefile.in new/ibus-1.3.9/bindings/vala/Makefile.in --- old/ibus-1.3.8/bindings/vala/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/bindings/vala/Makefile.in 2010-11-25 03:25:45.000000000 +0100 @@ -138,7 +138,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/bus/ibusimpl.c new/ibus-1.3.9/bus/ibusimpl.c --- old/ibus-1.3.8/bus/ibusimpl.c 2010-10-21 12:58:33.000000000 +0200 +++ new/ibus-1.3.9/bus/ibusimpl.c 2010-11-25 03:24:56.000000000 +0100 @@ -812,25 +812,38 @@ return reply; } + +static gboolean +_timeout_cb (gpointer data) +{ + return TRUE; +} + static BusFactoryProxy * _get_factory_proxy(IBusEngineDesc *engine_desc) { - BusFactoryProxy *factory; - GTimeVal t1, t2; - g_get_current_time (&t1); - while (1) { - if (g_main_context_pending (NULL)) { - g_main_context_iteration (NULL, FALSE); + BusFactoryProxy *factory = NULL; + + /* Add a timeout to wake up g_main_context_iteration in every 0.5 second, + * and then to check the factory assocated with the engine_desc */ + guint timeout_id = g_timeout_add (500, _timeout_cb, NULL); + + GTimer *timer = g_timer_new (); + + /* Leave the loop, if it spends more than 5 seconds */ + while (g_timer_elapsed (timer, NULL) <= 5.0) { + if (g_main_context_iteration (NULL, TRUE)) { factory = bus_factory_proxy_get_from_engine (engine_desc); if (factory != NULL) { - return factory; + break; } } - g_get_current_time (&t2); - if (t2.tv_sec - t1.tv_sec >= 5) - break; } - return NULL; + + g_source_remove (timeout_id); + g_timer_destroy (timer); + + return factory; } static BusEngineProxy * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/bus/Makefile.am new/ibus-1.3.9/bus/Makefile.am --- old/ibus-1.3.8/bus/Makefile.am 2010-10-22 07:56:12.000000000 +0200 +++ new/ibus-1.3.9/bus/Makefile.am 2010-11-25 03:24:56.000000000 +0100 @@ -143,6 +143,6 @@ $(MAKE) -C $(top_builddir)/src test: ibus-daemon - $(ENV) \ + $(ENV_IBUS_TEST) \ G_DEBUG=fatal_warnings \ $(builddir)/ibus-daemon -v diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/bus/Makefile.in new/ibus-1.3.9/bus/Makefile.in --- old/ibus-1.3.8/bus/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/bus/Makefile.in 2010-11-25 03:25:45.000000000 +0100 @@ -202,7 +202,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ @@ -1250,7 +1250,7 @@ $(MAKE) -C $(top_builddir)/src test: ibus-daemon - $(ENV) \ + $(ENV_IBUS_TEST) \ G_DEBUG=fatal_warnings \ $(builddir)/ibus-daemon -v diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/ChangeLog new/ibus-1.3.9/ChangeLog --- old/ibus-1.3.8/ChangeLog 2010-10-22 08:16:36.000000000 +0200 +++ new/ibus-1.3.9/ChangeLog 2010-11-25 03:29:04.000000000 +0100 @@ -1,4 +1,101 @@ -commit 011f5d0dfdee6432a1d1a151a18be8520c4afcba +commit c28506b7b2fb0f34448fe6a52f5a31adcb1897ab +Author: Peng Huang <[email protected]> +Date: 2010-11-25 11:28:22 +0900 + + Release 1.3.9 + +M configure.ac + +commit cd7385f4cc1e729891bd878db12dfafad397b098 +Author: fujiwarat <[email protected]> +Date: 2010-11-11 18:09:52 +0900 + + Always read Window as 32 bits integer to fix problem in ppc64. + +M client/x11/main.c + +commit 1ae76a4924d08c33aeb8bbfe9b48cc90abea799a +Author: Peng Huang <[email protected]> +Date: 2010-11-12 10:12:22 +0900 + + Disable snooper in chromium, chrome, firefox and gnome-do + +M Makefile.am +M configure.ac + +commit 8b1943d089bee37fffb17f31dee2120cb0039591 +Author: fujiwarat <[email protected]> +Date: 2010-11-04 11:07:36 +0900 + + Remove the ability to attach to a status icon with libnotify 0.7.0 + +M ui/gtk/main.py + +commit 0f6fd61b6ee06e070a739e5315318e6af2b72ddd +Author: fujiwarat <[email protected]> +Date: 2010-11-02 11:21:24 +0900 + + Replace s/gdk_drawable_get_size/gdk_window_get_height/ for GTK3. + +M client/gtk2/ibusimcontext.c + +commit fd7e899c327ba9e1bf33fa79ce6027e35ac3bccc +Author: Peng Huang <[email protected]> +Date: 2010-10-29 18:46:07 +0900 + + Use block mode of g_main_context_iteration to avoid consuming too much cpu time. + + BUG=none + TEST=manual + + Review URL: http://codereview.appspot.com/2768043 + +M bus/ibusimpl.c + +commit 9cf6eed3c3fc7a40d0c6f75117fd2c4784b60536 +Author: Peng Huang <[email protected]> +Date: 2010-10-26 19:27:56 +0900 + + Use the automake 1.10 in autogen.sh + + BUG=ibus:1039 + TEST=manual + + Review URL: http://codereview.appspot.com/2746041 + +M autogen.sh + +commit f0ee4f8e8460e234cabafc8cb76df6de05d65761 +Author: Peng Wu <[email protected]> +Date: 2010-10-25 14:52:21 +0800 + + sort combo box by locale strcoll + +M setup/enginecombobox.py +M setup/main.py + +commit 243211310fb771ba55453a1b4e101490597e2397 +Author: fujiwarat <[email protected]> +Date: 2010-10-26 11:49:48 +0900 + + Fix s/python/@PYTHON@/ in libexec scripts. + + The patch is provided by [email protected] + +M setup/ibus-setup.in +M ui/gtk/ibus-ui-gtk.in + +commit 537b4dc1b8c20ec5cc5a03ce949b807035a65880 +Author: fujiwarat <[email protected]> +Date: 2010-10-26 11:45:29 +0900 + + Fix ENV value for NetBSD + +M bus/Makefile.am +M configure.ac +M setup/Makefile.am + +commit 5f5017accfb859cac8829ef9d8b19547b5cc1c41 Author: Peng Huang <[email protected]> Date: 2010-10-22 15:15:39 +0900 @@ -6,14 +103,19 @@ M configure.ac -commit 39c27754649024ce563744ed074c7b30c89a0cd7 +commit 4ed0cee9a76e1123fc116ba4a251c8cfba407990 Author: Peng Huang <[email protected]> -Date: 2010-10-22 15:07:27 +0900 +Date: 2010-10-22 15:15:12 +0900 Comment out test-keymap test case. Comment out test-keymap test case, because it is not automatic test case. it will cause make distcheck failed. + + BUG=none + TEST=manual + + Review URL: http://codereview.appspot.com/2667041 M src/test-keymap.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/client/gtk2/ibusimcontext.c new/ibus-1.3.9/client/gtk2/ibusimcontext.c --- old/ibus-1.3.8/client/gtk2/ibusimcontext.c 2010-10-21 12:58:58.000000000 +0200 +++ new/ibus-1.3.9/client/gtk2/ibusimcontext.c 2010-11-25 03:24:56.000000000 +0100 @@ -669,10 +669,15 @@ area = ibusimcontext->cursor_area; if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) { +#if GTK_CHECK_VERSION (2, 91, 0) + area.x = 0; + area.y += gdk_window_get_height (ibusimcontext->client_window); +#else gint w, h; gdk_drawable_get_size (ibusimcontext->client_window, &w, &h); area.y += h; area.x = 0; +#endif } gdk_window_get_origin (ibusimcontext->client_window, &x, &y); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/client/gtk2/Makefile.in new/ibus-1.3.9/client/gtk2/Makefile.in --- old/ibus-1.3.8/client/gtk2/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/client/gtk2/Makefile.in 2010-11-25 03:25:45.000000000 +0100 @@ -168,7 +168,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/client/gtk3/ibusimcontext.c new/ibus-1.3.9/client/gtk3/ibusimcontext.c --- old/ibus-1.3.8/client/gtk3/ibusimcontext.c 2010-10-21 12:58:58.000000000 +0200 +++ new/ibus-1.3.9/client/gtk3/ibusimcontext.c 2010-11-25 03:24:56.000000000 +0100 @@ -669,10 +669,15 @@ area = ibusimcontext->cursor_area; if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) { +#if GTK_CHECK_VERSION (2, 91, 0) + area.x = 0; + area.y += gdk_window_get_height (ibusimcontext->client_window); +#else gint w, h; gdk_drawable_get_size (ibusimcontext->client_window, &w, &h); area.y += h; area.x = 0; +#endif } gdk_window_get_origin (ibusimcontext->client_window, &x, &y); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/client/gtk3/Makefile.in new/ibus-1.3.9/client/gtk3/Makefile.in --- old/ibus-1.3.8/client/gtk3/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/client/gtk3/Makefile.in 2010-11-25 03:25:45.000000000 +0100 @@ -168,7 +168,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/client/Makefile.in new/ibus-1.3.9/client/Makefile.in --- old/ibus-1.3.8/client/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/client/Makefile.in 2010-11-25 03:25:45.000000000 +0100 @@ -153,7 +153,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/client/x11/main.c new/ibus-1.3.9/client/x11/main.c --- old/ibus-1.3.8/client/x11/main.c 2010-10-21 12:58:33.000000000 +0200 +++ new/ibus-1.3.9/client/x11/main.c 2010-11-25 03:24:56.000000000 +0100 @@ -277,10 +277,10 @@ x11ic->input_style = *(gint32 *) ic_attr->value; } else if (g_strcmp0 (XNClientWindow, ic_attr->name) == 0) { - x11ic->client_window = *(Window *) call_data->ic_attr[i].value; + x11ic->client_window = (Window)(*(CARD32 *) call_data->ic_attr[i].value); } else if (g_strcmp0 (XNFocusWindow, ic_attr->name) == 0) { - x11ic->focus_window = *(Window *) call_data->ic_attr[i].value; + x11ic->focus_window = (Window)(*(CARD32 *) call_data->ic_attr[i].value); } else { LOG (1, "Unknown ic attribute: %s", ic_attr->name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/client/x11/Makefile.in new/ibus-1.3.9/client/x11/Makefile.in --- old/ibus-1.3.8/client/x11/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/client/x11/Makefile.in 2010-11-25 03:25:45.000000000 +0100 @@ -151,7 +151,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/configure new/ibus-1.3.9/configure --- old/ibus-1.3.8/configure 2010-10-22 08:16:26.000000000 +0200 +++ new/ibus-1.3.9/configure 2010-11-25 03:25:47.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for ibus 1.3.8. +# Generated by GNU Autoconf 2.67 for ibus 1.3.9. # # Report bugs to <http://code.google.com/p/ibus/issues/entry>. # @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='ibus' PACKAGE_TARNAME='ibus' -PACKAGE_VERSION='1.3.8' -PACKAGE_STRING='ibus 1.3.8' +PACKAGE_VERSION='1.3.9' +PACKAGE_STRING='ibus 1.3.9' PACKAGE_BUGREPORT='http://code.google.com/p/ibus/issues/entry' PACKAGE_URL='' @@ -780,7 +780,7 @@ PYTHON ENABLE_PYTHON_FALSE ENABLE_PYTHON_TRUE -ENV +ENV_IBUS_TEST ENABLE_MEMCONF_FALSE ENABLE_MEMCONF_TRUE GCONF_SCHEMAS_INSTALL_FALSE @@ -1626,7 +1626,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ibus 1.3.8 to adapt to many kinds of systems. +\`configure' configures ibus 1.3.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1696,7 +1696,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ibus 1.3.8:";; + short | recursive ) echo "Configuration of ibus 1.3.9:";; esac cat <<\_ACEOF @@ -1874,7 +1874,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ibus configure 1.3.8 +ibus configure 1.3.9 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2364,7 +2364,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ibus $as_me 1.3.8, which was +It was created by ibus $as_me 1.3.9, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3179,7 +3179,7 @@ # Define the identity of the package. PACKAGE='ibus' - VERSION='1.3.8' + VERSION='1.3.9' cat >>confdefs.h <<_ACEOF @@ -4677,9 +4677,9 @@ # define PACKAGE_VERSION_* variables - PACKAGE_VERSION_MAJOR=$(echo 1.3.8 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 1.3.8 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 1.3.8 | cut -d'.' -f3) + PACKAGE_VERSION_MAJOR=$(echo 1.3.9 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 1.3.9 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 1.3.9 | cut -d'.' -f3) @@ -4689,7 +4689,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 1.3.8 | cut -d'.' -f4) + NANO=$(echo 1.3.9 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 @@ -16240,7 +16240,7 @@ # For dislpay Date -DATE_DISPLAY="Fri Oct 22 2010" +DATE_DISPLAY="Thu Nov 25 2010" # If only source code changed, lt_revision + 1 @@ -16487,14 +16487,14 @@ int main () { - int major, minor, micro; + unsigned int major, minor, micro; char *tmp_version; fclose (fopen ("conf.glibtest", "w")); /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_glib_version"); exit(1); } @@ -16533,9 +16533,9 @@ } else { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", + printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", + printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", major, minor, micro); printf("*** GLIB is always available from ftp://ftp.gtk.org.\n";); printf("***\n"); @@ -18401,12 +18401,12 @@ set dummy env; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ENV+set}" = set; then : +if test "${ac_cv_path_ENV_IBUS_TEST+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $ENV in + case $ENV_IBUS_TEST in [\\/]* | ?:[\\/]*) - ac_cv_path_ENV="$ENV" # Let the user override the test with a path. + ac_cv_path_ENV_IBUS_TEST="$ENV_IBUS_TEST" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -18416,7 +18416,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ENV="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_ENV_IBUS_TEST="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -18427,10 +18427,10 @@ ;; esac fi -ENV=$ac_cv_path_ENV -if test -n "$ENV"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENV" >&5 -$as_echo "$ENV" >&6; } +ENV_IBUS_TEST=$ac_cv_path_ENV_IBUS_TEST +if test -n "$ENV_IBUS_TEST"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENV_IBUS_TEST" >&5 +$as_echo "$ENV_IBUS_TEST" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -19637,7 +19637,7 @@ if test "${with_no_snooper_apps+set}" = set; then : withval=$with_no_snooper_apps; NO_SNOOPER_APPS=$with_no_snooper_apps else - NO_SNOOPER_APPS=.*chrome + NO_SNOOPER_APPS=.*chrome.*,.*chromium.*,firefox.*,Do.* fi @@ -20364,7 +20364,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ibus $as_me 1.3.8, which was +This file was extended by ibus $as_me 1.3.9, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20430,7 +20430,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ibus config.status 1.3.8 +ibus config.status 1.3.9 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/configure.ac new/ibus-1.3.9/configure.ac --- old/ibus-1.3.8/configure.ac 2010-10-22 08:16:00.000000000 +0200 +++ new/ibus-1.3.9/configure.ac 2010-11-25 03:25:26.000000000 +0100 @@ -24,7 +24,7 @@ m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [3]) -m4_define([ibus_micro_version], [8]) +m4_define([ibus_micro_version], [9]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) @@ -228,8 +228,8 @@ AM_CONDITIONAL([ENABLE_MEMCONF], [test "x$enable_memconf" = "xyes"]) # check env -AC_PATH_PROG(ENV, env) -AC_SUBST(ENV) +AC_PATH_PROG(ENV_IBUS_TEST, env) +AC_SUBST(ENV_IBUS_TEST) AC_ARG_ENABLE(python, AS_HELP_STRING([--disable-python], @@ -330,7 +330,7 @@ AS_HELP_STRING([--with-no-snooper-apps[=regex1,regex2]], [Does not enable keyboard snooper in those applications (like: .*chrome.*,firefox.*)]), NO_SNOOPER_APPS=$with_no_snooper_apps, - NO_SNOOPER_APPS=.*chrome + NO_SNOOPER_APPS=[.*chrome.*,.*chromium.*,firefox.*,Do.*] ) AC_DEFINE_UNQUOTED(NO_SNOOPER_APPS, "$NO_SNOOPER_APPS", [Does not enbale keyboard snooper in those applications]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/data/icons/Makefile.in new/ibus-1.3.9/data/icons/Makefile.in --- old/ibus-1.3.8/data/icons/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/data/icons/Makefile.in 2010-11-25 03:25:45.000000000 +0100 @@ -146,7 +146,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/data/keymaps/Makefile.in new/ibus-1.3.9/data/keymaps/Makefile.in --- old/ibus-1.3.8/data/keymaps/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/data/keymaps/Makefile.in 2010-11-25 03:25:45.000000000 +0100 @@ -175,7 +175,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/data/Makefile.in new/ibus-1.3.9/data/Makefile.in --- old/ibus-1.3.8/data/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/data/Makefile.in 2010-11-25 03:25:45.000000000 +0100 @@ -177,7 +177,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/docs/Makefile.in new/ibus-1.3.9/docs/Makefile.in --- old/ibus-1.3.8/docs/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/docs/Makefile.in 2010-11-25 03:25:45.000000000 +0100 @@ -153,7 +153,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/docs/reference/ibus/html/ch01.html new/ibus-1.3.9/docs/reference/ibus/html/ch01.html --- old/ibus-1.3.8/docs/reference/ibus/html/ch01.html 2010-10-22 08:16:35.000000000 +0200 +++ new/ibus-1.3.9/docs/reference/ibus/html/ch01.html 2010-11-25 03:29:04.000000000 +0100 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter" title="Overview"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id3073433"></a>Overview</h2></div></div></div> +<a name="id2747665"></a>Overview</h2></div></div></div> <p>This manual is the API specification for the IBus. IBus is built upon GObject and D-Bus, so you may find that modules are named as classes and objects in the sense of GObject, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/docs/reference/ibus/html/ch02.html new/ibus-1.3.9/docs/reference/ibus/html/ch02.html --- old/ibus-1.3.8/docs/reference/ibus/html/ch02.html 2010-10-22 08:16:35.000000000 +0200 +++ new/ibus-1.3.9/docs/reference/ibus/html/ch02.html 2010-11-25 03:29:04.000000000 +0100 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter" title="Panel (User Interfaces)"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id3073516"></a>Panel (User Interfaces)</h2></div></div></div> +<a name="id2747748"></a>Panel (User Interfaces)</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="IBusAttribute.html">IBusAttribute</a></span><span class="refpurpose"> — Attributes of IBusText.</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/docs/reference/ibus/html/ch03.html new/ibus-1.3.9/docs/reference/ibus/html/ch03.html --- old/ibus-1.3.8/docs/reference/ibus/html/ch03.html 2010-10-22 08:16:35.000000000 +0200 +++ new/ibus-1.3.9/docs/reference/ibus/html/ch03.html 2010-11-25 03:29:04.000000000 +0100 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter" title="Input method engine"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id3103700"></a>Input method engine</h2></div></div></div> +<a name="id2777931"></a>Input method engine</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="IBusComponent.html">IBusComponent</a></span><span class="refpurpose"> — Component (executable) specification.</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/docs/reference/ibus/html/ch04.html new/ibus-1.3.9/docs/reference/ibus/html/ch04.html --- old/ibus-1.3.8/docs/reference/ibus/html/ch04.html 2010-10-22 08:16:35.000000000 +0200 +++ new/ibus-1.3.9/docs/reference/ibus/html/ch04.html 2010-11-25 03:29:04.000000000 +0100 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter" title="Configuration"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id3103744"></a>Configuration</h2></div></div></div> +<a name="id2777975"></a>Configuration</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="IBusConfig.html">IBusConfig</a></span><span class="refpurpose"> — IBus engine configuration module.</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/docs/reference/ibus/html/ch05.html new/ibus-1.3.9/docs/reference/ibus/html/ch05.html --- old/ibus-1.3.8/docs/reference/ibus/html/ch05.html 2010-10-22 08:16:35.000000000 +0200 +++ new/ibus-1.3.9/docs/reference/ibus/html/ch05.html 2010-11-25 03:29:04.000000000 +0100 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter" title="Communication"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id3103778"></a>Communication</h2></div></div></div> +<a name="id2778010"></a>Communication</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="IBusBus.html">IBusBus</a></span><span class="refpurpose"> — Connect with IBus daemon.</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/docs/reference/ibus/html/ch06.html new/ibus-1.3.9/docs/reference/ibus/html/ch06.html --- old/ibus-1.3.8/docs/reference/ibus/html/ch06.html 2010-10-22 08:16:35.000000000 +0200 +++ new/ibus-1.3.9/docs/reference/ibus/html/ch06.html 2010-11-25 03:29:04.000000000 +0100 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter" title="Internal"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id3064580"></a>Internal</h2></div></div></div> +<a name="id2738812"></a>Internal</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="ibus-ibusdebug.html">ibusdebug</a></span><span class="refpurpose"> — Debug message output.</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/docs/reference/ibus/html/ibus-ibusversion.html new/ibus-1.3.9/docs/reference/ibus/html/ibus-ibusversion.html --- old/ibus-1.3.8/docs/reference/ibus/html/ibus-ibusversion.html 2010-10-22 08:16:35.000000000 +0200 +++ new/ibus-1.3.9/docs/reference/ibus/html/ibus-ibusversion.html 2010-11-25 03:29:04.000000000 +0100 @@ -77,7 +77,7 @@ <hr> <div class="refsect2" title="IBUS_MICRO_VERSION"> <a name="IBUS-MICRO-VERSION:CAPS"></a><h3>IBUS_MICRO_VERSION</h3> -<pre class="programlisting">#define IBUS_MICRO_VERSION (8) +<pre class="programlisting">#define IBUS_MICRO_VERSION (9) </pre> <p> IBus micro version. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/docs/reference/ibus/html/index.html new/ibus-1.3.9/docs/reference/ibus/html/index.html --- old/ibus-1.3.8/docs/reference/ibus/html/index.html 2010-10-22 08:16:35.000000000 +0200 +++ new/ibus-1.3.9/docs/reference/ibus/html/index.html 2010-11-25 03:29:04.000000000 +0100 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">IBus Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - Intelligent Input Bus (IBus) 1.3.8 reference manual. + Intelligent Input Bus (IBus) 1.3.9 reference manual. The latest version of this documentation can be found on-line at <a class="ulink" href="http://code.google.com/p/ibus"; target="_top">http://code.google.com/p/ibus</a>. </p></div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/docs/reference/ibus/ibus-docs.sgml new/ibus-1.3.9/docs/reference/ibus/ibus-docs.sgml --- old/ibus-1.3.8/docs/reference/ibus/ibus-docs.sgml 2010-10-22 08:16:31.000000000 +0200 +++ new/ibus-1.3.9/docs/reference/ibus/ibus-docs.sgml 2010-11-25 03:25:55.000000000 +0100 @@ -5,7 +5,7 @@ <bookinfo> <title>IBus Reference Manual</title> <releaseinfo> - Intelligent Input Bus (IBus) 1.3.8 reference manual. + Intelligent Input Bus (IBus) 1.3.9 reference manual. The latest version of this documentation can be found on-line at <ulink role="online-location" url="http://code.google.com/p/ibus";>http://code.google.com/p/ibus</ulink>. </releaseinfo> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/docs/reference/ibus/Makefile.in new/ibus-1.3.9/docs/reference/ibus/Makefile.in --- old/ibus-1.3.8/docs/reference/ibus/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/docs/reference/ibus/Makefile.in 2010-11-25 03:25:46.000000000 +0100 @@ -104,7 +104,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/docs/reference/Makefile.in new/ibus-1.3.9/docs/reference/Makefile.in --- old/ibus-1.3.8/docs/reference/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/docs/reference/Makefile.in 2010-11-25 03:25:45.000000000 +0100 @@ -153,7 +153,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/gconf/Makefile.in new/ibus-1.3.9/gconf/Makefile.in --- old/ibus-1.3.8/gconf/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/gconf/Makefile.in 2010-11-25 03:25:46.000000000 +0100 @@ -173,7 +173,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/ibus/interface/Makefile.in new/ibus-1.3.9/ibus/interface/Makefile.in --- old/ibus-1.3.8/ibus/interface/Makefile.in 2010-10-22 08:16:25.000000000 +0200 +++ new/ibus-1.3.9/ibus/interface/Makefile.in 2010-11-25 03:25:46.000000000 +0100 @@ -137,7 +137,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/ibus/Makefile.in new/ibus-1.3.9/ibus/Makefile.in --- old/ibus-1.3.8/ibus/Makefile.in 2010-10-22 08:16:24.000000000 +0200 +++ new/ibus-1.3.9/ibus/Makefile.in 2010-11-25 03:25:46.000000000 +0100 @@ -155,7 +155,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/m4/Makefile.in new/ibus-1.3.9/m4/Makefile.in --- old/ibus-1.3.8/m4/Makefile.in 2010-10-22 08:16:25.000000000 +0200 +++ new/ibus-1.3.9/m4/Makefile.in 2010-11-25 03:25:46.000000000 +0100 @@ -113,7 +113,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/Makefile.am new/ibus-1.3.9/Makefile.am --- old/ibus-1.3.8/Makefile.am 2010-10-20 13:27:43.000000000 +0200 +++ new/ibus-1.3.9/Makefile.am 2010-11-25 03:24:56.000000000 +0100 @@ -113,7 +113,7 @@ version=@VERSION@; \ serie=$(serie); \ if test -z "$$serie"; then \ - serie=lucid; \ + serie=maverick; \ fi; \ if test -z "$$release"; then \ release=1; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/Makefile.in new/ibus-1.3.9/Makefile.in --- old/ibus-1.3.8/Makefile.in 2010-10-22 08:16:25.000000000 +0200 +++ new/ibus-1.3.9/Makefile.in 2010-11-25 03:25:46.000000000 +0100 @@ -195,7 +195,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ @@ -992,7 +992,7 @@ version=@VERSION@; \ serie=$(serie); \ if test -z "$$serie"; then \ - serie=lucid; \ + serie=maverick; \ fi; \ if test -z "$$release"; then \ release=1; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/memconf/Makefile.in new/ibus-1.3.9/memconf/Makefile.in --- old/ibus-1.3.8/memconf/Makefile.in 2010-10-22 08:16:25.000000000 +0200 +++ new/ibus-1.3.9/memconf/Makefile.in 2010-11-25 03:25:46.000000000 +0100 @@ -188,7 +188,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/setup/enginecombobox.py new/ibus-1.3.9/setup/enginecombobox.py --- old/ibus-1.3.8/setup/enginecombobox.py 2010-10-20 13:27:43.000000000 +0200 +++ new/ibus-1.3.9/setup/enginecombobox.py 2010-11-25 03:24:56.000000000 +0100 @@ -25,6 +25,7 @@ import pango import ibus import gettext +import locale from icon import load_icon _ = lambda a : gettext.dgettext("ibus", a) @@ -70,7 +71,8 @@ lang[l].append(e) keys = lang.keys() - keys.sort() + keys.sort(locale.strcoll) + #add "Others" to the end of the combo box if ibus.get_language_name("Other") in keys: keys.remove(ibus.get_language_name("Other")) keys += [ibus.get_language_name("Other")] @@ -79,7 +81,7 @@ self.__model.set(iter1, 0, l) def cmp_engine(a, b): if a.rank == b.rank: - return cmp(a.longname, b.longname) + return locale.strcoll(a.longname, b.longname) return int(b.rank - a.rank) lang[l].sort(cmp_engine) for e in lang[l]: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/setup/ibus-setup.in new/ibus-1.3.9/setup/ibus-setup.in --- old/ibus-1.3.8/setup/ibus-setup.in 2010-10-20 13:27:43.000000000 +0200 +++ new/ibus-1.3.9/setup/ibus-setup.in 2010-11-25 03:24:56.000000000 +0100 @@ -26,5 +26,5 @@ export IBUS_PREFIX=@prefix@ export IBUS_DATAROOTDIR=@datarootdir@ export IBUS_LOCALEDIR=@localedir@ -exec python @prefix@/share/ibus/setup/main.py $@ +exec @PYTHON@ @prefix@/share/ibus/setup/main.py $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/setup/main.py new/ibus-1.3.9/setup/main.py --- old/ibus-1.3.8/setup/main.py 2010-10-20 13:27:43.000000000 +0200 +++ new/ibus-1.3.9/setup/main.py 2010-11-25 03:24:56.000000000 +0100 @@ -30,6 +30,7 @@ import pango import ibus import keyboardshortcut +import locale from os import path from xdg import BaseDirectory from gtk import gdk @@ -459,5 +460,6 @@ gtk.main() if __name__ == "__main__": + locale.setlocale(locale.LC_ALL, '') setup = Setup() setup.run() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/setup/Makefile.am new/ibus-1.3.9/setup/Makefile.am --- old/ibus-1.3.8/setup/Makefile.am 2010-10-20 13:27:43.000000000 +0200 +++ new/ibus-1.3.9/setup/Makefile.am 2010-11-25 03:24:56.000000000 +0100 @@ -57,7 +57,7 @@ $(NULL) test: - $(ENV) \ + $(ENV_IBUS_TEST) \ PYTHONPATH=$(top_srcdir) \ IBUS_PREFIX="@prefix@" \ IBUS_LOCALEDIR="@localedir@" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/setup/Makefile.in new/ibus-1.3.9/setup/Makefile.in --- old/ibus-1.3.8/setup/Makefile.in 2010-10-22 08:16:25.000000000 +0200 +++ new/ibus-1.3.9/setup/Makefile.in 2010-11-25 03:25:46.000000000 +0100 @@ -142,7 +142,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ @@ -667,7 +667,7 @@ @INTLTOOL_DESKTOP_RULE@ test: - $(ENV) \ + $(ENV_IBUS_TEST) \ PYTHONPATH=$(top_srcdir) \ IBUS_PREFIX="@prefix@" \ IBUS_LOCALEDIR="@localedir@" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/src/IBus-1.0.gir new/ibus-1.3.9/src/IBus-1.0.gir --- old/ibus-1.3.8/src/IBus-1.0.gir 2010-10-22 08:16:34.000000000 +0200 +++ new/ibus-1.3.9/src/IBus-1.0.gir 2010-11-25 03:26:07.000000000 +0100 @@ -6191,7 +6191,7 @@ <constant name="MAJOR_VERSION" value="1"> <type name="int"/> </constant> - <constant name="MICRO_VERSION" value="8"> + <constant name="MICRO_VERSION" value="9"> <type name="int"/> </constant> <constant name="MINOR_VERSION" value="3"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/src/ibusversion.h new/ibus-1.3.9/src/ibusversion.h --- old/ibus-1.3.8/src/ibusversion.h 2010-10-22 08:16:31.000000000 +0200 +++ new/ibus-1.3.9/src/ibusversion.h 2010-11-25 03:25:55.000000000 +0100 @@ -49,7 +49,7 @@ * * IBus micro version. */ -#define IBUS_MICRO_VERSION (8) +#define IBUS_MICRO_VERSION (9) /** * IBUS_CHECK_VERSION: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/src/Makefile.in new/ibus-1.3.9/src/Makefile.in --- old/ibus-1.3.8/src/Makefile.in 2010-10-22 08:16:25.000000000 +0200 +++ new/ibus-1.3.9/src/Makefile.in 2010-11-25 03:25:46.000000000 +0100 @@ -232,7 +232,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/ui/gtk/ibus-ui-gtk.in new/ibus-1.3.9/ui/gtk/ibus-ui-gtk.in --- old/ibus-1.3.8/ui/gtk/ibus-ui-gtk.in 2010-10-20 13:27:43.000000000 +0200 +++ new/ibus-1.3.9/ui/gtk/ibus-ui-gtk.in 2010-11-25 03:24:56.000000000 +0100 @@ -27,5 +27,5 @@ export IBUS_DATAROOTDIR=@datarootdir@ export IBUS_LOCALEDIR=@localedir@ -exec python @prefix@/share/ibus/ui/gtk/main.py $@ +exec @PYTHON@ @prefix@/share/ibus/ui/gtk/main.py $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/ui/gtk/main.py new/ibus-1.3.9/ui/gtk/main.py --- old/ibus-1.3.8/ui/gtk/main.py 2010-10-20 13:27:43.000000000 +0200 +++ new/ibus-1.3.9/ui/gtk/main.py 2010-11-25 03:24:56.000000000 +0100 @@ -58,7 +58,6 @@ "Please restart ibus input platform."), \ "ibus") self.__notify.set_timeout(10 * 1000) - self.__notify.attach_to_status_icon (self.__panel.get_status_icon()) self.__notify.add_action("restart", _("Restart Now"), self.__restart_cb, None) self.__notify.add_action("ignore", _("Later"), lambda *args: None, None) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/ui/gtk/Makefile.in new/ibus-1.3.9/ui/gtk/Makefile.in --- old/ibus-1.3.8/ui/gtk/Makefile.in 2010-10-22 08:16:25.000000000 +0200 +++ new/ibus-1.3.9/ui/gtk/Makefile.in 2010-11-25 03:25:46.000000000 +0100 @@ -143,7 +143,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/ui/Makefile.in new/ibus-1.3.9/ui/Makefile.in --- old/ibus-1.3.8/ui/Makefile.in 2010-10-22 08:16:25.000000000 +0200 +++ new/ibus-1.3.9/ui/Makefile.in 2010-11-25 03:25:46.000000000 +0100 @@ -153,7 +153,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/util/IMdkit/Makefile.in new/ibus-1.3.9/util/IMdkit/Makefile.in --- old/ibus-1.3.8/util/IMdkit/Makefile.in 2010-10-22 08:16:25.000000000 +0200 +++ new/ibus-1.3.9/util/IMdkit/Makefile.in 2010-11-25 03:25:46.000000000 +0100 @@ -155,7 +155,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-1.3.8/util/Makefile.in new/ibus-1.3.9/util/Makefile.in --- old/ibus-1.3.8/util/Makefile.in 2010-10-22 08:16:25.000000000 +0200 +++ new/ibus-1.3.9/util/Makefile.in 2010-11-25 03:25:46.000000000 +0100 @@ -153,7 +153,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_IBUS_TEST = @ENV_IBUS_TEST@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCONFTOOL = @GCONFTOOL@ ++++++ ibus-README.suse ++++++ --- /var/tmp/diff_new_pack.StYhQb/_old 2011-06-27 13:26:33.000000000 +0200 +++ /var/tmp/diff_new_pack.StYhQb/_new 2011-06-27 13:26:33.000000000 +0200 @@ -1,60 +1,70 @@ ibus README for SuSE How to start using ibus -In poor English: +English: + 0:Note: ibus don't support QT3 immodule, If you use qt3-base applications, modify your /etc/X11/xim.d/ibus to export QT_IM_MODULE=xim -1.SuSE can start ibus automatically when your locale is set to en, zh_TW, zh_CN, zh_HK, zh_SG, ko_KR and ja_JP. -The setup script is a link in /etc/X11/xim.d/YOUR-LOCALE/15-ibus which link to /etc/X11/xim.d/ibus. -The number "15" makes ibus have priority over other input-method (e.g 50-scim or 90-xcin ). -If you prefer not using ibus, mv 15-ibus to 80-ibus (for example). Or see 2. +1.openSUSE can start ibus automatically when your locale is set to en, zh_TW, zh_CN, zh_HK, zh_SG, ko_KR and ja_JP. +The setup script is a link in /etc/X11/xim.d/YOUR-LOCALE/40-ibus which link to /etc/X11/xim.d/ibus. +The number "40" makes ibus have priority over other input-method (e.g 50-scim or 90-xcin ). +If you prefer not using ibus, mv 40-ibus to 80-ibus (for example). Or see 2. 2.If for some reason can't start ibus when login Xwindow -(1)maybe you are using root to login X, -(2)your /etc/X11/xim was modified, -(3)you are using a locale other than 1. -(4)there is another input-method who has higher priority then ibus (e.g 10-oxim) +There is another input-method who has higher priority then ibus (e.g 10-oxim) You can edit ~/.xim, see ~/.xim.template for more informations. Or edit ~/.profile, add export INPUT_METHOD="ibus" After installing ibus, there's a template for ibus: /usr/share/doc/packages/ibus/xim.ibus.suse.template copy this file to ~/.xim, then you can use ibus next login X. -3.You want to use your own input-method other than system setting, see 2. - -4.Notice:ibus will try to stop skim(a front-end of scim in kde) auto-start when login kde. +3.You want to use your own input-method other than system setting +(1)System setting: +Edit /etc/sysconfig/language , set INPUT_METHOD="scim-bridge", or whatever you want,Make sure your start-up script is put in /etc/X11/xim.d/ with same name ypu mention. +(2)For specific language setting: +Link a start-up script in /etc/X11/xim.d/ to your locale with a higher priority (smaller number), eg +ln -s /etc/X11/xim.d/scim-bridge /etc/X11/xim.d/zh_TW/20-scim-bridge +(3)Personal setting: +Edit ~/.profile add +export INPUT_METHOD="scim-bridge" or whatever script in /etc/X11/xim.d/ +or white your own ~/.xim, see ~/.xim.template for more informations. -5.Bug report or any suggestion to +4.Bug report or any suggestion to http://code.google.com/p/ibus/ -In Chinese: +Chinese: + 0:注意：ibus 不支援 QT3 immodule, 若您使用 qt3-based 應用程式，請修改 /etc/X11/xim.d/ibus 設定 export QT_IM_MODULE=xim 1.當您使用的語系是en 或zh_*時，SuSE 會自動啟動ibus -啟動的script是/etc/X11/xim.d/YOUR-LOCALE/15-ibus，這是一個到上層目錄ibus的連結 -"15"這個數字使他的優先順序高於90-xcin及50-scim +啟動的script是/etc/X11/xim.d/YOUR-LOCALE/40-ibus，這是一個到上層目錄ibus的連結 +"40"這個數字使他的優先順序高於90-xcin及50-scim 如果您不喜歡這個順序，修改連結的名稱為(例如：80-ibus)，或參考2. 2.重新登入X後，如果不能用ibus...可能是： -(1)您用root登入X， -(2)您的/etc/X11/xim被更改過了， -或普通使用者無法想使用自己的設定， -(3)您使用非1.中指定的語系 -(4)有別的輸入法的優先順序高於ibus(例如：10-oxim) +有別的輸入法的優先順序高於ibus(例如：10-oxim) 您可以編輯~/.xim，請參考~/.xim.template 安裝ibus後，會有一個範本：/usr/share/doc/packages/ibus/xim.ibus.suse.template 將這個檔案複製到您的~/.xim，當您下次登入X時就可以使用ibus了 或編輯~/.profile，加入 export INPUT_METHOD="ibus" -3.如果您想要自己選擇輸入法而非使用系統設定，請參考2. - -4.注意：ibus會取消skim(scim的kde前端程式)的auto-start +3.如果您想要自己選擇輸入法而非使用系統設定 +(1)全系統設定： +編輯 /etc/sysconfig/language, 設定 INPUT_METHOD="ibus" 或其他你想用的輸入法， +請注意你的啟動程序必須位於 /etc/X11/xim.d/，並和您指定的名稱相同 +(2)針對特定語言： +將您的啟動程序連結到你的語系中，並前置較高的優先順序(較小數字)，例如 +ln -s /etc/X11/xim.d/ibus /etc/X11/xim.d/zh_TW/20-ibus +(3)個人設定： +編輯 ~/.profile 加入 +export INPUT_METHOD="ibus" 或其他在 /etc/X11/xim.d/ 的啟動程序 +或自行編寫啟動程序 ~/.xim，請參考 ~/.xim.template 5.臭蟲回報或建議請至 http://code.google.com/p/ibus/ ++++++ xim.d-ibus ++++++ --- /var/tmp/diff_new_pack.StYhQb/_old 2011-06-27 13:26:33.000000000 +0200 +++ /var/tmp/diff_new_pack.StYhQb/_new 2011-06-27 13:26:33.000000000 +0200 @@ -42,27 +42,10 @@ export QT_IM_SWITCHER=imsw-multi if [ -e /usr/$SYS_LIB/qt4/plugins/inputmethods/libqtim-ibus.so ]; then export QT_IM_MODULE=ibus - else - export QT_IM_MODULE=xim - fi -## test if use kimpanel -## make sure your ibus panel for kimpanel is /usr/libexec/panel.py -## or you can specify it below -#export KIMPANEL_IBUS=/usr/libexec/panel.py -## but there's some problems to startup ibus-panel for kimpanel -## use ~/.kde4/Autostart/kimpanel-ibus instead - if [ -e /usr/libexec/panel.py ]; then -# ibus-daemon --panel=$KIMPANEL_IBUS --xim -d - if [ ! -e ~/.kde4/Autostart/kimpanel-ibus ]; then - cp /usr/$SYS_LIB/ibus/dbus/kimpanel-ibus \ - ~/.kde4/Autostart/kimpanel-ibus - fi else - if [ -e ~/.kde4/Autostart/kimpanel-ibus ]; then - rm ~/.kde4/Autostart/kimpanel-ibus - fi - ibus-daemon --xim -d + export QT_IM_MODULE=xim fi + ibus-daemon --xim -d PATH=$OLD_PATH ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
