rpms/ibus-pinyin/F-11 ibus-pinyin-HEAD.patch, NONE, 1.1 ibus-pinyin.spec, 1.13, 1.14

Huang Peng phuang at fedoraproject.org
Mon May 25 06:17:10 UTC 2009


Author: phuang

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

Modified Files:
	ibus-pinyin.spec 
Added Files:
	ibus-pinyin-HEAD.patch 
Log Message:
Update to head version in upstream

ibus-pinyin-HEAD.patch:

--- NEW FILE ibus-pinyin-HEAD.patch ---
diff --git a/engine/pinyin.py b/engine/pinyin.py
index c4ac9ee..a3e6c92 100644
--- a/engine/pinyin.py
+++ b/engine/pinyin.py
@@ -25,6 +25,7 @@ __all__ = (
 import ibus
 import gobject
 import os
+import signal
 import os.path as path
 from ibus import keysyms
 from ibus import modifier
@@ -918,6 +919,7 @@ class PinYinEngine(ibus.EngineBase):
         if PinYinEngine.__setup_pid != 0:
             pid, state = os.waitpid(PinYinEngine.__setup_pid, os.P_NOWAIT)
             if pid != PinYinEngine.__setup_pid:
+                os.kill(PinYinEngine.__setup_pid, signal.SIGUSR1)
                 return
             PinYinEngine.__setup_pid = 0
         setup_cmd = path.join(LIBEXECDIR, "ibus-setup-pinyin")
diff --git a/setup/main.py b/setup/main.py
index 892b61e..74b4b4b 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -20,6 +20,7 @@
 
 import sys
 from os import path
+import signal
 import gobject
 import gtk
 import gtk.gdk as gdk
@@ -79,11 +80,15 @@ class SetupUI ():
         }
 
     def run(self):
-
         self.__init_ui()
         self.__load_config()
+        signal.signal(signal.SIGUSR1, self.__sigusr1_cb)
         gtk.main()
 
+    def __sigusr1_cb(self, *arg):
+        window = self.__xml.get_widget("window_main")
+        window.present()
+
     def __entry_op(self, name, opt, info):
         widget = self.__xml.get_widget(name)
         if widget == None:
@@ -263,5 +268,6 @@ class SetupUI ():
 
 
 if __name__ == "__main__":
-    SetupUI().run()
+    ui = SetupUI()
+    ui.run()
 
diff --git a/setup/setup.glade b/setup/setup.glade
index 8739f59..a3410da 100644
--- a/setup/setup.glade
+++ b/setup/setup.glade
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="window_main">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="title" translatable="yes">Python PinYin Setup</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <signal name="delete_event" handler="on_window_main_delete_event"/>
+    <signal name="delete-event" handler="on_window_main_delete_event"/>
     <child>
       <widget class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkNotebook" id="notebook1">
+          <widget class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="scrollable">True</property>
@@ -27,6 +26,7 @@
                   <widget class="GtkEntry" id="HalfPunctuations">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="invisible_char">&#x25CF;</property>
                     <signal name="changed" handler="on_value_changed"/>
                   </widget>
                   <packing>
@@ -62,7 +62,7 @@
                   <widget class="GtkCheckButton" id="UVToTemp">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                     <signal name="toggled" handler="on_value_changed"/>
                     <child>
@@ -80,7 +80,7 @@
                   <widget class="GtkCheckButton" id="SpellCheck">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                     <signal name="toggled" handler="on_value_changed"/>
                     <child>
@@ -98,7 +98,7 @@
                   <widget class="GtkCheckButton" id="AutoCorrect">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                     <signal name="toggled" handler="on_value_changed"/>
                     <child>
@@ -206,7 +206,7 @@
                   <widget class="GtkCheckButton" id="ShuangPin">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                     <signal name="toggled" handler="on_value_changed"/>
                     <child>
@@ -224,7 +224,7 @@
                   <widget class="GtkCheckButton" id="SupportGBK">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                     <signal name="toggled" handler="on_value_changed"/>
                     <child>
@@ -251,7 +251,7 @@
                   <widget class="GtkCheckButton" id="ShiftSelectCandidates">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                     <child>
                       <placeholder/>
@@ -279,7 +279,7 @@
                   <widget class="GtkCheckButton" id="EqualPageDownUp">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                     <child>
                       <placeholder/>
@@ -296,7 +296,7 @@
                   <widget class="GtkCheckButton" id="CommaPageDownUp">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                     <child>
                       <placeholder/>
@@ -313,7 +313,7 @@
                   <widget class="GtkCheckButton" id="AutoCommit">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                     <child>
                       <placeholder/>
@@ -356,147 +356,94 @@
                 <property name="label" translatable="yes">Gernal</property>
               </widget>
               <packing>
-                <property name="type">tab</property>
                 <property name="tab_fill">False</property>
+                <property name="type">tab</property>
               </packing>
             </child>
             <child>
               <widget class="GtkTable" id="table4">
-                <property name="visible">True</property>
+                <property name="no_show_all">True</property>
                 <property name="n_rows">12</property>
                 <property name="n_columns">2</property>
                 <property name="column_spacing">2</property>
                 <property name="row_spacing">2</property>
                 <property name="homogeneous">True</property>
                 <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
                   <widget class="GtkCheckButton" id="FuzzyPinYin">
+                    <property name="label" translatable="yes">Enable Fuzzy PinYin</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Enable Fuzzy PinYin</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>
                 <child>
                   <widget class="GtkCheckButton" id="FuzzyS_Sh">
-                    <property name="can_focus">True</property>
-                    <property name="no_show_all">True</property>
                     <property name="label" translatable="yes">s &lt;=&gt; sh</property>
+                    <property name="can_focus">True</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>
                   <packing>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
+                    <property name="x_options"></property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="FuzzyC_Ch">
-                    <property name="can_focus">True</property>
-                    <property name="no_show_all">True</property>
                     <property name="label" translatable="yes">c &lt;=&gt; ch</property>
+                    <property name="can_focus">True</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>
                   <packing>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
+                    <property name="x_options"></property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="FuzzyZ_Zh">
-                    <property name="can_focus">True</property>
-                    <property name="no_show_all">True</property>
                     <property name="label" translatable="yes">z &lt;=&gt; zh</property>
+                    <property name="can_focus">True</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>
                   <packing>
                     <property name="top_attach">3</property>
                     <property name="bottom_attach">4</property>
-                    <property name="x_options">GTK_FILL</property>
+                    <property name="x_options"></property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="FuzzyL_N">
-                    <property name="can_focus">True</property>
-                    <property name="no_show_all">True</property>
                     <property name="label" translatable="yes">l &lt;=&gt; n</property>
+                    <property name="can_focus">True</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>
                   <packing>
                     <property name="top_attach">4</property>
                     <property name="bottom_attach">5</property>
-                    <property name="x_options">GTK_FILL</property>
+                    <property name="x_options"></property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="FuzzyIn_Ing">
-                    <property name="can_focus">True</property>
-                    <property name="no_show_all">True</property>
                     <property name="label" translatable="yes">in &lt;=&gt; ing</property>
+                    <property name="can_focus">True</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>
                   <packing>
@@ -504,17 +451,16 @@
                     <property name="right_attach">2</property>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
+                    <property name="x_options"></property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="FuzzyEn_Eng">
-                    <property name="can_focus">True</property>
-                    <property name="no_show_all">True</property>
                     <property name="label" translatable="yes">en &lt;=&gt; eng</property>
+                    <property name="can_focus">True</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>
                   <packing>
@@ -522,17 +468,16 @@
                     <property name="right_attach">2</property>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
+                    <property name="x_options"></property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="FuzzyAn_Ang">
-                    <property name="can_focus">True</property>
-                    <property name="no_show_all">True</property>
                     <property name="label" translatable="yes">an &lt;=&gt; ang</property>
+                    <property name="can_focus">True</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>
                   <packing>
@@ -540,34 +485,10 @@
                     <property name="right_attach">2</property>
                     <property name="top_attach">3</property>
                     <property name="bottom_attach">4</property>
-                    <property name="x_options">GTK_FILL</property>
+                    <property name="x_options"></property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="Fuzzytab">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Fuzzy PinYin</property>
-              </widget>
-              <packing>
-                <property name="type">tab</property>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkTable" id="table2">
-                <property name="visible">True</property>
-                <property name="n_rows">11</property>
-                <property name="n_columns">2</property>
-                <property name="column_spacing">2</property>
-                <property name="row_spacing">2</property>
-                <property name="homogeneous">True</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -599,6 +520,47 @@
                   <placeholder/>
                 </child>
                 <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="Fuzzytab">
+                <property name="label" translatable="yes">Fuzzy PinYin</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+                <property name="type">tab</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkTable" id="table2">
+                <property name="visible">True</property>
+                <property name="n_rows">11</property>
+                <property name="n_columns">2</property>
+                <property name="column_spacing">2</property>
+                <property name="row_spacing">2</property>
+                <property name="homogeneous">True</property>
+                <child>
                   <widget class="GtkLabel" id="label9">
                     <property name="visible">True</property>
                     <property name="xalign">0.89999997615814209</property>
@@ -664,7 +626,7 @@
                   <widget class="GtkColorButton" id="ErrorEnglishPhraseColor">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <signal name="color_set" handler="on_value_changed"/>
                   </widget>
                   <packing>
@@ -678,7 +640,7 @@
                   <widget class="GtkColorButton" id="EnglishPhraseColor">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <signal name="color_set" handler="on_value_changed"/>
                   </widget>
                   <packing>
@@ -692,7 +654,7 @@
                   <widget class="GtkColorButton" id="SpecialPhraseColor">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <signal name="color_set" handler="on_value_changed"/>
                   </widget>
                   <packing>
@@ -706,7 +668,7 @@
                   <widget class="GtkColorButton" id="UserPhraseColor">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <signal name="color_set" handler="on_value_changed"/>
                   </widget>
                   <packing>
@@ -720,7 +682,7 @@
                   <widget class="GtkColorButton" id="NewPhraseColor">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <signal name="color_set" handler="on_value_changed"/>
                   </widget>
                   <packing>
@@ -734,7 +696,7 @@
                   <widget class="GtkColorButton" id="PhraseColor">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <signal name="color_set" handler="on_value_changed"/>
                   </widget>
                   <packing>
@@ -742,6 +704,36 @@
                     <property name="right_attach">2</property>
                   </packing>
                 </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
               </widget>
               <packing>
                 <property name="position">2</property>
@@ -753,19 +745,57 @@
                 <property name="label" translatable="yes">Colors</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>
             <child>
               <widget class="GtkTable" id="table3">
-                <property name="visible">True</property>
+                <property name="no_show_all">True</property>
                 <property name="n_rows">6</property>
                 <property name="n_columns">3</property>
                 <property name="homogeneous">True</property>
                 <child>
-                  <placeholder/>
+                  <widget class="GtkButton" id="button_optimize_db">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <signal name="clicked" handler="on_button_optimize_db_clicked"/>
+                    <child>
+                      <widget class="GtkHBox" id="hbox1">
+                        <property name="visible">True</property>
+                        <child>
+                          <widget class="GtkImage" id="image1">
+                            <property name="visible">True</property>
+                            <property name="xalign">0.80000001192092896</property>
+                            <property name="stock">gtk-execute</property>
+                            <property name="icon-size">4</property>
+                          </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label19">
+                            <property name="visible">True</property>
+                            <property name="xalign">0.10000000149011612</property>
+                            <property name="label" translatable="yes">Optimize User DB</property>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
                 </child>
                 <child>
                   <placeholder/>
@@ -816,41 +846,7 @@
                   <placeholder/>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="button_optimize_db">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_button_optimize_db_clicked"/>
-                    <child>
-                      <widget class="GtkHBox" id="hbox1">
-                        <property name="visible">True</property>
-                        <child>
-                          <widget class="GtkImage" id="image1">
-                            <property name="visible">True</property>
-                            <property name="xalign">0.80000001192092896</property>
-                            <property name="stock">gtk-execute</property>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label19">
-                            <property name="visible">True</property>
-                            <property name="xalign">0.10000000149011612</property>
-                            <property name="label" translatable="yes">Optimize User DB</property>
-                          </widget>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
+                  <placeholder/>
                 </child>
               </widget>
               <packing>
@@ -859,25 +855,23 @@
             </child>
             <child>
               <widget class="GtkLabel" id="label3">
-                <property name="visible">True</property>
                 <property name="label" translatable="yes">User DB</property>
               </widget>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">3</property>
                 <property name="tab_fill">False</property>
+                <property name="type">tab</property>
               </packing>
             </child>
             <child>
               <widget class="GtkLabel" id="label15">
-                <property name="visible">True</property>
+                <property name="no_show_all">True</property>
                 <property name="label" translatable="yes">Python PinYin
 
 provided by
 
 Huang Peng &lt;shawn.p.huang at gmail.com&gt;
 </property>
-                <property name="justify">GTK_JUSTIFY_CENTER</property>
               </widget>
               <packing>
                 <property name="position">4</property>
@@ -885,57 +879,67 @@ Huang Peng &lt;shawn.p.huang at gmail.com&gt;
             </child>
             <child>
               <widget class="GtkLabel" id="label18">
-                <property name="visible">True</property>
                 <property name="label" translatable="yes">About</property>
               </widget>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">4</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>
             <child>
               <widget class="GtkButton" id="button_apply">
+                <property name="label">gtk-apply</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
-                <property name="label">gtk-apply</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_button_apply_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button_cancel">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_button_cancel_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button_ok">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_button_ok_clicked"/>
                 <signal name="activate" handler="on_button_ok_activate"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>


Index: ibus-pinyin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-11/ibus-pinyin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ibus-pinyin.spec	3 Mar 2009 05:55:18 -0000	1.13
+++ ibus-pinyin.spec	25 May 2009 06:16:39 -0000	1.14
@@ -1,12 +1,13 @@
 Name:       ibus-pinyin
 Version:    1.1.0.20090303
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    The PinYin engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    http://scim-python.googlecode.com/files/pinyin-database-0.1.10.6.tar.bz2
+Patch0:     ibus-pinyin-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -21,6 +22,7 @@ PinYin engine for IBus platform. It prov
 %prep
 %setup -q
 cp %{SOURCE1} engine
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -49,6 +51,12 @@ python -c "import pysqlitedb; db = pysql
 %{_libexecdir}/ibus-setup-pinyin
 
 %changelog
+* Mon May 25 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090303-2
+- Update to HEAD version in upstream git repository
+- Fix bug 500762 - The iBus input speed becomes much slower after "Fuzzy PinYin" enabled
+- Fix bug 501218 - make the pinyin setup window come to the front
+- Fix bug 500763 - User DB is unavailable in ibus for liveCD
+
 * Tue Mar 3 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090303-1
 - Update to 1.1.0.20090303.
 




More information about the scm-commits mailing list