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

[dobey]

Import the syncdaemon tools from the correct platform API

[Natalia Bidart (nataliabidart)]

review: Approve

[lp:~dobey/ubuntuone-client/fix-692566]

780. By dobey on 2010-12-20

Fix contrib/dbus-docs imports as well

[Alejandro J. Cura (alecu)]

review: Approve

=== 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 @@
 import glib
 import gobject
 from dbus.mainloop.glib import DBusGMainLoop
-from ubuntuone.syncdaemon.tools import SyncDaemonTool, is_running
+from ubuntuone.platform.tools import SyncDaemonTool, is_running
 from ubuntuone.clientdefs import APP_NAME as SD_APP_NAME
 from ubuntu_sso.main import SSOCredentials
 from twisted.internet import defer

=== 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 @@
     FakeNetworkManager,
 )
 
-from ubuntuone.syncdaemon.dbus_interface import (
+from ubuntuone.platform.dbus_interface import (
     DBUS_IFACE_SYNC_NAME,
     DBUS_IFACE_STATUS_NAME,
     DBUS_IFACE_EVENTS_NAME,
@@ -46,7 +46,7 @@
     DBUS_IFACE_FOLDERS_NAME,
     DBUS_IFACE_PUBLIC_FILES_NAME,
 )
-from ubuntuone.syncdaemon.tools import DBusClient
+from ubuntuone.platform.tools import DBusClient
 from twisted.internet import reactor, defer