Ubuntu One Client

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

  1. fix-570721
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Vincenzo Di Somma
Approved revision: 513
Merged at revision: not available
Proposed branch: lp:~dobey/ubuntuone-client/fix-570721
Merge into: lp:ubuntuone-client
Diff against target: 37 lines (+3/-2)
3 files modified
bin/ubuntuone-preferences (+1/-1)
ubuntuone/syncdaemon/dbus_interface.py (+1/-1)
ubuntuone/syncdaemon/tools.py (+1/-0)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/fix-570721
Reviewer Review Type Date Requested Status
Vincenzo Di Somma (community) Approve
Rodrigo Moya (community) Approve
Review via email: mp+24456@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Rodrigo Moya (rodrigo-moya) wrote :

Looks good

review: Approve
Revision history for this message
Vincenzo Di Somma (vds) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubuntuone-preferences'
2--- bin/ubuntuone-preferences 2010-04-21 18:54:16 +0000
3+++ bin/ubuntuone-preferences 2010-04-29 21:17:19 +0000
4@@ -802,7 +802,7 @@
5 if self.ums_id:
6 self.music_check.set_sensitive(True)
7 if self.music_check.get_active():
8- self.__music_check_toggled(self.music_check)
9+ self.music_check_toggled(self.music_check)
10 else:
11 self.sdtool.quit().addCallback(
12 lambda _: self.devices.list_devices())
13
14=== modified file 'ubuntuone/syncdaemon/dbus_interface.py'
15--- ubuntuone/syncdaemon/dbus_interface.py 2010-04-09 18:21:13 +0000
16+++ ubuntuone/syncdaemon/dbus_interface.py 2010-04-29 21:17:19 +0000
17@@ -1214,7 +1214,7 @@
18 """Enable UDF autosubscribe."""
19 logger.debug('called set_files_sync_enabled %d', enabled)
20 user_config = config.get_user_config()
21- user_config.set_files_sync_enabled(enabled)
22+ user_config.set_files_sync_enabled(bool(int(enabled)))
23 user_config.save()
24
25 @dbus.service.method(DBUS_IFACE_CONFIG_NAME,
26
27=== modified file 'ubuntuone/syncdaemon/tools.py'
28--- ubuntuone/syncdaemon/tools.py 2010-04-14 19:01:12 +0000
29+++ ubuntuone/syncdaemon/tools.py 2010-04-29 21:17:19 +0000
30@@ -719,6 +719,7 @@
31 enabled,
32 reply_handler=d.callback,
33 error_handler=d.errback)
34+ config.set_files_sync_enabled(False)
35 return d
36 else:
37 if enabled:

Subscribers

People subscribed via source and target branches