Merge lp:~dobey/ubuntuone-client/fix-570721 into lp:ubuntuone-client

[dobey]

Fix typo in music_check_toggled call (removed preceding __)
Convert the DBusBool '0' to int then Python bool for storing
Update the internal config object with the new value after calling DBus

[Rodrigo Moya (rodrigo-moya)]

Looks good

review: Approve

[Vincenzo Di Somma (vds)]

Looks good

review: Approve

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-04-21 18:54:16 +0000
+++ bin/ubuntuone-preferences	2010-04-29 21:17:19 +0000
@@ -802,7 +802,7 @@
             if self.ums_id:
                 self.music_check.set_sensitive(True)
                 if self.music_check.get_active():
-                    self.__music_check_toggled(self.music_check)
+                    self.music_check_toggled(self.music_check)
         else:
             self.sdtool.quit().addCallback(
                 lambda _: self.devices.list_devices())
 
=== modified file 'ubuntuone/syncdaemon/dbus_interface.py'
--- ubuntuone/syncdaemon/dbus_interface.py	2010-04-09 18:21:13 +0000
+++ ubuntuone/syncdaemon/dbus_interface.py	2010-04-29 21:17:19 +0000
@@ -1214,7 +1214,7 @@
         """Enable UDF autosubscribe."""
         logger.debug('called set_files_sync_enabled %d', enabled)
         user_config = config.get_user_config()
-        user_config.set_files_sync_enabled(enabled)
+        user_config.set_files_sync_enabled(bool(int(enabled)))
         user_config.save()
 
     @dbus.service.method(DBUS_IFACE_CONFIG_NAME,
 
=== modified file 'ubuntuone/syncdaemon/tools.py'
--- ubuntuone/syncdaemon/tools.py	2010-04-14 19:01:12 +0000
+++ ubuntuone/syncdaemon/tools.py	2010-04-29 21:17:19 +0000
@@ -719,6 +719,7 @@
                                       enabled,
                                       reply_handler=d.callback,
                                       error_handler=d.errback)
+            config.set_files_sync_enabled(False)
             return d
         else:
             if enabled: