Merge lp:~brandontschaefer/unity/get-real-ibus-activate-shortcut into lp:unity

[Brandon Schaefer]

Get the real shortcut to activate ibus.

Use ibus config to get the list of shortcuts to activate ibus. Use the first one, we have to do some simple string manipulation. As IBus uses <mod><mod><mod>key for its string, and autopilot uses mod+mod+mod+key, so just replace all '>' with a +, and ignore all '<'.

[Christopher Townsend (townsend)]

LGTM +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3495
http://jenkins.qa.ubuntu.com/job/unity-ci/369/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/257

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/369/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/293/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2307
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/249/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/249
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/249/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/unity/tests/test_ibus.py'
--- tests/autopilot/unity/tests/test_ibus.py	2013-08-12 22:59:42 +0000
+++ tests/autopilot/unity/tests/test_ibus.py	2013-09-18 17:58:34 +0000
@@ -118,8 +118,30 @@
         This method adds a cleanUp to reset the old keys once the test is done.
 
         """
-        # FIXME Need to set this using gsettings...removed old gconf code for now
-        self.activate_binding = 'Control+space'
+        bus = get_ibus_bus()
+        config = bus.get_config()
+
+        variant = config.get_value('general/hotkey', 'triggers')
+        shortcuts = []
+
+        # If none, assume default
+        if variant != None:
+          shortcuts = variant.unpack()
+        else:
+          shortcuts = ['<Super>space']
+
+        # IBus uses the format '<mod><mod><mod>key'
+        # Autopilot uses the format 'mod+mod+mod+key'
+        # replace all > with a +, and ignore the < char
+
+        shortcut = ""
+        for c in shortcuts[0]:
+          if c == '>':
+            shortcut += '+'
+          elif c != '<':
+            shortcut += c
+
+        self.activate_binding = shortcut
         activate_release_binding_option = 'Alt+Release+Control_L'
         self.activate_release_binding = 'Alt+Control_L'