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

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 780
Merged at revision: 788
Proposed branch: lp:~dobey/ubuntuone-client/fix-692566
Merge into: lp:ubuntuone-client
Diff against target: 32 lines (+3/-3)
2 files modified
bin/ubuntuone-launch (+1/-1)
contrib/dbus-docs (+2/-2)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/fix-692566
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Natalia Bidart (community) Approve
Review via email: mp+44243@code.launchpad.net

Commit message

Import the syncdaemon tools from the correct platform API

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve
780. By dobey

Fix contrib/dbus-docs imports as well

Revision history for this message
Alejandro J. Cura (alecu) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/ubuntuone-launch'
--- bin/ubuntuone-launch 2010-09-29 15:35:13 +0000
+++ bin/ubuntuone-launch 2010-12-20 15:54:09 +0000
@@ -53,7 +53,7 @@
53import glib53import glib
54import gobject54import gobject
55from dbus.mainloop.glib import DBusGMainLoop55from dbus.mainloop.glib import DBusGMainLoop
56from ubuntuone.syncdaemon.tools import SyncDaemonTool, is_running56from ubuntuone.platform.tools import SyncDaemonTool, is_running
57from ubuntuone.clientdefs import APP_NAME as SD_APP_NAME57from ubuntuone.clientdefs import APP_NAME as SD_APP_NAME
58from ubuntu_sso.main import SSOCredentials58from ubuntu_sso.main import SSOCredentials
59from twisted.internet import defer59from twisted.internet import defer
6060
=== modified file 'contrib/dbus-docs'
--- contrib/dbus-docs 2010-08-09 19:22:15 +0000
+++ contrib/dbus-docs 2010-12-20 15:54:09 +0000
@@ -36,7 +36,7 @@
36 FakeNetworkManager,36 FakeNetworkManager,
37)37)
3838
39from ubuntuone.syncdaemon.dbus_interface import (39from ubuntuone.platform.dbus_interface import (
40 DBUS_IFACE_SYNC_NAME,40 DBUS_IFACE_SYNC_NAME,
41 DBUS_IFACE_STATUS_NAME,41 DBUS_IFACE_STATUS_NAME,
42 DBUS_IFACE_EVENTS_NAME,42 DBUS_IFACE_EVENTS_NAME,
@@ -46,7 +46,7 @@
46 DBUS_IFACE_FOLDERS_NAME,46 DBUS_IFACE_FOLDERS_NAME,
47 DBUS_IFACE_PUBLIC_FILES_NAME,47 DBUS_IFACE_PUBLIC_FILES_NAME,
48)48)
49from ubuntuone.syncdaemon.tools import DBusClient49from ubuntuone.platform.tools import DBusClient
50from twisted.internet import reactor, defer50from twisted.internet import reactor, defer
5151
5252

Subscribers

People subscribed via source and target branches