Ubuntu One Client

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

  1. fix-692566
  2. Merge into trunk
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
lp:~dobey/ubuntuone-client/fix-692566 updated
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
1=== modified file 'bin/ubuntuone-launch'
2--- bin/ubuntuone-launch 2010-09-29 15:35:13 +0000
3+++ bin/ubuntuone-launch 2010-12-20 15:54:09 +0000
4@@ -53,7 +53,7 @@
5 import glib
6 import gobject
7 from dbus.mainloop.glib import DBusGMainLoop
8-from ubuntuone.syncdaemon.tools import SyncDaemonTool, is_running
9+from ubuntuone.platform.tools import SyncDaemonTool, is_running
10 from ubuntuone.clientdefs import APP_NAME as SD_APP_NAME
11 from ubuntu_sso.main import SSOCredentials
12 from twisted.internet import defer
13
14=== modified file 'contrib/dbus-docs'
15--- contrib/dbus-docs 2010-08-09 19:22:15 +0000
16+++ contrib/dbus-docs 2010-12-20 15:54:09 +0000
17@@ -36,7 +36,7 @@
18 FakeNetworkManager,
19 )
20
21-from ubuntuone.syncdaemon.dbus_interface import (
22+from ubuntuone.platform.dbus_interface import (
23 DBUS_IFACE_SYNC_NAME,
24 DBUS_IFACE_STATUS_NAME,
25 DBUS_IFACE_EVENTS_NAME,
26@@ -46,7 +46,7 @@
27 DBUS_IFACE_FOLDERS_NAME,
28 DBUS_IFACE_PUBLIC_FILES_NAME,
29 )
30-from ubuntuone.syncdaemon.tools import DBusClient
31+from ubuntuone.platform.tools import DBusClient
32 from twisted.internet import reactor, defer
33
34

Subscribers

People subscribed via source and target branches