rpms/ibus/F-11 .cvsignore, 1.32, 1.33 ibus-HEAD.patch, 1.18, 1.19 ibus.spec, 1.77, 1.78 sources, 1.36, 1.37

Sun May 31 05:07:27 UTC 2009

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6059

Modified Files:
	.cvsignore ibus-HEAD.patch ibus.spec sources 
Log Message:
Update to 1.1.0.20090531


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33

--- .cvsignore	8 May 2009 07:01:09 -0000	1.32
+++ .cvsignore	31 May 2009 05:06:56 -0000	1.33
@@ -1 +1 @@
-ibus-1.1.0.20090508.tar.gz
+ibus-1.1.0.20090531.tar.gz

ibus-HEAD.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -p -N -r 1.18 -r 1.19 ibus-HEAD.patch
Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus-HEAD.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ibus-HEAD.patch	27 May 2009 01:46:36 -0000	1.18
+++ ibus-HEAD.patch	31 May 2009 05:06:56 -0000	1.19
@@ -1,5189 +1 @@
-diff --git a/bus/inputcontext.c b/bus/inputcontext.c
-index 8c9805d..b26797f 100644
---- a/bus/inputcontext.c
-+++ b/bus/inputcontext.c
-@@ -97,8 +97,6 @@ struct _BusInputContextPrivate {
-     IBusLookupTable *lookup_table;
-     gboolean lookup_table_visible;
- 
--    /* properties */
--    IBusPropList *props;
- };
- 
- typedef struct _BusInputContextPrivate BusInputContextPrivate;
-@@ -557,7 +555,6 @@ bus_input_context_init (BusInputContext *context)
-     priv->lookup_table_visible = FALSE;
- 
-     g_object_ref (props_empty);
--    priv->props = props_empty;
- }
- 
- static void
-@@ -590,11 +587,6 @@ bus_input_context_destroy (BusInputContext *context)
-         priv->lookup_table = NULL;
-     }
- 
--    if (priv->props) {
--        g_object_unref (priv->props);
--        priv->props = NULL;
--    }
--
-     if (priv->connection) {
-         g_signal_handlers_disconnect_by_func (priv->connection,
-                                          (GCallback) _connection_destroy_cb,
-@@ -1156,12 +1148,6 @@ bus_input_context_focus_in (BusInputContext *context)
-     if (priv->capabilities & IBUS_CAP_FOCUS) {
-         g_signal_emit (context, context_signals[FOCUS_IN], 0);
- 
--        if ((priv->capabilities & IBUS_CAP_PROPERTY) == 0) {
--            g_signal_emit (context,
--                           context_signals[REGISTER_PROPERTIES],
--                           0,
--                           priv->props);
--        }
-         if (priv->preedit_visible && (priv->capabilities & IBUS_CAP_PREEDIT_TEXT) == 0) {
-             g_signal_emit (context,
-                            context_signals[UPDATE_PREEDIT_TEXT],
-@@ -1650,23 +1636,17 @@ bus_input_context_register_properties (BusInputContext *context,
-     BusInputContextPrivate *priv;
-     priv = BUS_INPUT_CONTEXT_GET_PRIVATE (context);
- 
--    if (priv->props) {
--        g_object_unref (priv->props);
--    }
--
--    priv->props = (IBusPropList *) g_object_ref (props ? props : props_empty);
--
-     if (priv->capabilities & IBUS_CAP_PROPERTY) {
-         bus_input_context_send_signal (context,
-                                        "RegisterProperties",
--                                       IBUS_TYPE_PROP_LIST, &(priv->props),
-+                                       IBUS_TYPE_PROP_LIST, &props,
-                                        G_TYPE_INVALID);
-     }
-     else {
-         g_signal_emit (context,
-                        context_signals[REGISTER_PROPERTIES],
-                        0,
--                       priv->props);
-+                       props);
-     }
- }
- 
-@@ -1680,14 +1660,6 @@ bus_input_context_update_property (BusInputContext *context,
-     BusInputContextPrivate *priv;
-     priv = BUS_INPUT_CONTEXT_GET_PRIVATE (context);
- 
--    if (priv->props == props_empty) {
--        return;
--    }
--
--    if (!ibus_prop_list_update_property (priv->props, prop)) {
--        return;
--    }
--
-     if (priv->capabilities & IBUS_CAP_PROPERTY) {
-         bus_input_context_send_signal (context,
-                                        "UpdateProperty",
-diff --git a/po/ar.po b/po/ar.po
-index 15c31e8..f59ac97 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: 2009-04-06 11:45+0800\n"
-+"POT-Creation-Date: 2009-05-26 07:38+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"
-@@ -50,23 +50,23 @@ msgstr "Muayyad Alsadi <alsadi at ojuba.org>"
- msgid "Switch input method"
- msgstr "ØªØ¨Ø¯ÙŠÙ„ Ø·Ø±ÙŠÙ‚Ø© Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„"
- 
--#: ../setup/main.py:103
-+#: ../setup/main.py:104
- msgid "trigger"
- msgstr "Ø²Ù†Ø§Ø¯"
- 
--#: ../setup/main.py:113
-+#: ../setup/main.py:114
- msgid "next input method"
- msgstr "Ø·Ø±ÙŠÙ‚Ø© Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„ Ø§Ù„ØªØ§Ù„ÙŠØ©"
- 
--#: ../setup/main.py:123
-+#: ../setup/main.py:124
- msgid "previous input method"
- msgstr "Ø·Ø±ÙŠÙ‚Ø© Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„ Ø§Ù„Ø³Ø§Ø¨Ù‚Ø©"
- 
--#: ../setup/main.py:204
-+#: ../setup/main.py:205
- msgid "IBus daemon is not started. Do you want to start it now?"
- msgstr "Ø®Ø§Ø¯Ù… IBUS Ù„Ù… ÙŠØ¨Ø¯Ø£ Ù…Ù† Ù‚Ø¨Ù„. Ù‡Ù„ ØªØ±ÙŠØ¯ ØªØ´ØºÙŠÙ„Ù‡ Ø§Ù„Ø¢Ù†ØŸ"
- 
--#: ../setup/main.py:219
-+#: ../setup/main.py:220
- msgid ""
- "IBus has been started! If you can not use IBus, please add below lines in "
- "$HOME/.bashrc, and relogin your desktop.\n"
-@@ -75,24 +75,24 @@ msgid ""
- "  export QT_IM_MODULE=ibus"
- msgstr ""
- 
--#: ../setup/main.py:234
-+#: ../setup/main.py:235
- #, python-format
- msgid "Select keyboard shortcut for %s"
- msgstr "Ø§Ø®ØªØ± Ø§Ù„Ø§Ø®ØªØµØ§Ø± Ù„ %s"
- 
--#: ../setup/keyboardshortcut.py:53
-+#: ../setup/keyboardshortcut.py:54
- msgid "Keyboard shortcuts"
- msgstr "Ø§Ø®ØªØµØ§Ø±Ø§Øª Ù„ÙˆØØ© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
- 
--#: ../setup/keyboardshortcut.py:61
-+#: ../setup/keyboardshortcut.py:65
- msgid "Key code:"
- msgstr "ÙƒÙˆØ¯ Ø§Ù„Ù…ÙØªØ§Ø"
- 
--#: ../setup/keyboardshortcut.py:76
-+#: ../setup/keyboardshortcut.py:80
- msgid "Modifiers:"
- msgstr ""
- 
--#: ../setup/keyboardshortcut.py:206
-+#: ../setup/keyboardshortcut.py:222
- msgid ""
- "Please press a key (or a key combination).\n"
- "The dialog will be closed when the key is released."
-@@ -100,7 +100,7 @@ msgstr ""
- "ÙØ¶Ù„Ø§ Ø§Ø¶ØºØ· Ù…ÙØªØ§Ø Ø£Ùˆ (Ø¹Ø¯Ø© Ù…ÙØ§ØªÙŠØ).\n"
- "ØµÙ†Ø¯ÙˆÙ‚ Ø§Ù„ØÙˆØ§Ø± Ø³ÙŠØºÙ„Ù‚ Ø¹Ù†Ø¯ ØªØ±Ùƒ Ø§Ù„Ù…ÙØªØ§Ø."
- 
--#: ../setup/keyboardshortcut.py:208
-+#: ../setup/keyboardshortcut.py:224
- msgid "Please press a key (or a key combination)"
- msgstr "ÙØ¶Ù„Ø§ Ø§Ø¶ØºØ· Ù…ÙØªØ§Ø Ø£Ùˆ Ø¹Ø¯Ø© Ù…ÙØ§ØªÙŠØ"
- 
-@@ -141,26 +141,32 @@ msgstr ""
- "\n"
- 
- #: ../setup/setup.glade.h:12
-+msgid ""
-+"<small><i>The default input method is the top one in the list.\n"
-+"You may use up/down buttons to change it.</i></small>"
-+msgstr ""
-+
-+#: ../setup/setup.glade.h:14
- msgid "About"
- msgstr "ØÙˆÙ„"
- 
--#: ../setup/setup.glade.h:13
-+#: ../setup/setup.glade.h:15
- msgid "Candidates orientation:"
- msgstr "Ø§Ù„Ø§ØªØ¬Ø§Ù‡Ø§Øª Ø§Ù„Ù…Ø±Ø´ØØ©:"
- 
--#: ../setup/setup.glade.h:14
-+#: ../setup/setup.glade.h:16
- msgid "Custom font:"
- msgstr "Ø®Ø· Ù…Ø®ØµØµ:"
- 
[...4799 lines suppressed...]
-+                                    <property name="fill">False</property>
-+                                    <property name="position">2</property>
-+                                  </packing>
-+                                </child>
-                                 <child>
--                                  <placeholder/>
-+                                  <widget class="GtkButton" id="button_engine_down">
-+                                    <property name="label">gtk-go-down</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">True</property>
-+                                    <property name="use_stock">True</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                    <property name="position">3</property>
-+                                  </packing>
-                                 </child>
-                               </widget>
--                              <packing>
--                                <property name="position">1</property>
--                              </packing>
-                             </child>
-                           </widget>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="position">1</property>
-+                          </packing>
-                         </child>
-                       </widget>
-+                      <packing>
-+                        <property name="position">0</property>
-+                      </packing>
-                     </child>
-                     <child>
--                      <widget class="GtkAlignment" id="alignment2">
-+                      <widget class="GtkAlignment" id="alignment8">
-                         <property name="visible">True</property>
--                        <property name="left_padding">12</property>
-+                        <property name="top_padding">6</property>
-                         <child>
--                          <widget class="GtkVButtonBox" id="vbuttonbox1">
-+                          <widget class="GtkHBox" id="hbox8">
-                             <property name="visible">True</property>
--                            <property name="spacing">5</property>
--                            <property name="layout_style">GTK_BUTTONBOX_START</property>
--                            <child>
--                              <widget class="GtkButton" id="button_engine_add">
--                                <property name="visible">True</property>
--                                <property name="can_focus">True</property>
--                                <property name="label">gtk-add</property>
--                                <property name="use_stock">True</property>
--                                <property name="response_id">0</property>
--                              </widget>
--                            </child>
--                            <child>
--                              <widget class="GtkButton" id="button_engine_remove">
--                                <property name="visible">True</property>
--                                <property name="can_focus">True</property>
--                                <property name="label">gtk-remove</property>
--                                <property name="use_stock">True</property>
--                                <property name="response_id">0</property>
--                              </widget>
--                              <packing>
--                                <property name="position">1</property>
--                              </packing>
--                            </child>
-+                            <property name="spacing">6</property>
-                             <child>
--                              <widget class="GtkButton" id="button_engine_up">
-+                              <widget class="GtkImage" id="image1">
-                                 <property name="visible">True</property>
--                                <property name="can_focus">True</property>
--                                <property name="label">gtk-go-up</property>
--                                <property name="use_stock">True</property>
--                                <property name="response_id">0</property>
-+                                <property name="stock">gtk-info</property>
-+                                <property name="icon-size">2</property>
-                               </widget>
-                               <packing>
--                                <property name="position">2</property>
-+                                <property name="expand">False</property>
-+                                <property name="position">0</property>
-                               </packing>
-                             </child>
-                             <child>
--                              <widget class="GtkButton" id="button_engine_down">
-+                              <widget class="GtkLabel" id="label11">
-                                 <property name="visible">True</property>
--                                <property name="can_focus">True</property>
--                                <property name="label">gtk-go-down</property>
--                                <property name="use_stock">True</property>
--                                <property name="response_id">0</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes"><small><i>The default input method is the top one in the list.
-+You may use up/down buttons to change it.</i></small></property>
-+                                <property name="use_markup">True</property>
-                               </widget>
-                               <packing>
--                                <property name="position">3</property>
-+                                <property name="position">1</property>
-                               </packing>
-                             </child>
-                           </widget>
-@@ -465,9 +547,9 @@ Always</property>
-                 <property name="label" translatable="yes">Input Methods</property>
-               </widget>
-               <packing>
--                <property name="type">tab</property>
-                 <property name="position">1</property>
-                 <property name="tab_fill">False</property>
-+                <property name="type">tab</property>
-               </packing>
-             </child>
-             <child>
-@@ -487,7 +569,7 @@ Homepage: http://code.google.com/p/ibus
- 
- </property>
-                     <property name="use_markup">True</property>
--                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-+                    <property name="justify">center</property>
-                   </widget>
-                   <packing>
-                     <property name="position">1</property>
-@@ -497,7 +579,7 @@ Homepage: http://code.google.com/p/ibus
-                   <widget class="GtkFrame" id="frame1">
-                     <property name="no_show_all">True</property>
-                     <property name="label_xalign">0</property>
--                    <property name="shadow_type">GTK_SHADOW_NONE</property>
-+                    <property name="shadow_type">none</property>
-                     <child>
-                       <widget class="GtkAlignment" id="alignment7">
-                         <property name="visible">True</property>
-@@ -505,11 +587,11 @@ Homepage: http://code.google.com/p/ibus
-                         <property name="left_padding">12</property>
-                         <child>
-                           <widget class="GtkCheckButton" id="checkbutton_auto_start">
-+                            <property name="label" translatable="yes">Start ibus on login</property>
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
--                            <property name="label" translatable="yes">Start ibus on login</property>
-+                            <property name="receives_default">False</property>
-                             <property name="use_underline">True</property>
--                            <property name="response_id">0</property>
-                             <property name="draw_indicator">True</property>
-                           </widget>
-                         </child>
-@@ -543,26 +625,34 @@ Homepage: http://code.google.com/p/ibus
-                 <property name="label" translatable="yes">About</property>
-               </widget>
-               <packing>
--                <property name="type">tab</property>
-                 <property name="position">2</property>
-                 <property name="tab_fill">False</property>
-+                <property name="type">tab</property>
-               </packing>
-             </child>
-           </widget>
-+          <packing>
-+            <property name="position">0</property>
-+          </packing>
-         </child>
-         <child>
-           <widget class="GtkHButtonBox" id="hbuttonbox1">
-             <property name="visible">True</property>
-             <property name="spacing">12</property>
--            <property name="layout_style">GTK_BUTTONBOX_END</property>
-+            <property name="layout_style">end</property>
-             <child>
-               <widget class="GtkButton" id="button_close">
-+                <property name="label">gtk-close</property>
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
--                <property name="label">gtk-close</property>
-+                <property name="receives_default">False</property>
-                 <property name="use_stock">True</property>
--                <property name="response_id">0</property>
-               </widget>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">False</property>
-+                <property name="position">0</property>
-+              </packing>
-             </child>
-           </widget>
-           <packing>
-diff --git a/ui/gtk/panel.py b/ui/gtk/panel.py
-index 2640c65..534a394 100644
---- a/ui/gtk/panel.py
-+++ b/ui/gtk/panel.py
-@@ -404,6 +404,7 @@ class Panel(ibus.PanelBase):
-         if self.__setup_pid != 0:
-             pid, state = os.waitpid(self.__setup_pid, os.P_NOWAIT)
-             if pid != self.__setup_pid:
-+                os.kill(self.__setup_pid, signal.SIGUSR1)
-                 return
-             self.__setup_pid = 0
-         self.__setup_pid = os.spawnl(os.P_NOWAIT, self.__setup_cmd, "ibus-setup")
+


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- ibus.spec	26 May 2009 12:02:28 -0000	1.77
+++ ibus.spec	31 May 2009 05:06:56 -0000	1.78
@@ -7,8 +7,8 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.1.0.20090508
-Release:    5%{?dist}
+Version:    1.1.0.20090531
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -114,7 +114,7 @@ The ibus-devel-docs package contains dev
 
 %prep
 %setup -q
-%patch0 -p1
+# %patch0 -p1
 # ./autogen.sh --help
 
 %build
@@ -228,6 +228,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sun May 31 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090531-1
+- Update to Update to 1.1.0.20090531
+
 * Tue May 26 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090508-5
 - Update ibus-HEAD.patch.
 - Show the default input method with bold text


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	8 May 2009 07:01:09 -0000	1.36
+++ sources	31 May 2009 05:06:56 -0000	1.37
@@ -1 +1 @@
-8758429ef1b28e3995aa01da9cdceda0  ibus-1.1.0.20090508.tar.gz
+4ef82a3dd89e24269bdff1f1e4f127c2  ibus-1.1.0.20090531.tar.gz


