rpms/ibus/F-13 .cvsignore, 1.54, 1.55 ibus-HEAD.patch, 1.29, 1.30 ibus.spec, 1.110, 1.111 sources, 1.60, 1.61
Peng Huang
phuang at fedoraproject.org
Tue May 4 05:41:13 UTC 2010
Author: phuang
Update of /cvs/pkgs/rpms/ibus/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24896
Modified Files:
.cvsignore ibus-HEAD.patch ibus.spec sources
Log Message:
Update to 1.3.3
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-13/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore 21 Apr 2010 09:27:58 -0000 1.54
+++ .cvsignore 4 May 2010 05:41:13 -0000 1.55
@@ -1 +1 @@
-ibus-1.3.2.tar.gz
+ibus-1.3.3.tar.gz
ibus-HEAD.patch:
0 files changed
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.29 -r 1.30 ibus-HEAD.patchIndex: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-13/ibus-HEAD.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ibus-HEAD.patch 2 May 2010 03:40:26 -0000 1.29
+++ ibus-HEAD.patch 4 May 2010 05:41:13 -0000 1.30
@@ -1,5418 +1 @@
-diff --git a/bus/inputcontext.c b/bus/inputcontext.c
-index acb465d..ca95d65 100644
---- a/bus/inputcontext.c
-+++ b/bus/inputcontext.c
-@@ -656,21 +656,24 @@ _ic_process_key_event_reply_cb (gpointer data,
- {
- gboolean retval;
- CallData *call_data;
-- IBusMessage *reply;
-
- retval = (gboolean) GPOINTER_TO_INT (data);
- call_data = (CallData *) user_data;
-
-- reply = ibus_message_new_method_return (call_data->message);
-- ibus_message_append_args (reply,
-- G_TYPE_BOOLEAN, &retval,
-- G_TYPE_INVALID);
-+ /* make sure the connection is alive */
-+ if (G_LIKELY (call_data->context->connection != NULL)) {
-+ IBusMessage *reply;
-+ reply = ibus_message_new_method_return (call_data->message);
-+ ibus_message_append_args (reply,
-+ G_TYPE_BOOLEAN, &retval,
-+ G_TYPE_INVALID);
-
-- ibus_connection_send ((IBusConnection *)call_data->context->connection, reply);
-+ ibus_connection_send ((IBusConnection *)call_data->context->connection, reply);
-+ ibus_message_unref (reply);
-+ }
-
- g_object_unref (call_data->context);
- ibus_message_unref (call_data->message);
-- ibus_message_unref (reply);
- g_slice_free (CallData, call_data);
- }
-
-diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
-index 11b0c2f..1db51e1 100644
---- a/data/ibus.schemas.in
-+++ b/data/ibus.schemas.in
-@@ -53,10 +53,10 @@
- <applyto>/desktop/ibus/panel/show</applyto>
- <owner>ibus</owner>
- <type>int</type>
-- <default>1</default>
-+ <default>0</default>
- <locale name="C">
- <short>Auto hide</short>
-- <long>The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always show</long>
-+ <long>The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = Always show</long>
- </locale>
- </schema>
- <schema>
-diff --git a/ibus.spec.in b/ibus.spec.in
-index 96e3764..29c493d 100644
---- a/ibus.spec.in
-+++ b/ibus.spec.in
-@@ -44,6 +44,7 @@ Requires: dbus-python >= %{dbus_python_version}
- Requires: im-chooser >= %{im_chooser_version}
- Requires: GConf2 >= %{gconf2_version}
- Requires: notify-python
-+Requires: librsvg2
-
- Requires(post): desktop-file-utils
- Requires(postun): desktop-file-utils
-diff --git a/po/ar.po b/po/ar.po
-index 2d94f0c..b135d2f 100644
---- a/po/ar.po
-+++ b/po/ar.po
-@@ -8,7 +8,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2010-04-21 10:58+0800\n"
-+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
- "PO-Revision-Date: 2009-04-06 11:45+0800\n"
- "Last-Translator: Muayyad Alsadi <alsadi at ojuba.org>\n"
- "Language-Team: Arabic <AR at li.org>\n"
-@@ -245,11 +245,11 @@ msgstr "المحركات المحملة مسبقا عند بدء ibus"
- msgid "Prev engine shortcut keys"
- msgstr "مفتاح المحرك السابق"
-
--#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
-+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
- msgid "Share the same input method among all applications"
- msgstr ""
-
--#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
-+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
- msgid "Show icon on system tray"
- msgstr ""
-
-@@ -258,15 +258,15 @@ msgstr ""
- msgid "Show input method name"
- msgstr "اسم الخط المخصص للوحة اللغة"
-
--#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
-+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
- #, fuzzy
- msgid "Show input method name on language bar"
- msgstr "اسم الخط المخصص للوحة اللغة"
-
- #: ../data/ibus.schemas.in.h:17
- msgid ""
--"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
--"show"
-+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
-+"Always show"
- msgstr ""
-
- #: ../data/ibus.schemas.in.h:18
-@@ -275,11 +275,11 @@ msgid ""
- "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
- msgstr ""
-
--#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
-+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
- msgid "The shortcut keys for switching to next input method in the list"
- msgstr ""
-
--#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
-+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
- msgid "The shortcut keys for turning input method on or off"
- msgstr ""
-
-@@ -301,11 +301,11 @@ msgstr "استخدم خط مخصص في لوحة اللغة"
- msgid "Use global input method"
- msgstr "اختر طريقة الإدخال"
-
--#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
-+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
- msgid "Use system keyboard (XKB) layout"
- msgstr ""
-
--#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
-+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
- msgid "Use system keyboard layout"
- msgstr ""
-
-@@ -426,68 +426,64 @@ msgid "Move up the selected input method in the enabled input methods list"
- msgstr ""
-
- #: ../setup/setup.ui.h:35
--msgid "Never"
--msgstr ""
--
--#: ../setup/setup.ui.h:36
- msgid "Next input method:"
- msgstr "طريقة الإدخال التالية"
-
--#: ../setup/setup.ui.h:37
-+#: ../setup/setup.ui.h:36
- msgid "Previous input method:"
- msgstr "طريقة الإدخال السابقة"
-
--#: ../setup/setup.ui.h:38
-+#: ../setup/setup.ui.h:37
- msgid "Remove the selected input method from the enabled input methods"
- msgstr ""
-
--#: ../setup/setup.ui.h:39
-+#: ../setup/setup.ui.h:38
- msgid "Set the behavior of ibus how to show or hide language bar"
- msgstr ""
-
--#: ../setup/setup.ui.h:40
-+#: ../setup/setup.ui.h:39
- msgid "Set the orientation of candidates in lookup table"
- msgstr ""
-
--#: ../setup/setup.ui.h:43
-+#: ../setup/setup.ui.h:42
- msgid "Show information of the selected input method"
- msgstr ""
-
--#: ../setup/setup.ui.h:45
-+#: ../setup/setup.ui.h:44
- #, fuzzy
- msgid "Show input method's name on language bar when check the checkbox"
- msgstr "اسم الخط المخصص للوحة اللغة"
-
--#: ../setup/setup.ui.h:46
-+#: ../setup/setup.ui.h:45
- msgid "Show language panel:"
- msgstr "إظهار لوحة اللغات:"
-
--#: ../setup/setup.ui.h:47
-+#: ../setup/setup.ui.h:46
- msgid "Start ibus on login"
- msgstr "بدء ibus عند الولوج"
-
[...5028 lines suppressed...]
-- self.__config.get_value("panel", "show", 1))
-+ self.__config.get_value("panel", "show", 0))
- self.__combobox_panel_show.connect("changed", self.__combobox_panel_show_changed_cb)
-
- # panel position
-diff --git a/setup/setup.ui b/setup/setup.ui
-index a64a4cc..1c7df92 100644
---- a/setup/setup.ui
-+++ b/setup/setup.ui
-@@ -23,7 +23,7 @@
- </columns>
- <data>
- <row>
-- <col id="0" translatable="yes">Never</col>
-+ <col id="0" translatable="yes">Embedded in menu</col>
- </row>
- <row>
- <col id="0" translatable="yes">When active</col>
-@@ -31,9 +31,6 @@
- <row>
- <col id="0" translatable="yes">Always</col>
- </row>
-- <row>
-- <col id="0" translatable="yes">Embedded in menu</col>
-- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model_panel_position">
-diff --git a/src/ibusengine.c b/src/ibusengine.c
-index c367f14..494f7a3 100644
---- a/src/ibusengine.c
-+++ b/src/ibusengine.c
-@@ -456,6 +456,9 @@ ibus_engine_class_init (IBusEngineClass *klass)
- /**
- * IBusEngine::candidate-clicked:
- * @engine: An IBusEngine.
-+ * @index: Index of candidate be clicked.
-+ * @button: Mouse button.
-+ * @state: Keyboard state.
- *
- * Emitted when candidate on lookup table is clicked.
- * Implement the member function candidate_clicked() in extended class to receive this signal.
-@@ -478,6 +481,8 @@ ibus_engine_class_init (IBusEngineClass *klass)
- /**
- * IBusEngine::property-activate:
- * @engine: An IBusEngine.
-+ * @name: Property name.
-+ * @state: Property state.
- *
- * Emitted when a property is activated or change changed.
- * Implement the member function property_activate() in extended class to receive this signal.
-@@ -499,6 +504,7 @@ ibus_engine_class_init (IBusEngineClass *klass)
- /**
- * IBusEngine::property-show:
- * @engine: An IBusEngine.
-+ * @name: Property name.
- *
- * Emitted when a property is shown.
- * Implement the member function property_side() in extended class to receive this signal.
-@@ -519,6 +525,7 @@ ibus_engine_class_init (IBusEngineClass *klass)
- /**
- * IBusEngine::property-hide:
- * @engine: An IBusEngine.
-+ * @name: Property name.
- *
- * Emitted when a property is hidden.
- * Implement the member function property_hide() in extended class to receive this signal.
-diff --git a/src/ibusshare.c b/src/ibusshare.c
-index f66a2d3..194b510 100644
---- a/src/ibusshare.c
-+++ b/src/ibusshare.c
-@@ -281,7 +281,6 @@ ibus_free_strv (gchar **strv)
- g_free (strv);
- }
-
--
- void
- ibus_init (void)
- {
-diff --git a/src/ibusshare.h b/src/ibusshare.h
-index 26677a3..c33a372 100644
---- a/src/ibusshare.h
-+++ b/src/ibusshare.h
-@@ -258,8 +258,11 @@ guint ibus_keyval_from_name (const gchar *keyval_name);
- * @strv: List of strings.
- *
- * Free a list of strings.
-+ * Deprecated: This function has been deprecated and should
-+ * not be used in newly written code.
- */
--void ibus_free_strv (gchar **strv);
-+void ibus_free_strv (gchar **strv)
-+ G_GNUC_DEPRECATED;
-
- /**
- * ibus_key_event_to_string:
-diff --git a/src/ibustypes.h b/src/ibustypes.h
-index 100eafa..583b534 100644
---- a/src/ibustypes.h
-+++ b/src/ibustypes.h
-@@ -87,7 +87,7 @@ typedef enum
-
- IBUS_RELEASE_MASK = 1 << 30,
-
-- IBUS_MODIFIER_MASK = 0x5c001fff
-+ IBUS_MODIFIER_MASK = 0x5f001fff
- } IBusModifierType;
-
- /**
-diff --git a/ui/gtk/languagebar.py b/ui/gtk/languagebar.py
-index 0eea1fa..f22080f 100644
---- a/ui/gtk/languagebar.py
-+++ b/ui/gtk/languagebar.py
-@@ -66,7 +66,7 @@ class LanguageBar(gtk.Toolbar):
-
- def __init__ (self):
- super(LanguageBar, self).__init__()
-- self.__show = 1
-+ self.__show = 0
- self.__enabled = False
- self.__has_focus = False
- self.__show_im_name = False
-@@ -236,8 +236,8 @@ class LanguageBar(gtk.Toolbar):
- return self.__enabled
-
- def set_show(self, show):
-- if show not in (0, 1, 2, 3):
-- show = 1
-+ if show not in (0, 1, 2):
-+ show = 0
- self.__show = show
- if self.__has_focus:
- self.focus_in()
-@@ -263,8 +263,9 @@ class LanguageBar(gtk.Toolbar):
-
- def register_properties(self, props):
- self.__props = props
-- if self.__show == 3:
-+ if self.__show == 0:
- return
-+ # refresh items on labguage bar
- self.__remove_properties()
- # create new properties
- for i, prop in enumerate(props):
-@@ -295,7 +296,7 @@ class LanguageBar(gtk.Toolbar):
- self.insert(item, i + 2)
-
- def update_property(self, prop):
-- if self.__show == 3 and self.__props:
-+ if self.__show == 0 and self.__props:
- list = self.__props.get_properties()
- for i, p in enumerate(list):
- if p.key == prop.key and p.type == prop.type:
-@@ -324,24 +325,23 @@ class LanguageBar(gtk.Toolbar):
- def focus_in(self):
- self.__has_focus = True
- self.__im_menu.set_sensitive(True)
-- if self.__enabled:
-- if self.__show in (1, 2):
-- self.show_all()
-- else:
-- self.hide_all()
-+ if (self.__show == 1 and self.__enabled) or self.__show == 2:
-+ self.show_all()
-+ else:
-+ self.hide_all()
-
- def focus_out(self):
- self.__has_focus = False
- self.__im_menu.set_sensitive(False)
-- if self.__show in (0, 1, 3):
-- self.hide_all()
-- else:
-+ if self.__show == 2:
- self.show_all()
-+ else:
-+ self.hide_all()
-
- def create_im_menu(self, menu):
- if not self.__enabled:
- return
-- if self.__show != 3:
-+ if self.__show != 0:
- return
- if not menu:
- assert False
-diff --git a/ui/gtk/panel.py b/ui/gtk/panel.py
-index 87a45d6..0efc85b 100644
---- a/ui/gtk/panel.py
-+++ b/ui/gtk/panel.py
-@@ -263,7 +263,7 @@ class Panel(ibus.PanelBase):
- self.__candidate_panel.set_orientation(orientation)
-
- def __config_load_show(self):
-- show = self.__config.get_value("panel", "show", 1)
-+ show = self.__config.get_value("panel", "show", 0)
- self.__language_bar.set_show(show)
-
- def __config_load_position(self):
+
Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-13/ibus.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- ibus.spec 2 May 2010 03:40:27 -0000 1.110
+++ ibus.spec 4 May 2010 05:41:13 -0000 1.111
@@ -7,15 +7,15 @@
%define im_chooser_version 1.2.5
Name: ibus
-Version: 1.3.2
-Release: 3%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
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)
@@ -105,7 +105,7 @@ The ibus-devel-docs package contains dev
%prep
%setup -q
-%patch0 -p1
+# %patch0 -p1
%build
%configure --disable-static \
@@ -218,6 +218,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue May 04 2010 Peng Huang <shawn.p.huang at gmail.com> - 1.3.3-1
+- Update to 1.3.3
+
* Sun May 02 2010 Peng Huang <shawn.p.huang at gmail.com> - 1.3.2-3
- Embedded language bar in menu by default.
- Fix bug 587353 - [abrt] crash in ibus-1.3.2-2.fc12
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-13/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources 21 Apr 2010 09:27:58 -0000 1.60
+++ sources 4 May 2010 05:41:13 -0000 1.61
@@ -1 +1 @@
-0141f290a28a0d5e943cdedee5d28b67 ibus-1.3.2.tar.gz
+2be859019b593685b1cec8310627426f ibus-1.3.3.tar.gz
More information about the scm-commits
mailing list