diff --git a/.cvsignore b/.cvsignore index 09c137d..1699c17 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ibus-1.2.0.20090617.tar.gz +ibus-1.2.0.20090719.tar.gz diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch index ef34178..8b13789 100644 --- a/ibus-HEAD.patch +++ b/ibus-HEAD.patch @@ -1,89 +1 @@ -diff --git a/bus/factoryproxy.c b/bus/factoryproxy.c -index cf30b95..521d609 100644 ---- a/bus/factoryproxy.c -+++ b/bus/factoryproxy.c -@@ -172,21 +172,35 @@ bus_factory_proxy_create_engine (BusFactoryProxy *factory, - g_assert (BUS_IS_FACTORY_PROXY (factory)); - g_assert (IBUS_IS_ENGINE_DESC (desc)); - -+ IBusPendingCall *pending = NULL; - IBusMessage *reply_message; - IBusError *error; - BusEngineProxy *engine; - gchar *object_path; -+ gboolean retval; - - if (g_list_find (factory->component->engines, desc) == NULL) { - return NULL; - } - -- reply_message = ibus_proxy_call_with_reply_and_block ((IBusProxy *) factory, -- "CreateEngine", -- -1, -- &error, -- G_TYPE_STRING, &(desc->name), -- G_TYPE_INVALID); -+ retval = ibus_proxy_call_with_reply ((IBusProxy *) factory, -+ "CreateEngine", -+ &pending, -+ -1, -+ &error, -+ G_TYPE_STRING, &(desc->name), -+ G_TYPE_INVALID); -+ -+ if (!retval) { -+ g_warning ("%s: %s", error->name, error->message); -+ ibus_error_free (error); -+ return NULL; -+ } -+ -+ ibus_pending_call_wait (pending); -+ reply_message = ibus_pending_call_steal_reply (pending); -+ ibus_pending_call_unref (pending); -+ - if (reply_message == NULL) { - g_warning ("%s: %s", error->name, error->message); - ibus_error_free (error); -diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py -index d0c95d1..6f2e2ea 100644 ---- a/setup/enginetreeview.py -+++ b/setup/enginetreeview.py -@@ -45,7 +45,7 @@ class EngineTreeView(gtk.TreeView): - self.__engines = set([]) - self.__changed = False - -- self.set_headers_visible(True) -+ # self.set_headers_visible(True) - self.set_reorderable(True) - - self.__model = gtk.ListStore(gobject.TYPE_PYOBJECT, gobject.TYPE_STRING) -@@ -76,6 +76,7 @@ class EngineTreeView(gtk.TreeView): - model = gtk.ListStore(gobject.TYPE_STRING) - model.append(("us",)) - model.append(("jp",)) -+ model.append(("xkb",)) - renderer.set_property("xalign", 0) - renderer.set_property("model", model) - renderer.set_property("text-column", 0) -@@ -89,7 +90,7 @@ class EngineTreeView(gtk.TreeView): - column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) - column.pack_start(renderer, False) - column.set_cell_data_func(renderer, self.__layout_cell_data_cb) -- self.append_column (column) -+ # self.append_column(column) - - self.set_engines(engines) - -diff --git a/ui/gtk/engineabout.py b/ui/gtk/engineabout.py -index dd7bee4..3d7df5a 100644 ---- a/ui/gtk/engineabout.py -+++ b/ui/gtk/engineabout.py -@@ -61,7 +61,7 @@ class EngineAbout(gtk.Dialog): - "heading", "left_margin_16") - text_buffer.insert_with_tags_by_name(iter, _("Language: %s\n") % ibus.get_language_name(self.__engine_desc.language), - "small", "bold", "left_margin_16") -- text_buffer.insert_with_tags_by_name(iter, _("Kayboard layout: %s\n") % self.__engine_desc.layout, -+ text_buffer.insert_with_tags_by_name(iter, _("Keyboard layout: %s\n") % self.__engine_desc.layout, - "small", "bold", "left_margin_16") - text_buffer.insert_with_tags_by_name(iter, _("Author: %s\n") % self.__engine_desc.author, - "small", "bold", "left_margin_16") + diff --git a/ibus.spec b/ibus.spec index f10b764..ad46bd5 100644 --- a/ibus.spec +++ b/ibus.spec @@ -7,7 +7,7 @@ %define im_chooser_version 1.2.5 Name: ibus -Version: 1.2.0.20090617 +Version: 1.2.0.20090719 Release: 1%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ @@ -15,7 +15,7 @@ Group: System Environment/Libraries URL: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz Source1: xinput-ibus -Patch0: ibus-HEAD.patch +# Patch0: ibus-HEAD.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -114,8 +114,8 @@ The ibus-devel-docs package contains developer documentation for ibus %prep %setup -q -%patch0 -p1 -./autogen.sh --help +# %patch0 -p1 +# ./autogen.sh --help %build %configure --disable-static \ @@ -228,93 +228,96 @@ fi %{_datadir}/gtk-doc/html/* %changelog -* Mon Jun 22 2009 Huang Peng - 1.2.0.20090617-1 +* Sun Jul 19 2009 Peng Huang - 1.2.0.20090719-1 +- Update to 1.2.0.200907179 + +* Mon Jun 22 2009 Peng Huang - 1.2.0.20090617-1 - Update to 1.2.0.20090617 -* Fri Jun 12 2009 Huang Peng - 1.1.0.20090612-1 +* Fri Jun 12 2009 Peng Huang - 1.1.0.20090612-1 - Update to 1.1.0.20090612 - Fix bug 504942 - PageUp and PageDown do not work in candidate list - Fix bug 491040 - Implememnt mouse selection in candidate list -* Wed Jun 10 2009 Huang Peng - 1.1.0.20090609-1 +* Wed Jun 10 2009 Peng Huang - 1.1.0.20090609-1 - Update to Update to 1.1.0.20090609 - Fix bug 502414 - Implemented on-screen help facility - Fix bug 502561 - iBus should show keymap name on iBus panel - Fix bug 498043 - ibus Alt-grave trigger conflicts with openoffice.org - Implemented API for setting labels for candidates in LookupTable -* Sun May 31 2009 Huang Peng - 1.1.0.20090531-1 +* Sun May 31 2009 Peng Huang - 1.1.0.20090531-1 - Update to Update to 1.1.0.20090531 -* Tue May 26 2009 Huang Peng - 1.1.0.20090508-5 +* Tue May 26 2009 Peng Huang - 1.1.0.20090508-5 - Update ibus-HEAD.patch. - Show the default input method with bold text - Add information text below input methods list -* Mon May 25 2009 Huang Peng - 1.1.0.20090508-4 +* Mon May 25 2009 Peng Huang - 1.1.0.20090508-4 - Update ibus-HEAD.patch. - Fix bug 501211 - ibus-setup window should be raised if running or just stay on top/grab focus - Fix bug 501640 - ibus should adds new IMEs at end of engine list not beginning - Fix bug 501644 - [IBus] focus-out and disabled IME should hide language panel -* Thu May 14 2009 Huang Peng - 1.1.0.20090508-2 +* Thu May 14 2009 Peng Huang - 1.1.0.20090508-2 - Remove requires notification-daemon - Fix bug 500588 - Hardcoded requirement for notification-daemon -* Fri May 08 2009 Huang Peng - 1.1.0.20090508-1 +* Fri May 08 2009 Peng Huang - 1.1.0.20090508-1 - Update to 1.1.0.20090508 - Fix bug 499533 - [Indic] ibus should allow input in KDE using all supported Indic locales - Fix bug 498352 - hotkey config table should list keys in same order as on main setup page - Fix bug 497707 - ibus French translation update -* Fri May 08 2009 Huang Peng - 1.1.0.20090423-3 +* Fri May 08 2009 Peng Huang - 1.1.0.20090423-3 - Fix bug 498541 - ibus-libs should not contain devel file libibus.so -* Tue May 05 2009 Huang Peng - 1.1.0.20090423-2 +* Tue May 05 2009 Peng Huang - 1.1.0.20090423-2 - Fix bug 498141 - new ibus install needs gtk immodules - Separate ibus document from ibus-devel to ibus-devel-docs -* Thu Apr 23 2009 Huang Peng - 1.1.0.20090423-1 +* Thu Apr 23 2009 Peng Huang - 1.1.0.20090423-1 - Update to ibus-1.1.0.20090423. - Fix bug 497265 - [mai_IN] Maithili language name is not correct. - Fix bug 497279 - IBus does not works with evolution correctly. - Enhance authentication both in daemon & clients -* Fri Apr 17 2009 Huang Peng - 1.1.0.20090417-1 +* Fri Apr 17 2009 Peng Huang - 1.1.0.20090417-1 - Update to ibus-1.1.0.20090417. - Fix bug 496199 - cannot remove Ctrl+Space hotkey with ibus-setup -* Fri Apr 17 2009 Huang Peng - 1.1.0.20090413-4 +* Fri Apr 17 2009 Peng Huang - 1.1.0.20090413-4 - Update ibus-HEAD.patch. - Next Engine hotkey will do nothing if the IM is not active. -* Wed Apr 15 2009 Huang Peng - 1.1.0.20090413-3 +* Wed Apr 15 2009 Peng Huang - 1.1.0.20090413-3 - Update ibus-HEAD.patch. - Fix bug 495431 - ibus Release modifier doesn't work with Alt - Fix bug 494445 - ibus-hangul missing Hangul Han/En mode (and Alt_R+release hotkey) - Update te.po -* Tue Apr 14 2009 Huang Peng - 1.1.0.20090413-2 +* Tue Apr 14 2009 Peng Huang - 1.1.0.20090413-2 - Update ibus-HEAD.patch. - Change the mode of /tmp/ibus-$USER to 0700 to improve security - Change the mode of /tmp/ibus-$USER/socket-address to 0600 to improve security - Update as.po -* Mon Apr 13 2009 Huang Peng - 1.1.0.20090413-1 +* Mon Apr 13 2009 Peng Huang - 1.1.0.20090413-1 - Update to ibus-1.1.0.20090413. - Fix crash when restart the ibus-daemon - Add some translations. -* Tue Apr 07 2009 Huang Peng - 1.1.0.20090407-3 +* Tue Apr 07 2009 Peng Huang - 1.1.0.20090407-3 - Update the tarball. - Fix bug 494511 - ibus-gtk makes gnome-terminal abort when a key is pressed -* Tue Apr 07 2009 Huang Peng - 1.1.0.20090407-2 +* Tue Apr 07 2009 Peng Huang - 1.1.0.20090407-2 - Update default hotkey settings. -* Tue Apr 07 2009 Huang Peng - 1.1.0.20090407-1 +* Tue Apr 07 2009 Peng Huang - 1.1.0.20090407-1 - Update to ibus-1.1.0.20090407. - Fix bug 491042 - ibus default trigger hotkeys - Fix bug 492929 - ibus-hangul can cause gtk app to lockup @@ -322,25 +325,25 @@ fi - Fix bug 493687 - ibus-hangul should default to vertical candidate selection - Fix bug 493449 - ibus broke Alt-F2 command auto-completion -* Tue Mar 31 2009 Huang Peng - 1.1.0.20090331-1 +* Tue Mar 31 2009 Peng Huang - 1.1.0.20090331-1 - Update to ibus-1.1.0.20090331. - Fix bug 492956 - screws up keyboard input in firefox - Fix bug 490143 - ibus issue with gnome-keyring -* Sun Mar 29 2009 Huang Peng - 1.1.0.20090311-3 +* Sun Mar 29 2009 Peng Huang - 1.1.0.20090311-3 - Recreate the ibus-HEAD.patch from upstream git source tree - Fix bug 491999 - up/down arrow keys broken in xchat -* Sat Mar 28 2009 Huang Peng - 1.1.0.20090311-2 +* Sat Mar 28 2009 Peng Huang - 1.1.0.20090311-2 - Recreate the ibus-HEAD.patch from upstream git source tree. - Fix bug 490009 - Deleting Next Engine shortcuts doesn't work - Fix bug 490381 - Change "Next/Previous engine" labels -* Wed Mar 11 2009 Huang Peng - 1.1.0.20090311-1 +* Wed Mar 11 2009 Peng Huang - 1.1.0.20090311-1 - Update to ibus-1.1.0.20090311. - Update setup ui follow GNOME Human Interface Guidelines 2.2 (#489497). -* Fri Mar 6 2009 Huang Peng - 1.1.0.20090306-1 +* Fri Mar 6 2009 Peng Huang - 1.1.0.20090306-1 - Update to ibus-1.1.0.20090306. * Tue Mar 3 2009 Jens Petersen @@ -350,60 +353,60 @@ fi - drop the superfluous ibus-0.1 engine obsoletes - move glib2 requires to gtk package -* Tue Feb 25 2009 Huang Peng - 1.1.0.20090225-1 +* Tue Feb 25 2009 Peng Huang - 1.1.0.20090225-1 - Update to ibus-1.1.0.20090225. - Fix problems in %post and %postun scripts. - Hide ibus & ibus preferences menu items. -* Tue Feb 17 2009 Huang Peng - 1.1.0.20090211-10 +* Tue Feb 17 2009 Peng Huang - 1.1.0.20090211-10 - Recreate the ibus-HEAD.patch from upstream git source tree. - Put 'Select an input method' in engine select combobox (#485861). -* Tue Feb 17 2009 Huang Peng - 1.1.0.20090211-9 +* Tue Feb 17 2009 Peng Huang - 1.1.0.20090211-9 - Add requires im-chooser >= 1.2.5. -* Tue Feb 17 2009 Huang Peng - 1.1.0.20090211-8 +* Tue Feb 17 2009 Peng Huang - 1.1.0.20090211-8 - Recreate the ibus-HEAD.patch from upstream git source tree. - Fix ibus-hangul segfault (#485438). -* Mon Feb 16 2009 Huang Peng - 1.1.0.20090211-6 +* Mon Feb 16 2009 Peng Huang - 1.1.0.20090211-6 - Recreate the ibus-HEAD.patch from upstream git source tree. - The new patch fixes ibus-x11 segfault (#485661). -* Sun Feb 15 2009 Huang Peng - 1.1.0.20090211-5 +* Sun Feb 15 2009 Peng Huang - 1.1.0.20090211-5 - Recreate the ibus-HEAD.patch from upstream git source tree. -* Sun Feb 15 2009 Huang Peng - 1.1.0.20090211-4 +* Sun Feb 15 2009 Peng Huang - 1.1.0.20090211-4 - Remove gnome-python2-gconf from requires. -* Fri Feb 13 2009 Huang Peng - 1.1.0.20090211-3 +* Fri Feb 13 2009 Peng Huang - 1.1.0.20090211-3 - Update ibus-HEAD.patch, to fix bug 484652. -* Fri Feb 13 2009 Huang Peng - 1.1.0.20090211-2 +* Fri Feb 13 2009 Peng Huang - 1.1.0.20090211-2 - Add patch ibus-HEAD.patch, to update ibus to HEAD version. -* Wed Feb 11 2009 Huang Peng - 1.1.0.20090211-1 +* Wed Feb 11 2009 Peng Huang - 1.1.0.20090211-1 - Add --xim argument in xinput-ibus - Add Obsoletes: ibus-qt <= 1.1.0 - Move libibus.so.* to ibus-libs to make ibus multilib. - Update to 1.1.0.20090211. -* Thu Feb 05 2009 Huang Peng - 1.1.0.20090205-1 +* Thu Feb 05 2009 Peng Huang - 1.1.0.20090205-1 - Update to 1.1.0.20090205. -* Tue Feb 03 2009 Huang Peng - 0.1.1.20090203-1 +* Tue Feb 03 2009 Peng Huang - 0.1.1.20090203-1 - Update to 0.1.1.20090203. * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.1.1.20081023-3 - Rebuild for Python 2.6 -* Wed Nov 19 2008 Huang Peng - 0.1.1.20081023-2 +* Wed Nov 19 2008 Peng Huang - 0.1.1.20081023-2 - Move libibus-gtk.so from ibus.rpm to ibus-gtk.rpm to fix bug 472146. -* Thu Oct 23 2008 Huang Peng - 0.1.1.20081023-1 +* Thu Oct 23 2008 Peng Huang - 0.1.1.20081023-1 - Update to 0.1.1.20081023. -* Thu Oct 16 2008 Huang Peng - 0.1.1.20081016-1 +* Thu Oct 16 2008 Peng Huang - 0.1.1.20081016-1 - Update to 0.1.1.20081016. * Tue Oct 7 2008 Jens Petersen - 0.1.1.20081006-3 @@ -412,56 +415,56 @@ fi * Tue Oct 7 2008 Jens Petersen - 0.1.1.20081006-2 - add xinputrc alternative when installing or uninstalling -* Mon Oct 06 2008 Huang Peng - 0.1.1.20081006-1 +* Mon Oct 06 2008 Peng Huang - 0.1.1.20081006-1 - Update to 0.1.1.20081006. -* Sun Oct 05 2008 Huang Peng - 0.1.1.20081005-1 +* Sun Oct 05 2008 Peng Huang - 0.1.1.20081005-1 - Update to 0.1.1.20081005. -* Sat Oct 04 2008 Huang Peng - 0.1.1.20081004-1 +* Sat Oct 04 2008 Peng Huang - 0.1.1.20081004-1 - Update to 0.1.1.20081004. -* Wed Oct 01 2008 Huang Peng - 0.1.1.20081001-1 +* Wed Oct 01 2008 Peng Huang - 0.1.1.20081001-1 - Update to 0.1.1.20081001. -* Tue Sep 30 2008 Huang Peng - 0.1.1.20080930-1 +* Tue Sep 30 2008 Peng Huang - 0.1.1.20080930-1 - Update to 0.1.1.20080930. -* Tue Sep 23 2008 Huang Peng - 0.1.1.20080923-1 +* Tue Sep 23 2008 Peng Huang - 0.1.1.20080923-1 - Update to 0.1.1.20080923. -* Wed Sep 17 2008 Huang Peng - 0.1.1.20080917-1 +* Wed Sep 17 2008 Peng Huang - 0.1.1.20080917-1 - Update to 0.1.1.20080917. -* Tue Sep 16 2008 Huang Peng - 0.1.1.20080916-1 +* Tue Sep 16 2008 Peng Huang - 0.1.1.20080916-1 - Update to 0.1.1.20080916. -* Mon Sep 15 2008 Huang Peng - 0.1.1.20080914-1 +* Mon Sep 15 2008 Peng Huang - 0.1.1.20080914-1 - Update to 0.1.1.20080914. -* Mon Sep 08 2008 Huang Peng - 0.1.1.20080908-1 +* Mon Sep 08 2008 Peng Huang - 0.1.1.20080908-1 - Update to 0.1.1.20080908. -* Mon Sep 01 2008 Huang Peng - 0.1.1.20080901-1 +* Mon Sep 01 2008 Peng Huang - 0.1.1.20080901-1 - Update to 0.1.1.20080901. -* Sat Aug 30 2008 Huang Peng - 0.1.1.20080830-1 +* Sat Aug 30 2008 Peng Huang - 0.1.1.20080830-1 - Update to 0.1.1.20080830. -* Mon Aug 25 2008 Huang Peng - 0.1.1.20080825-1 +* Mon Aug 25 2008 Peng Huang - 0.1.1.20080825-1 - Update to 0.1.1.20080825. -* Sat Aug 23 2008 Huang Peng - 0.1.1.20080823-1 +* Sat Aug 23 2008 Peng Huang - 0.1.1.20080823-1 - Update to 0.1.1.20080823. -* Fri Aug 15 2008 Huang Peng - 0.1.1.20080815-1 +* Fri Aug 15 2008 Peng Huang - 0.1.1.20080815-1 - Update to 0.1.1.20080815. -* Thu Aug 12 2008 Huang Peng - 0.1.1.20080812-1 +* Thu Aug 12 2008 Peng Huang - 0.1.1.20080812-1 - Update to 0.1.1.20080812. -* Mon Aug 11 2008 Huang Peng - 0.1.0.20080810-2 +* Mon Aug 11 2008 Peng Huang - 0.1.0.20080810-2 - Add gnome-python2-gconf in Requires. -* Thu Aug 07 2008 Huang Peng - 0.1.0.20080810-1 +* Thu Aug 07 2008 Peng Huang - 0.1.0.20080810-1 - The first version. diff --git a/sources b/sources index 9d80888..bddbd02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3753834804986d4f118b0030c80daa01 ibus-1.2.0.20090617.tar.gz +66cfbbf03f7310c017863c3fdb2d988e ibus-1.2.0.20090719.tar.gz