Attachment 611688 Details for Bug 854161 – Patch for dup_strv

[patch] Patch for dup_strv

ibus-854161-dupstrv.patch (text/plain), 2.42 KB, created by fujiwara on 2012-09-11 08:39:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fujiwara

Created: 2012-09-11 08:39:53 UTC

Size: 2.42 KB

patch

obsolete

>--- ibus-1.4.99.20120822/setup/main.py.orig	2012-09-11 08:32:58.418468039 +0900
>+++ ibus-1.4.99.20120822/setup/main.py	2012-09-11 08:33:25.462465825 +0900
>@@ -71,6 +71,15 @@ class Setup(object):
>         self.__builder.set_translation_domain(DOMAINNAME)
>         self.__builder.add_from_file(gtk_builder_file);
>         self.__bus = None
>+
>+        # In the latest pygobject3 3.3.4 or later, g_variant_dup_strv
>+        # returns the allocated strv but in the previous release,
>+        # it returned the tuple of (strv, length)
>+        self.__tuple_for_variant_strv = False
>+        e = []
>+        if type(GLib.Variant.new_strv(e).dup_strv()) == tuple:
>+            self.__tuple_for_variant_strv = True
>+
>         self.__init_bus()
>         self.__init_ui()
> 
>@@ -209,7 +218,7 @@ class Setup(object):
>         value = self.__config.get_value("general", "load_xkb_layouts")
>         load_layouts = []
>         if value != None:
>-            load_layouts = value.dup_strv()
>+            load_layouts = self.__variant_dup_strv(value)
>         engines = []
>         for engine in self.__engines:
>             if not engine.get_name().startswith('xkb:'):
>@@ -272,6 +281,12 @@ class Setup(object):
>         self.__init_panel()
>         self.__init_general()
> 
>+    def __variant_dup_strv(self, variant):
>+        if self.__tuple_for_variant_strv:
>+            return variant.dup_strv()[0]
>+        else:
>+            return variant.dup_strv()
>+
>     def __combobox_notify_active_engine_cb(self, combobox, property):
>         engine = self.__combobox.get_active_engine()
>         button = self.__builder.get_object("button_engine_add")
>@@ -464,7 +479,7 @@ class Setup(object):
>             orig_list =['<Control><Shift>space']
>         variant = self.__config.get_value(section, name)
>         if variant != None:
>-            orig_list = variant.dup_strv()
>+            orig_list = self.__variant_dup_strv(variant)
>         orig_text = ';'.join(orig_list)
>         if text == orig_text:
>             return
>@@ -639,7 +654,7 @@ class Setup(object):
>         if section == 'general' and name == 'preload_engines':
>             value = []
>             if variant != None:
>-                value = variant.dup_strv()
>+                value = self.__variant_dup_strv(variant)
>             engines = self.__get_engine_descs_from_names(value)
>             current_engines = self.__treeview.get_engines()
>             engines_csv = str.join(',', map(lambda e: e.get_name(), engines))

Actions: View | Diff

Attachments on bug 854161: 610157 | 611688