packages: ibus/ibus-530711-preload-sys.patch, ibus/ibus-541492-xkb.patch, i...
glen
glen at pld-linux.org
Sun Jun 24 16:11:53 CEST 2012
Author: glen Date: Sun Jun 24 14:11:53 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.3.99.20110817
tracked fedora changes up to e0a5e11
---- Files affected:
packages/ibus:
ibus-530711-preload-sys.patch (1.1 -> 1.2) , ibus-541492-xkb.patch (1.1 -> 1.2) , ibus-HEAD.patch (1.1 -> 1.2) , ibus-xx-bridge-hotkey.patch (1.1 -> 1.2) , ibus-xx-setup-frequent-lang.patch (1.1 -> 1.2) , ibus.spec (1.6 -> 1.7) , ibus-xx-icon-symbol.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/ibus/ibus-530711-preload-sys.patch
diff -u packages/ibus/ibus-530711-preload-sys.patch:1.1 packages/ibus/ibus-530711-preload-sys.patch:1.2
--- packages/ibus/ibus-530711-preload-sys.patch:1.1 Tue Jul 19 14:01:54 2011
+++ packages/ibus/ibus-530711-preload-sys.patch Sun Jun 24 16:11:47 2012
@@ -1,6 +1,6 @@
-From 7f81445b3e6613d14f64253506a309095a37c8d7 Mon Sep 17 00:00:00 2001
+From fd80539e980f464192aed22c71e83ff3a6ec61b3 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1 at gmail.com>
-Date: Mon, 20 Jun 2011 19:04:42 +0900
+Date: Thu, 1 Sep 2011 14:38:13 +0900
Subject: [PATCH] Reload preload engines until users customize the list.
The idea is, if users don't customize the preload_engines with ibus-setup,
@@ -17,19 +17,19 @@
IBUS_PRELOAD_ENGINE_MODE_USER and users can customize the value
'preload_engines'.
---
- bus/ibusimpl.c | 402 +++++++++++++++++++++++++++++++++++++++-----------
- data/ibus.schemas.in | 13 ++
+ bus/ibusimpl.c | 412 +++++++++++++++++++++++++++++++++++++++-----------
+ data/ibus.schemas.in | 15 ++-
ibus/common.py | 6 +
setup/main.py | 70 ++++++++-
setup/setup.ui | 21 +++-
src/ibustypes.h | 10 ++
- 6 files changed, 427 insertions(+), 95 deletions(-)
+ 6 files changed, 438 insertions(+), 96 deletions(-)
diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
-index a7ae52b..bb4b8ae 100644
+index 1942504..3fce912 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
-@@ -144,6 +144,9 @@ static void bus_ibus_impl_set_previous_engine
+@@ -142,6 +142,9 @@ static void bus_ibus_impl_set_previous_engine
static void bus_ibus_impl_set_preload_engines
(BusIBusImpl *ibus,
GVariant *value);
@@ -39,7 +39,7 @@
static void bus_ibus_impl_set_use_sys_layout
(BusIBusImpl *ibus,
GVariant *value);
-@@ -285,6 +288,259 @@ _panel_destroy_cb (BusPanelProxy *panel,
+@@ -283,6 +286,269 @@ _panel_destroy_cb (BusPanelProxy *panel,
}
static void
@@ -86,6 +86,16 @@
+
+ variant = ibus_config_get_value (ibus->config, "general",
+ "preload_engines");
++ if (variant != NULL && g_variant_classify (variant) == G_VARIANT_CLASS_ARRAY) {
++ GVariantIter iter;
++ const gchar *engine_name = NULL;
++ g_variant_iter_init (&iter, variant);
++ g_variant_iter_loop (&iter, "&s", &engine_name);
++ if (g_strcmp0 (engine_name, "ibus_null_engine") == 0) {
++ g_variant_unref (variant);
++ variant = NULL;
++ }
++ }
+ if (variant == NULL) {
+ /* Set LANG_RELATIVE mode for the initial login */
+ preload_engine_mode = IBUS_PRELOAD_ENGINE_MODE_LANG_RELATIVE;
@@ -299,7 +309,7 @@
bus_ibus_impl_set_hotkey (BusIBusImpl *ibus,
GQuark hotkey,
GVariant *value)
-@@ -394,35 +650,50 @@ static void
+@@ -392,35 +658,50 @@ static void
bus_ibus_impl_set_preload_engines (BusIBusImpl *ibus,
GVariant *value)
{
@@ -372,7 +382,7 @@
}
/**
-@@ -503,89 +774,47 @@ bus_ibus_impl_set_use_global_engine (BusIBusImpl *ibus,
+@@ -501,89 +782,47 @@ bus_ibus_impl_set_use_global_engine (BusIBusImpl *ibus,
}
}
@@ -484,7 +494,7 @@
#endif
}
-@@ -601,6 +830,7 @@ const static struct {
+@@ -599,6 +838,7 @@ const static struct {
{ "general/hotkey", "next_engine_in_menu", bus_ibus_impl_set_next_engine_in_menu },
{ "general/hotkey", "previous_engine", bus_ibus_impl_set_previous_engine },
{ "general", "preload_engines", bus_ibus_impl_set_preload_engines },
@@ -493,10 +503,19 @@
{ "general", "use_global_engine", bus_ibus_impl_set_use_global_engine },
{ "general", "embed_preedit_text", bus_ibus_impl_set_embed_preedit_text },
diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
-index 7ca4899..d4334e1 100644
+index 8979515..fef1810 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
-@@ -13,6 +13,19 @@
+@@ -6,7 +6,7 @@
+ <applyto>/desktop/ibus/general/preload_engines</applyto>
+ <owner>ibus</owner>
+ <type>list</type>
+- <default>[]</default>
++ <default>[ibus_null_engine]</default>
+ <list_type>string</list_type>
+ <locale name="C">
+ <short>Preload engines</short>
+@@ -14,6 +14,19 @@
</locale>
</schema>
<schema>
@@ -700,7 +719,7 @@
</child>
</object>
diff --git a/src/ibustypes.h b/src/ibustypes.h
-index 6a31847..14b44fc 100644
+index 8146719..6151cd0 100644
--- a/src/ibustypes.h
+++ b/src/ibustypes.h
@@ -186,6 +186,16 @@ typedef enum {
@@ -721,5 +740,5 @@
* @x: x coordinate.
* @y: y coordinate.
--
-1.7.4.4
+1.7.5.4
================================================================
Index: packages/ibus/ibus-541492-xkb.patch
diff -u packages/ibus/ibus-541492-xkb.patch:1.1 packages/ibus/ibus-541492-xkb.patch:1.2
--- packages/ibus/ibus-541492-xkb.patch:1.1 Tue Jul 19 14:01:54 2011
+++ packages/ibus/ibus-541492-xkb.patch Sun Jun 24 16:11:47 2012
@@ -1,50 +1,56 @@
-From 14986cb38f431d132332b2e8f9da1ca2b8a5d10e Mon Sep 17 00:00:00 2001
+From c7c1106dd675a86b7f7b59e3a05741e8048c53f3 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1 at gmail.com>
-Date: Wed, 29 Jun 2011 16:52:08 +0900
+Date: Thu, 1 Sep 2011 14:51:37 +0900
Subject: [PATCH] Add XKB layouts
---
- Makefile.am | 7 +
- configure.ac | 56 ++++
- data/ibus.schemas.in | 36 +++
- ibus-1.0.pc.in | 2 +
- ibus/Makefile.am | 26 ++
- ibus/__init__.py | 2 +
- ibus/bus.py | 3 +
- ibus/interface/iibus.py | 3 +
- ibus/xkblayout.py.in | 215 ++++++++++++++++
- ibus/xkbxml.py.in | 413 ++++++++++++++++++++++++++++++
- setup/Makefile.am | 1 +
- setup/enginecombobox.py | 7 +-
- setup/main.py | 3 +
- setup/setup.ui | 609 +++++++++++++++++++++++++++++++++++++++++++-
- setup/xkbsetup.py | 454 +++++++++++++++++++++++++++++++++
- src/Makefile.am | 5 +
- src/ibus.h | 1 +
- src/ibusfactory.c | 21 ++-
- src/ibusfactory.h | 5 +-
- src/ibusxkbxml.c | 440 ++++++++++++++++++++++++++++++++
- src/ibusxkbxml.h | 172 +++++++++++++
- ui/gtk/panel.py | 39 +++
- xkb/Makefile.am | 104 ++++++++
- xkb/ibus-engine-xkb-main.c | 397 +++++++++++++++++++++++++++++
- xkb/ibus-engine-xkb-main.h | 46 ++++
- xkb/ibus-xkb-main.c | 112 ++++++++
- xkb/xkblayout.xml.in | 16 ++
- xkb/xkblayoutconfig.xml.in | 6 +
- xkb/xkblib.c | 327 ++++++++++++++++++++++++
- xkb/xkblib.h | 41 +++
- xkb/xkbxml.c | 335 ++++++++++++++++++++++++
- xkb/xkbxml.h | 110 ++++++++
- 32 files changed, 4008 insertions(+), 6 deletions(-)
+ Makefile.am | 7 +
+ configure.ac | 56 +
+ data/ibus.schemas.in | 36 +
+ ibus-1.0.pc.in | 2 +
+ ibus/Makefile.am | 26 +
+ ibus/__init__.py | 2 +
+ ibus/bus.py | 3 +
+ ibus/interface/iibus.py | 3 +
+ ibus/xkblayout.py.in | 230 +++
+ ibus/xkbxml.py.in | 419 ++++
+ setup/Makefile.am | 1 +
+ setup/enginecombobox.py | 7 +-
+ setup/main.py | 3 +
+ setup/setup.ui | 609 ++++++-
+ setup/xkbsetup.py | 457 +++++
+ src/Makefile.am | 5 +
+ src/ibus.h | 1 +
+ src/ibusxkbxml.c | 441 +++++
+ src/ibusxkbxml.h | 172 ++
+ ui/gtk/panel.py | 41 +
+ xkb/Makefile.am | 107 +
+ xkb/Makefile.am.orig | 104 +
+ xkb/gtkimcontextsimpleseqs.h | 4484 ++++++++++++++++++++++++++++++++++++++++++
+ xkb/ibus-engine-xkb-main.c | 303 +++
+ xkb/ibus-engine-xkb-main.h | 32 +
+ xkb/ibus-simple-engine.c | 1049 ++++++++++
+ xkb/ibus-simple-engine.h | 11 +
+ xkb/ibus-xkb-main.c | 112 ++
+ xkb/xkblayout.xml.in | 16 +
+ xkb/xkblayoutconfig.xml.in | 6 +
+ xkb/xkblib.c | 327 +++
+ xkb/xkblib.h | 41 +
+ xkb/xkbxml.c | 345 ++++
+ xkb/xkbxml.h | 113 ++
+ 34 files changed, 9567 insertions(+), 4 deletions(-)
create mode 100644 ibus/xkblayout.py.in
create mode 100644 ibus/xkbxml.py.in
create mode 100644 setup/xkbsetup.py
create mode 100644 src/ibusxkbxml.c
create mode 100644 src/ibusxkbxml.h
create mode 100644 xkb/Makefile.am
+ create mode 100644 xkb/Makefile.am.orig
+ create mode 100644 xkb/gtkimcontextsimpleseqs.h
create mode 100644 xkb/ibus-engine-xkb-main.c
create mode 100644 xkb/ibus-engine-xkb-main.h
+ create mode 100644 xkb/ibus-simple-engine.c
+ create mode 100644 xkb/ibus-simple-engine.h
create mode 100644 xkb/ibus-xkb-main.c
create mode 100644 xkb/xkblayout.xml.in
create mode 100644 xkb/xkblayoutconfig.xml.in
@@ -54,7 +60,7 @@
create mode 100644 xkb/xkbxml.h
diff --git a/Makefile.am b/Makefile.am
-index 7be558b..59fbabb 100644
+index ff0fabc..056ddfc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,12 @@ DAEMON_DIRS = \
@@ -70,19 +76,19 @@
if ENABLE_MEMCONF
MEMCONF_DIRS = \
memconf \
-@@ -60,6 +66,7 @@ SUBDIRS = \
+@@ -66,6 +72,7 @@ SUBDIRS = \
$(DAEMON_DIRS) \
$(PYTHON_DIRS) \
$(GCONF_DIRS) \
+ $(XKB_DIRS) \
$(MEMCONF_DIRS) \
+ $(DCONF_DIRS) \
$(NULL)
-
diff --git a/configure.ac b/configure.ac
-index 5544dfa..85e5e30 100644
+index 367b069..e90f20e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -185,6 +185,60 @@ else
+@@ -191,6 +191,60 @@ else
enable_xim="no (disabled, use --enable-xim to enable)"
fi
@@ -143,15 +149,15 @@
# GObject introspection
GOBJECT_INTROSPECTION_CHECK([0.6.8])
-@@ -430,6 +484,7 @@ gconf/Makefile
- gconf/gconf.xml.in
- bindings/Makefile
+@@ -457,6 +511,7 @@ bindings/Makefile
bindings/vala/Makefile
+ dconf/Makefile
+ dconf/dconf.xml.in
+xkb/Makefile
])
AC_OUTPUT
-@@ -445,6 +500,7 @@ Build options:
+@@ -472,6 +527,7 @@ Build options:
Build gtk2 immodule $enable_gtk2
Build gtk3 immodule $enable_gtk3
Build XIM agent server $enable_xim
@@ -160,10 +166,10 @@
Build gconf modules $enable_gconf
Build memconf modules $enable_memconf
diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
-index b75295e..7ca4899 100644
+index 663358c..8979515 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
-@@ -190,6 +190,42 @@
+@@ -191,6 +191,42 @@
</locale>
</schema>
<schema>
@@ -303,10 +309,10 @@
diff --git a/ibus/xkblayout.py.in b/ibus/xkblayout.py.in
new file mode 100644
-index 0000000..4cb3ffd
+index 0000000..11fce12
--- /dev/null
+++ b/ibus/xkblayout.py.in
-@@ -0,0 +1,215 @@
+@@ -0,0 +1,230 @@
+# vim:set et sts=4 sw=4:
+#
+# ibus - The Input Bus
@@ -331,7 +337,7 @@
+# Boston, MA 02111-1307 USA
+
+__all__ = (
-+ "XKBLayout",
++ 'XKBLayout',
+ )
+
+import os, sys, time
@@ -354,8 +360,8 @@
+ self.__time_lag_session_xkb_timer = time.time()
+ self.__xkb_latin_layouts = []
+ if config != None:
-+ self.__xkb_latin_layouts = list(self.__config.get_value("general",
-+ "xkb_latin_layouts",
++ self.__xkb_latin_layouts = list(self.__config.get_value('general',
++ 'xkb_latin_layouts',
+ []))
+
+
@@ -363,12 +369,20 @@
+ left_bracket = layout.find('(')
+ right_bracket = layout.find(')')
+ if left_bracket >= 0 and right_bracket > left_bracket:
-+ return (layout[:left_bracket], \
++ return (layout[:left_bracket] + layout[right_bracket + 1:], \
++ layout[left_bracket + 1:right_bracket])
++ return (layout, 'default')
++
++ def __get_option_from_layout(self, layout):
++ left_bracket = layout.find('[')
++ right_bracket = layout.find(']')
++ if left_bracket >= 0 and right_bracket > left_bracket:
++ return (layout[:left_bracket] + layout[right_bracket + 1:], \
+ layout[left_bracket + 1:right_bracket])
-+ return (layout, "default")
++ return (layout, 'default')
+
+ def __get_output_from_cmdline(self, arg, string):
-+ exec_command = "%s %s" % (self.__command, arg)
++ exec_command = '%s %s' % (self.__command, arg)
+ retval = None
+ for line in os.popen(exec_command).readlines():
+ line = line.strip()
@@ -385,24 +399,24 @@
+ def get_layout(self):
+ if not self.__use_xkb:
+ return None
-+ return self.__get_output_from_cmdline("--get", "layout: ")
++ return self.__get_output_from_cmdline('--get', 'layout: ')
+
+ def get_model(self):
+ if not self.__use_xkb:
+ return None
-+ return self.__get_output_from_cmdline("--get", "model: ")
++ return self.__get_output_from_cmdline('--get', 'model: ')
+
+ def get_option(self):
+ if not self.__use_xkb:
+ return None
-+ return self.__get_output_from_cmdline("--get", "option: ")
++ return self.__get_output_from_cmdline('--get', 'option: ')
+
+ def get_group(self):
+ if not self.__use_xkb:
+ return 0
-+ return int(self.__get_output_from_cmdline("--get-group", "group: "))
++ return int(self.__get_output_from_cmdline('--get-group', 'group: '))
+
-+ def set_layout(self, layout="default", model="default", option="default"):
++ def set_layout(self, layout='default', model='default', option='default'):
+ if not self.__use_xkb:
+ return
+ if layout == None:
@@ -427,24 +441,31 @@
+ > XKB_SESSION_TIME_OUT):
+ self.__time_lag_session_xkb_layout = False
+ self.__time_lag_session_xkb_option = False
-+ if layout == "default":
++ if layout == 'default':
+ layout = self.__default_layout
+ else:
+ self.__time_lag_session_xkb_layout = False
+ if model != None:
+ model = str(model)
-+ if model == "default":
++ if model == 'default':
+ (layout, model) = self.__get_model_from_layout(layout)
-+ if model == "default":
++ if model == 'default':
+ model = self.__default_model
+ else:
+ self.__time_lag_session_xkb_layout = False
+ if option != None:
+ option = str(option)
-+ if option == "default":
++ if option == 'default':
++ (layout, engine_option) = self.__get_option_from_layout(layout)
++ if engine_option != None and engine_option != 'default':
++ option = self.__default_option
++ if option == None:
++ option = engine_option
++ else:
++ option = '%s,%s' % (option, engine_option)
++ self.__time_lag_session_xkb_option = False
++ if option == 'default':
+ option = self.__default_option
-+ else:
-+ self.__time_lag_session_xkb_option = False
+ need_us_layout = False
+ for latin_layout in self.__xkb_latin_layouts:
+ latin_layout = str(latin_layout)
@@ -455,9 +476,9 @@
+ need_us_layout = True
+ break
+ if need_us_layout:
-+ layout = layout + ",us"
++ layout = layout + ',us'
+ if model != None:
-+ model = model + ","
++ model = model + ','
+ if layout == self.get_layout() and \
+ model == self.get_model() and \
+ option == self.get_option():
@@ -465,25 +486,25 @@
+ args = []
+ args.append(self.__command)
+ args.append(os.path.basename(self.__command))
-+ args.append("--layout")
++ args.append('--layout')
+ args.append(layout)
+ if model != None:
-+ args.append("--model")
++ args.append('--model')
+ args.append(model)
+ if option != None:
-+ args.append("--option")
++ args.append('--option')
+ args.append(option)
+ pid = os.spawnl(os.P_NOWAIT, *args)
+ os.waitpid(pid, 0)
+
-+ def set_default_layout(self, layout="default", model="default"):
++ def set_default_layout(self, layout='default', model='default'):
+ if not self.__use_xkb:
+ return
+ if layout == None:
-+ print >> sys.stderr, "ibus.xkblayout: None layout"
++ print >> sys.stderr, 'ibus.xkblayout: None layout'
+ return
+ if model == None:
-+ print >> sys.stderr, "ibus.xkblayout: None model"
++ print >> sys.stderr, 'ibus.xkblayout: None model'
+ return
+ if layout == 'default':
+ self.__default_layout = self.get_layout()
@@ -498,11 +519,11 @@
+ else:
+ self.__default_model = model
+
-+ def set_default_option(self, option="default"):
++ def set_default_option(self, option='default'):
+ if not self.__use_xkb:
+ return
+ if option == None:
-+ print >> sys.stderr, "ibus.xkblayout: None option"
++ print >> sys.stderr, 'ibus.xkblayout: None option'
+ return
+ if option == 'default':
+ self.__default_option = self.get_option()
@@ -524,10 +545,10 @@
+ self.__default_option = self.get_option()
diff --git a/ibus/xkbxml.py.in b/ibus/xkbxml.py.in
new file mode 100644
-index 0000000..7e5a44e
+index 0000000..9407c13
--- /dev/null
+++ b/ibus/xkbxml.py.in
-@@ -0,0 +1,413 @@
+@@ -0,0 +1,419 @@
+# vim:set et sts=4 sw=4:
+#
+# ibus - The Input Bus
@@ -552,8 +573,8 @@
+# Boston, MA 02111-1307 USA
+
+__all__ = (
-+ "XKBConfigRegistry",
-+ "XKBLayoutConfig",
++ 'XKBConfigRegistry',
++ 'XKBLayoutConfig',
+ )
+
+import os
@@ -569,7 +590,7 @@
+except ImportError:
+ get_user_config_dir = lambda : None
+
-+XKB_RULES_XML_FILE = "@XKB_RULES_XML_FILE@"
++XKB_RULES_XML_FILE = '@XKB_RULES_XML_FILE@'
+
+class XKBConfigRegistryHandler(XMLFilterBase):
+ def __init__(self, parser=None, root='root'):
@@ -599,18 +620,18 @@
+ if not self.__layout:
+ return
+ if self.__variant:
-+ if self.__current_node == "name":
++ if self.__current_node == 'name':
+ self.__variant_label = text
+ if self.__layout_label != None and \
+ self.__layout_label in self.__layoutlist_array:
+ self.__layoutlist_array[self.__layout_label].append(text)
-+ elif self.__current_node == "description":
-+ label = "%s(%s)" % (self.__layout_label, self.__variant_label)
++ elif self.__current_node == 'description':
++ label = '%s(%s)' % (self.__layout_label, self.__variant_label)
+ self.__variant_desc[label] = text
-+ elif self.__current_node == "iso639Id":
++ elif self.__current_node == 'iso639Id':
+ label = self.__layout_label
+ if label != None:
-+ label = "%s(%s)" % (label, self.__variant_label)
++ label = '%s(%s)' % (label, self.__variant_label)
+ else:
+ label = self.__variant_label
+ if label not in self.__layout_lang:
@@ -619,12 +640,12 @@
+ else:
+ pass
+ else:
-+ if self.__current_node == "name":
++ if self.__current_node == 'name':
+ self.__layout_label = text
+ self.__layoutlist_array[self.__layout_label] = []
-+ elif self.__current_node == "description":
++ elif self.__current_node == 'description':
+ self.__layout_desc[self.__layout_label] = text
-+ elif self.__current_node == "iso639Id":
++ elif self.__current_node == 'iso639Id':
+ if self.__layout_label not in self.__layout_lang:
+ self.__layout_lang[self.__layout_label] = []
+ self.__layout_lang[self.__layout_label].append(text)
@@ -635,60 +656,60 @@
+ if not self.__group:
+ return
+ if self.__option:
-+ if self.__current_node == "name":
++ if self.__current_node == 'name':
+ self.__option_label = text
+ if self.__group_label != None and \
+ self.__group_label in self.__optionlist_array:
+ self.__optionlist_array[self.__group_label].append(text)
-+ elif self.__current_node == "description":
++ elif self.__current_node == 'description':
+ self.__option_desc[self.__option_label] = text
+ else:
+ pass
+ else:
-+ if self.__current_node == "name":
++ if self.__current_node == 'name':
+ self.__group_label = text
+ self.__optionlist_array[self.__group_label] = []
-+ elif self.__current_node == "description":
++ elif self.__current_node == 'description':
+ self.__option_group_desc[self.__group_label] = text
+ else:
+ pass
+
+ def startElement(self, name, attrs):
+ self.__current_node = name
-+ if name == "layoutList":
++ if name == 'layoutList':
+ self.__layoutlist = True
-+ elif name == "layout":
++ elif name == 'layout':
+ self.__layout = True
+ self.__layout_label = None
-+ elif name == "variantList":
++ elif name == 'variantList':
+ self.__variantlist = True
-+ elif name == "variant":
++ elif name == 'variant':
+ self.__variant = True
+ self.__variant_label = None
-+ elif name == "optionList":
++ elif name == 'optionList':
+ self.__optionlist = True
-+ elif name == "option":
++ elif name == 'option':
+ self.__option = True
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/packages/ibus/ibus-530711-preload-sys.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/ibus/ibus-541492-xkb.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/ibus/ibus-HEAD.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/ibus/ibus-xx-bridge-hotkey.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/ibus/ibus-xx-setup-frequent-lang.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/ibus/ibus.spec?r1=1.6&r2=1.7
More information about the pld-cvs-commit
mailing list