rpms/ibus/F-10 ibus-HEAD.patch, 1.3, 1.4 ibus.spec, 1.40, 1.41 sources, 1.27, 1.28

Huang Peng phuang at fedoraproject.org
Sat Aug 29 03:36:22 UTC 2009 

Author: phuang

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

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

ibus-HEAD.patch:
 0 files changed

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-10/ibus-HEAD.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ibus-HEAD.patch	10 Aug 2009 07:54:47 -0000	1.3
+++ ibus-HEAD.patch	29 Aug 2009 03:36:22 -0000	1.4
@@ -1,446 +1 @@
-diff --git a/AUTHORS b/AUTHORS
-index 24ed851..23dca12 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -45,6 +45,8 @@ te.po
- krishna k <k.meetme at gmail.com>
- ta.po:
- Felix <ifelix at redhat.com>
-+vi.po:
-+Lê Quốc Tuấn <mr.lequoctuan at gmail.com>
- zh_CN.po:
- Huang Peng <shawn.p.huang at gmail.com>
- zh_HK.po:
-diff --git a/bus/inputcontext.c b/bus/inputcontext.c
-index 0881581..bec08c3 100644
---- a/bus/inputcontext.c
-+++ b/bus/inputcontext.c
-@@ -1151,28 +1151,29 @@ bus_input_context_focus_in (BusInputContext *context)
- 
-     if (priv->capabilities & IBUS_CAP_FOCUS) {
-         g_signal_emit (context, context_signals[FOCUS_IN], 0);
--
--        if (priv->preedit_visible && (priv->capabilities & IBUS_CAP_PREEDIT_TEXT) == 0) {
--            g_signal_emit (context,
--                           context_signals[UPDATE_PREEDIT_TEXT],
--                           0,
--                           priv->preedit_text,
--                           priv->preedit_cursor_pos,
--                           priv->preedit_visible);
--        }
--        if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_AUXILIARY_TEXT) == 0) {
--            g_signal_emit (context,
--                           context_signals[UPDATE_AUXILIARY_TEXT],
--                           0,
--                           priv->auxiliary_text,
--                           priv->auxiliary_visible);
--        }
--        if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_LOOKUP_TABLE) == 0) {
--            g_signal_emit (context,
--                           context_signals[UPDATE_LOOKUP_TABLE],
--                           0,
--                           priv->lookup_table,
--                           priv->lookup_table_visible);
-+        if (priv->engine && priv->enabled) {
-+            if (priv->preedit_visible && (priv->capabilities & IBUS_CAP_PREEDIT_TEXT) == 0) {
-+                g_signal_emit (context,
-+                               context_signals[UPDATE_PREEDIT_TEXT],
-+                               0,
-+                               priv->preedit_text,
-+                               priv->preedit_cursor_pos,
-+                               priv->preedit_visible);
-+            }
-+            if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_AUXILIARY_TEXT) == 0) {
-+                g_signal_emit (context,
-+                               context_signals[UPDATE_AUXILIARY_TEXT],
-+                               0,
-+                               priv->auxiliary_text,
-+                               priv->auxiliary_visible);
-+            }
-+            if (priv->lookup_table_visible && (priv->capabilities & IBUS_CAP_LOOKUP_TABLE) == 0) {
-+                g_signal_emit (context,
-+                               context_signals[UPDATE_LOOKUP_TABLE],
-+                               0,
-+                               priv->lookup_table,
-+                               priv->lookup_table_visible);
-+            }
-         }
-     }
- }
-diff --git a/po/LINGUAS b/po/LINGUAS
-index 9c1cecd..5385cb8 100644
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -20,6 +20,7 @@ sr
- sr at latin
- ta
- te
-+vi
- zh_CN
- zh_HK
- zh_TW
-diff --git a/po/da.po b/po/da.po
-index 94ac003..8b52b8b 100644
---- a/po/da.po
-+++ b/po/da.po
-@@ -8,7 +8,7 @@ msgstr ""
- "Project-Id-Version: ibus\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-05-26 07:38+0800\n"
--"PO-Revision-Date: 2009-04-06 21:47+0200\n"
-+"PO-Revision-Date: 2009-06-11 17:58+0200\n"
- "Last-Translator: Kris Thomsen <lakristho at gmail.com>\n"
- "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
- "MIME-Version: 1.0\n"
-@@ -153,6 +153,8 @@ 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 ""
-+"<small><i>Standard inputmetoden er den øverste i listen.\n"
-+"Du kan bruge op/ned-knapperne for at ændre det.</i></small>"
- 
- #: ../setup/setup.glade.h:14
- msgid "About"
-diff --git a/po/vi.po b/po/vi.po
-new file mode 100644
-index 0000000..8ecef98
---- /dev/null
-+++ b/po/vi.po
-@@ -0,0 +1,288 @@
-+# Vietnamese translations for data package.
-+# Copyright (C) 2009 THE data'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the data package.
-+# Le Quoc Tuan <mr.lequoctuan at gmail.com>, 2009.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: data 1\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
-+"PO-Revision-Date: 2009-06-12 12:41+0700\n"
-+"Last-Translator: Le Quoc Tuan <mr.lequoctuan at gmail.com>\n"
-+"Language-Team: Vietnamese\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-+
-+#: ../bus/ibus.desktop.in.h:1
-+msgid "IBus"
-+msgstr "IBus"
-+
-+#: ../bus/ibus.desktop.in.h:2
-+#: ../ui/gtk/panel.py:97
-+msgid "IBus input method framework"
-+msgstr "Bộ gõ IBus"
-+
-+#: ../ibus/lang.py:40
-+#: ../ui/gtk/panel.py:307
-+#: ../ui/gtk/panel.py:308
-+#: ../ui/gtk/panel.py:309
-+#: ../ui/gtk/panel.py:310
-+msgid "Other"
-+msgstr "Khác"
-+
-+#: ../ui/gtk/panel.py:282
-+msgid "Restart"
-+msgstr "Khởi động lại"
-+
-+#: ../ui/gtk/panel.py:337
-+msgid "No input method"
-+msgstr "Không có bộ gõ"
-+
-+#: ../ui/gtk/panel.py:383
-+msgid "IBus is an intelligent input bus for Linux/Unix."
-+msgstr "IBus là một bộ gõ thông minh cho Linux/Unix."
-+
-+#: ../ui/gtk/panel.py:387
-+msgid "translator-credits"
-+msgstr "Lê Quốc Tuấn <mr.lequoctuan at gmail.com>"
-+
-+#. create input methods menu
-+#: ../ui/gtk/languagebar.py:84
-+msgid "Switch input method"
-+msgstr "Chuyển bộ gõ"
-+
-+#: ../setup/main.py:104
-+msgid "trigger"
-+msgstr "Bật/tắt"
-+
-+#: ../setup/main.py:114
-+msgid "next input method"
-+msgstr "Bộ gõ kế tiếp"
-+
-+#: ../setup/main.py:124
-+msgid "previous input method"
-+msgstr "Bộ gõ trước"
-+
-+#: ../setup/main.py:205
-+msgid "IBus daemon is not started. Do you want to start it now?"
-+msgstr "IBus daemon chưa được khởi động. Bạn có muốn khởi động nó ngay bây giờ?"
-+
-+#: ../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"
-+"  export GTK_IM_MODULE=ibus\n"
-+"  export XMODIFIERS=@im=ibus\n"
-+"  export QT_IM_MODULE=ibus"
-+msgstr ""
-+"IBus vừa được khởi động! Nếu bạn không thể dùng IBus, vui lòng thêm những dòng bên dưới vào $HOME/.bashrc, và đăng nhập lại.\n"
-+"  export GTK_IM_MODULE=ibus\n"
-+"  export XMODIFIERS=@im=ibus\n"
-+"  export QT_IM_MODULE=ibus"
-+
-+#: ../setup/main.py:235
-+#, python-format
-+msgid "Select keyboard shortcut for %s"
-+msgstr "Chọn phím tắt cho %s"
-+
-+#: ../setup/keyboardshortcut.py:54
-+msgid "Keyboard shortcuts"
-+msgstr "Những phím tắt"
-+
-+#: ../setup/keyboardshortcut.py:65
-+msgid "Key code:"
-+msgstr "Mã phím:"
-+
-+#: ../setup/keyboardshortcut.py:80
-+msgid "Modifiers:"
-+msgstr "Phím bổ sung:"
-+
-+#: ../setup/keyboardshortcut.py:222
-+msgid ""
-+"Please press a key (or a key combination).\n"
-+"The dialog will be closed when the key is released."
-+msgstr ""
-+"Vui lòng nhấn một phím (hoặc tổ hợp phím).\n"
-+"Hộp thoại này sẽ được đống lại khi bạn thả phím ấn."
-+
-+#: ../setup/keyboardshortcut.py:224
-+msgid "Please press a key (or a key combination)"
-+msgstr "Vui lòng nhấn một phím (hoặc tổ hợp phím)"
-+
-+#: ../setup/enginecombobox.py:99
-+msgid "Select an input method"
-+msgstr "Chọn một bộ gõ"
-+
-+#: ../setup/setup.glade.h:1
-+msgid "..."
-+msgstr "..."
-+
-+#: ../setup/setup.glade.h:2
-+msgid "<b>Font and Style</b>"
-+msgstr "<b>Phông và kiểu</b>"
-+
-+#: ../setup/setup.glade.h:3
-+msgid "<b>Keyboard Shortcuts</b>"
-+msgstr "<b>Phím tắt</b>"
-+
-+#: ../setup/setup.glade.h:4
-+msgid "<b>Startup</b>"
-+msgstr "<b>Khởi động</b>"
-+
-+#: ../setup/setup.glade.h:5
-+msgid ""
-+"<big><b>IBus</b></big>\n"
-+"<small>The intelligent input bus</small>\n"
-+"Homepage: http://code.google.com/p/ibus\n"
-+"\n"
-+"\n"
-+"\n"
-+msgstr ""
-+"<big><b>IBus</b></big>\n"
-+"<small>Bộ gõ thông minh</small>\n"
-+"Trang chủ: http://code.google.com/p/ibus\n"
-+"\n"
-+"\n"
-+"\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 ""
-+"<small><i>Bộ gõ mặc định là bộ gõ đầu tiên trong danh sách.\n"
-+"Bạn có thể dùng phím lên/xuống để thay đổi nó</i></small>"
-+
-+#: ../setup/setup.glade.h:14
-+msgid "About"
-+msgstr "Giới thiệu"
-+
-+#: ../setup/setup.glade.h:15
-+msgid "Candidates orientation:"
-+msgstr "Hướng danh sách từ ứng cử:"
-+
-+#: ../setup/setup.glade.h:16
-+msgid "Custom font:"
-+msgstr "Tùy biến phông:"
-+
-+#: ../setup/setup.glade.h:17
-+msgid "Enable or disable:"
-+msgstr "Bật hoặc tắt:"
-+
-+#: ../setup/setup.glade.h:18
-+msgid "General"
-+msgstr "Chung"
-+
-+#: ../setup/setup.glade.h:19
-+msgid ""
-+"Horizontal\n"
-+"Vertical"
-+msgstr ""
-+"Ngang\n"
-+"Dọc"
-+
-+#: ../setup/setup.glade.h:21
-+#: ../setup/ibus-setup.desktop.in.h:1
-+msgid "IBus Preferences"
-+msgstr "Tùy thích IBus"
-+
-+#: ../setup/setup.glade.h:22
-+msgid "Input Methods"
-+msgstr "Bộ gõ"
-+
-+#: ../setup/setup.glade.h:23
-+msgid ""
-+"Never\n"
-+"When active\n"
-+"Always"
-+msgstr ""
-+"Không bao giờ\n"
-+"Khi hoạt động\n"
-+"Luôn luôn"
-+
-+#: ../setup/setup.glade.h:26
-+msgid "Next input method:"
-+msgstr "Bộ gõ kế tiếp:"
-+
-+#: ../setup/setup.glade.h:27
-+msgid "Previous input method:"
-+msgstr "Bộ gõ trước:"
-+
-+#: ../setup/setup.glade.h:28
-+msgid "Show language panel:"
-+msgstr "Hiển thị thanh ngôn ngữ:"
-+
-+#: ../setup/setup.glade.h:29
-+msgid "Start ibus on login"
-+msgstr "Khởi động ibus khi đăng nhập"
-+
-+#: ../setup/setup.glade.h:30
-+msgid "Use custom font"
-+msgstr "Dùng phông chữ tùy biến"
-+
-+#: ../data/ibus.schemas.in.h:1
-+msgid "Auto Hide"
-+msgstr "Tự động ẩn"
-+
-+#: ../data/ibus.schemas.in.h:2
-+msgid "Custom Font"
-+msgstr "Tùy biến phông"
-+
-+#: ../data/ibus.schemas.in.h:3
-+msgid "Custom font name for language panel"
-+msgstr "Tùy biến phông cho thanh ngôn ngữ"
-+
-+#: ../data/ibus.schemas.in.h:4
-+msgid "Next Engine Hotkey"
-+msgstr "Phím nóng cho bộ gõ kế tiếp"
-+
-+#: ../data/ibus.schemas.in.h:5
-+msgid "Next engine hotkey for switch to next input method engine"
-+msgstr "Phím nóng dùng để chuyển đến bộ gõ kế tiếp"
-+
-+#: ../data/ibus.schemas.in.h:6
-+msgid "Orientation of Lookup Table"
-+msgstr "Hướng của bảng tra cứu"
-+
-+#: ../data/ibus.schemas.in.h:7
-+msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
-+msgstr "Hướng của bảng tra cứu. 0 = Ngang, 1 = Dọc"
-+
-+#: ../data/ibus.schemas.in.h:8
-+msgid "Preload Engines"
-+msgstr "Nạp trước bộ gõ"
-+
-+#: ../data/ibus.schemas.in.h:9
-+msgid "Preload Engines during ibus starts up"
-+msgstr "Nạp trước bộ gõ trong khi khởi động ibus"
-+
-+#: ../data/ibus.schemas.in.h:10
-+msgid "Prev Engine Hotkey"
-+msgstr "Phím nóng cho bộ gõ trước"
-+
-+#: ../data/ibus.schemas.in.h:11
-+msgid "Prev engine hotkey for switch to previous input method engine"
-+msgstr "Phím nóng dùng để chuyển về bộ gõ trước"
-+
-+#: ../data/ibus.schemas.in.h:12
-+msgid "The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always show"
-+msgstr "Cách hiển thị thanh ngôn ngữ. 0 = Luôn ẩn, 1 = Tự  động ẩn, 2 = Luôn hiện"
-+
-+#: ../data/ibus.schemas.in.h:13
-+msgid "Trigger Hotkey"
-+msgstr "Phím nóng bật/tắt"
-+
-+#: ../data/ibus.schemas.in.h:14
-+msgid "Trigger hotkey for enable or disable input context"
-+msgstr "Phím nóng bật/tắt dùng để bật hoặc tắt bộ gõ"
-+
-+#: ../data/ibus.schemas.in.h:15
-+msgid "Use Custom Font"
-+msgstr "Dùng phông tùy biến"
-+
-+#: ../data/ibus.schemas.in.h:16
-+msgid "Use custom font name for language panel"
-+msgstr "Dùng phông tùy biến cho thanh ngôn ngữ"
-+
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 45da441..aa96c46 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -132,7 +132,7 @@ libibus_la_LDFLAGS = \
- 	@GOBJECT2_LIBS@ \
- 	@GIO2_LIBS@ \
- 	@DBUS_LIBS@ \
--	-export-symbols-regex "ibus_.*"
-+	-export-symbols-regex "ibus_.*" \
- 	-version-info @LT_VERSION_INFO@ \
- 	$(NULL)
- 
-diff --git a/src/ibuslookuptable.c b/src/ibuslookuptable.c
-index d928898..cd5d73f 100644
---- a/src/ibuslookuptable.c
-+++ b/src/ibuslookuptable.c
-@@ -215,6 +215,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
-         g_return_val_if_fail (retval, FALSE);
- 
-         ibus_lookup_table_append_candidate (table, text);
-+        g_object_unref (text);
-     }
- 
-     ibus_message_iter_next (iter);
-@@ -229,6 +230,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
-         g_return_val_if_fail (retval, FALSE);
- 
-         ibus_lookup_table_append_label (table, text);
-+        g_object_unref (text);
-     }
- 
-     ibus_message_iter_next (iter);
-diff --git a/src/ibusproperty.c b/src/ibusproperty.c
-index ea5aca0..44a328e 100644
---- a/src/ibusproperty.c
-+++ b/src/ibusproperty.c
-@@ -118,6 +118,11 @@ ibus_property_destroy (IBusProperty *prop)
-         prop->tooltip = NULL;
-     }
- 
-+    if (prop->sub_props) {
-+        g_object_unref (prop->sub_props);
-+        prop->sub_props = NULL;
-+    }
-+
-     IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)prop);
- }
- 
+


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-10/ibus.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- ibus.spec	11 Aug 2009 03:14:52 -0000	1.40
+++ ibus.spec	29 Aug 2009 03:36:22 -0000	1.41
@@ -7,15 +7,15 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.1.0.20090612
-Release:    3%{?dist}
+Version:    1.1.0.20090829
+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)
 
@@ -114,10 +114,10 @@ The ibus-devel-docs package contains dev
 
 %prep
 %setup -q
-%patch0 -p1
+# %patch0 -p1
 # ./autogen.sh --help
-aclocal -I m4
-automake
+# aclocal -I m4
+# automake
 
 %build
 %configure --disable-static \
@@ -230,6 +230,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sat Aug 29 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090829-1
+- Update to 1.1.0.20090829
+- Fix some memory leaks
+
 * Mon Aug 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-3
 - Do not execute autogen.sh to avoid the snapshot date changing.
 
@@ -241,19 +245,19 @@ fi
 - Do not restore states when focus_in, if the engine is disabled.
 
 * Fri Jun 12 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-1
-- Update to Update to 1.1.0.20090612
+- 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 <shawn.p.huang at gmail.com> - 1.1.0.20090609-1
-- Update to Update to 1.1.0.20090609
+- 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 <shawn.p.huang at gmail.com> - 1.1.0.20090531-1
-- Update to Update to 1.1.0.20090531
+- 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-10/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	12 Jun 2009 06:10:26 -0000	1.27
+++ sources	29 Aug 2009 03:36:22 -0000	1.28
@@ -1 +1 @@
-108fe12f49f5b55453293104b4c8e19e  ibus-1.1.0.20090612.tar.gz
+f00b16c29491b0a86848c2f8d5314e7a  ibus-1.1.0.20090829.tar.gz

More information about the scm-commits mailing list