Merge lp:~ogra/phablet-tools/phablet-tools-fix-edge-intro into lp:phablet-tools

[Oliver Grawert]

phablet-config: move handling of the edge-demo setting into dbus-property-service and do a proper dbus call from phablet-config (LP: #1365725)

phablet-config: move handling of the edge-demo setting into dbus-property-service and do a proper dbus call from phablet-config (LP: #1365725)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:315
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/407/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/88

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/407/rebuild

review: Approve (continuous-integration)

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'phablet-config'
--- phablet-config	2014-09-19 17:36:02 +0000
+++ phablet-config	2014-09-22 11:15:00 +0000
@@ -237,7 +237,6 @@
           '/org/freedesktop/Accounts/User32011 %s ' \
           'string:com.canonical.unity.AccountsService string:demo-edges'
     getter = fmt % 'org.freedesktop.DBus.Properties.Get'
-    setter = fmt % 'org.freedesktop.DBus.Properties.Set' + ' variant:boolean:'
 
     enabled = adb.shell(getter).find('true') != -1
     if args.enable and enabled:
@@ -245,8 +244,13 @@
     elif not args.enable and not enabled:
         print('already disabled')
     else:
-        setter += 'true' if args.enable else 'false'
-        adb.shell(setter)
+        setter = 'true' if args.enable else 'false'
+        dbus_call = 'dbus-send --system --print-reply ' \
+                    '--dest=com.canonical.PropertyService ' \
+                    '/com/canonical/PropertyService ' \
+                    'com.canonical.PropertyService.SetProperty ' \
+                    'string:edge boolean:%s' % setter
+        adb.shell(dbus_call, False)
 
 
 def _handle_welcome_wizard(adb, args):