← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ibus/quantal

« back to all changes in this revision

Viewing changes to ibus/component.py

  • Committer: Bazaar Package Importer
  • Author(s): Barry Warsaw
  • Date: 2011-08-11 17:00:57 UTC
  • mfrom: (6.2.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110811170057-6dmbfs4s3cchzl7x
Tags: 1.3.99.20110419-1ubuntu1
https://launchpad.net/bugs/457632
* Merge with Debian unstable.  Remaining Ubuntu changes:
  - Indicator support:
    + Add 05_appindicator.patch: Use an indicator rather than a notification
      icon.
    + debian/control: Recommend python-appindicator.
  - debian/control: Install im-switch instead of im-config by default.
  - debian/README.source: Removed, it was outdated and no longer correct
  - debian/patches/01_ubuntu_desktop: Fix "Desktop entry needs the
    X-Ubuntu-Gettext-Domain key"  (LP: #457632)
  - debian/patches/02_title_update.patch: Rename "IBus Preferences" to
    "Keyboard Input Methods"
  - debian/patches/06_locale_parser.patch: Cherry-picked from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ibus/component.py
106
106
        struct.append (dbus.String(self.__textdomain))
107
107
        struct.append (dbus.Array(map(serialize_object,self.__observed_paths), signature="v"))
108
108
        struct.append (dbus.Array(map(serialize_object,self.__engines), signature="v"))
 
109
        # New properties of Component will use dict for serialize
 
110
        struct.append(dbus.Array({}, signature=None))
109
111
 
110
112
    def deserialize(self, struct):
111
113
        super(Component, self).deserialize(struct)
121
123
 
122
124
        self.__observed_paths = map(deserialize_object, struct.pop(0))
123
125
        self.__engines = map(deserialize_object, struct.pop(0))
 
126
        # New properties of Component will use dict for serialize
 
127
        #value = struct.pop(0)
124
128
 
125
129
def test():
126
130
    text = Component("Hello", "", "", "", "", "", "", "")