rpms/ibus/F-13 .cvsignore, 1.57, 1.58 ibus-HEAD.patch, 1.31, 1.32 ibus.spec, 1.119, 1.120 sources, 1.64, 1.65
Takao Fujiwara
fujiwara at fedoraproject.org
Tue Jul 6 09:35:13 UTC 2010
- Previous message: rpms/fldigi/devel .cvsignore, 1.15, 1.16 fldigi.spec, 1.22, 1.23 import.log, 1.11, 1.12 sources, 1.15, 1.16
- Next message: rpms/WebCalendar/F-13 WebCalendar-1.2.0-approve.patch, NONE, 1.1 WebCalendar-1.2.0-deftimezone.patch, NONE, 1.1 WebCalendar-1.2.0-eventstatus.patch, NONE, 1.1 WebCalendar-1.2.0-extcaptcha.patch, NONE, 1.1 WebCalendar-1.2.0-extmenu.patch, NONE, 1.1 WebCalendar-1.2.0-httpauthpub.patch, NONE, 1.1 WebCalendar-1.2.0-newmenuicons.patch, NONE, 1.1 WebCalendar-1.2.0-nolangwarn.patch, NONE, 1.1 WebCalendar-1.2.0-offsetdays.patch, NONE, 1.1 WebCalendar-1.2.0-reset_reminder.patch, NONE, 1.1 WebCalendar-1.2.0-shebang.patch, NONE, 1.1 WebCalendar-1.2.0-usercase.patch, NONE, 1.1 WebCalendar-1.2.0-weektimebar.patch, NONE, 1.1 WebCalendar-http.conf, NONE, 1.1 WebCalendar-taglang.php, NONE, 1.1 WebCalendar.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: fujiwara
Update of /cvs/pkgs/rpms/ibus/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30895
Modified Files:
.cvsignore ibus-HEAD.patch ibus.spec sources
Log Message:
Update to 1.3.6
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-13/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore 12 Jun 2010 01:43:59 -0000 1.57
+++ .cvsignore 6 Jul 2010 09:35:12 -0000 1.58
@@ -1 +1 @@
-ibus-1.3.5.tar.gz
+ibus-1.3.6.tar.gz
ibus-HEAD.patch:
languagebar.py | 3 +++
menu.py | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-13/ibus-HEAD.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ibus-HEAD.patch 1 Jul 2010 09:54:06 -0000 1.31
+++ ibus-HEAD.patch 6 Jul 2010 09:35:12 -0000 1.32
@@ -1,76 +1,52 @@
-commit 817399605bdeeb83fa4729018b2b17ad7870576d
-Author: Peng Huang <shawn.p.huang at gmail.com>
-Date: Thu Jun 24 11:11:51 2010 +0800
+commit 674bc53c30c8ac40e021da660f2af533ab015587
+Author: Daiki Ueno <ueno at unixuser.org>
+Date: Wed Jun 30 12:05:32 2010 +0900
- Fix next_engine & prev_engine settings problems.
+ Fix "Show language panel: Embedded in menu" behavior.
+
+ Signed-off-by: Daiki Ueno <ueno at unixuser.org>
-diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
-index ccb0cf0..c14831c 100644
---- a/bus/ibusimpl.c
-+++ b/bus/ibusimpl.c
-@@ -395,11 +395,15 @@ bus_ibus_impl_reload_config (BusIBusImpl *ibus)
- void ( *func) (BusIBusImpl *, GValue *);
- } entries [] = {
- { "general/hotkey", "trigger", bus_ibus_impl_set_trigger },
-+ #if 0
- /* Only for backward compatibility, shall be removed later. */
- { "general/hotkey", "next_engine", bus_ibus_impl_set_next_engine_in_menu },
-+ #endif
- { "general/hotkey", "next_engine_in_menu", bus_ibus_impl_set_next_engine_in_menu },
-+ #if 0
- /* Only for backward compatibility, shall be removed later. */
- { "general/hotkey", "prev_engine", bus_ibus_impl_set_previous_engine },
-+ #endif
- { "general/hotkey", "previous_engine", bus_ibus_impl_set_previous_engine },
- { "general", "preload_engines", bus_ibus_impl_set_preload_engines },
- { "general", "use_system_keyboard_layout", bus_ibus_impl_set_use_sys_layout },
-@@ -444,11 +448,15 @@ _config_value_changed_cb (IBusConfig *config,
- void ( *func) (BusIBusImpl *, GValue *);
- } entries [] = {
- { "general/hotkey", "trigger", bus_ibus_impl_set_trigger },
-+ #if 0
- /* Only for backward compatibility, shall be removed later. */
- { "general/hotkey", "next_engine", bus_ibus_impl_set_next_engine_in_menu },
-+ #endif
- { "general/hotkey", "next_engine_in_menu", bus_ibus_impl_set_next_engine_in_menu },
-+ #if 0
- /* Only for backward compatibility, shall be removed later. */
- { "general/hotkey", "prev_engine", bus_ibus_impl_set_previous_engine },
-+ #endif
- { "general/hotkey", "previous_engine", bus_ibus_impl_set_previous_engine },
- { "general", "preload_engines", bus_ibus_impl_set_preload_engines },
- { "general", "use_system_keyboard_layout", bus_ibus_impl_set_use_sys_layout },
-diff --git a/setup/main.py b/setup/main.py
-index 4d8a328..d778ac3 100644
---- a/setup/main.py
-+++ b/setup/main.py
-@@ -107,25 +107,25 @@ class Setup(object):
+diff --git a/ui/gtk/languagebar.py b/ui/gtk/languagebar.py
+index f22080f..2fc1cb7 100644
+--- a/ui/gtk/languagebar.py
++++ b/ui/gtk/languagebar.py
+@@ -29,6 +29,7 @@ from handle import Handle
+ from menu import menu_position,\
+ ImageMenuItem,\
+ Menu,\
++ CheckMenuItem,\
+ RadioMenuItem,\
+ SeparatorMenuItem
+ from engineabout import EngineAbout
+@@ -378,6 +379,8 @@ class LanguageBar(gtk.Toolbar):
+ item = ImageMenuItem(prop = prop)
+ self.__set_item_icon(item, prop)
+ elif prop.type == ibus.PROP_TYPE_TOGGLE:
++ item = CheckMenuItem(prop = prop)
++ elif prop.type == ibus.PROP_TYPE_RADIO:
+ item = RadioMenuItem(radio_group, prop = prop)
+ radio_group = item
+ elif prop.type == ibus.PROP_TYPE_SEPARATOR:
+diff --git a/ui/gtk/menu.py b/ui/gtk/menu.py
+index b9a6b44..53fa39f 100644
+--- a/ui/gtk/menu.py
++++ b/ui/gtk/menu.py
+@@ -59,7 +59,7 @@ class Menu(gtk.Menu, PropItem):
+ item = SeparatorMenuItem()
+ radio_group = None
+ elif prop.type == ibus.PROP_TYPE_MENU:
+- item = gtk.ImageMenuItem()
++ item = ImageMenuItem(prop)
+ if prop.icon:
+ size = gtk.icon_size_lookup(gtk.ICON_SIZE_MENU)
+ item.set_image(icon.IconWidget(prop.icon, size[0]))
+@@ -238,6 +238,9 @@ class SeparatorMenuItem(gtk.SeparatorMenuItem, PropItem):
+ (gobject.TYPE_STRING, gobject.TYPE_INT)),
+ }
- # next engine
- shortcuts = self.__config.get_value(
-- "general/hotkey", "next_engine",
-+ "general/hotkey", "next_engine_in_menu",
- ibus.CONFIG_GENERAL_SHORTCUT_NEXT_ENGINE_DEFAULT)
- button = self.__builder.get_object("button_next_engine")
- entry = self.__builder.get_object("entry_next_engine")
- entry.set_text("; ".join(shortcuts))
- entry.set_tooltip_text("\n".join(shortcuts))
- button.connect("clicked", self.__shortcut_button_clicked_cb,
-- N_("next input method"), "general/hotkey", "next_engine", entry)
-+ N_("next input method"), "general/hotkey", "next_engine_in_menu", entry)
++ def __init__(self):
++ gtk.SeparatorMenuItem.__init__(self)
++ PropItem.__init__(self, None)
- # prev engine
- shortcuts = self.__config.get_value(
-- "general/hotkey", "prev_engine",
-+ "general/hotkey", "previous_engine",
- ibus.CONFIG_GENERAL_SHORTCUT_PREV_ENGINE_DEFAULT)
- button = self.__builder.get_object("button_prev_engine")
- entry = self.__builder.get_object("entry_prev_engine")
- entry.set_text("; ".join(shortcuts))
- entry.set_tooltip_text("\n".join(shortcuts))
- button.connect("clicked", self.__shortcut_button_clicked_cb,
-- N_("previous input method"), "general/hotkey", "prev_engine", entry)
-+ N_("previous input method"), "general/hotkey", "previous_engine", entry)
- # lookup table orientation
- self.__combobox_lookup_table_orientation = self.__builder.get_object("combobox_lookup_table_orientation")
+ def menu_position(menu, button):
Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-13/ibus.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- ibus.spec 1 Jul 2010 09:58:22 -0000 1.119
+++ ibus.spec 6 Jul 2010 09:35:13 -0000 1.120
@@ -7,8 +7,8 @@
%define im_chooser_version 1.2.5
Name: ibus
-Version: 1.3.5
-Release: 4%{?dist}
+Version: 1.3.6
+Release: 1%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@@ -227,12 +227,8 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
-* Wed Jun 30 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.3.5-4
-- Add patch from HEAD.
-- Fix bug 606879 - Can not disable Alt-shift (next-Input-method) hotkey
-
-* Sat Jun 12 2010 Peng Huang <shawn.p.huang at gmail.com> - 1.3.5-2
-- Fix typo in requires.
+* Tue Jul 06 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.3.6-1
+- Update to 1.3.6
* Sat Jun 12 2010 Peng Huang <shawn.p.huang at gmail.com> - 1.3.5-1
- Update to 1.3.5
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-13/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources 12 Jun 2010 01:43:59 -0000 1.64
+++ sources 6 Jul 2010 09:35:13 -0000 1.65
@@ -1 +1 @@
-9f92b8e47d2c0bee67cf3e25f7b8c52d ibus-1.3.5.tar.gz
+8380b51bcf53220dff947a1deb33fd95 ibus-1.3.6.tar.gz
- Previous message: rpms/fldigi/devel .cvsignore, 1.15, 1.16 fldigi.spec, 1.22, 1.23 import.log, 1.11, 1.12 sources, 1.15, 1.16
- Next message: rpms/WebCalendar/F-13 WebCalendar-1.2.0-approve.patch, NONE, 1.1 WebCalendar-1.2.0-deftimezone.patch, NONE, 1.1 WebCalendar-1.2.0-eventstatus.patch, NONE, 1.1 WebCalendar-1.2.0-extcaptcha.patch, NONE, 1.1 WebCalendar-1.2.0-extmenu.patch, NONE, 1.1 WebCalendar-1.2.0-httpauthpub.patch, NONE, 1.1 WebCalendar-1.2.0-newmenuicons.patch, NONE, 1.1 WebCalendar-1.2.0-nolangwarn.patch, NONE, 1.1 WebCalendar-1.2.0-offsetdays.patch, NONE, 1.1 WebCalendar-1.2.0-reset_reminder.patch, NONE, 1.1 WebCalendar-1.2.0-shebang.patch, NONE, 1.1 WebCalendar-1.2.0-usercase.patch, NONE, 1.1 WebCalendar-1.2.0-weektimebar.patch, NONE, 1.1 WebCalendar-http.conf, NONE, 1.1 WebCalendar-taglang.php, NONE, 1.1 WebCalendar.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list