← Back to branch summary

~verterok/ubuntuone-client/tritcask-fix-825366-stable-3-0

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/dbus_interface.py

  • Committer: Rodney Dawes
  • Date: 2009-06-26 17:01:42 UTC
  • mto: This revision was merged to the branch mainline in revision 60.
  • Revision ID: rodney.dawes@canonical.com-20090626170142-a738504rgnarizuw
        Remove the canonical namespace, and just use ubuntuone as the toplevel
        Move storage/syncdaemon and storage/u1sync up a level

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/dbus_interface.py
1
 
# canonical.ubuntuone.storage.syncdaemon.dbus_interface - DBus Interface
 
1
# ubuntuone.syncdaemon.dbus_interface - DBus Interface
2
2
#
3
3
# Author: Guillermo Gonzalez <guillermo.gonzalez@canonical.com>
4
4
#
18
18
""" DBUS interface module """
19
19
import dbus.service
20
20
 
21
 
from canonical.ubuntuone.storage.syncdaemon.event_queue import EVENTS
22
 
from canonical.ubuntuone.storage.syncdaemon.interfaces import IMarker
 
21
from ubuntuone.syncdaemon.event_queue import EVENTS
 
22
from ubuntuone.syncdaemon.interfaces import IMarker
23
23
import logging
24
24
 
25
25
DBUS_IFACE_NAME = 'com.ubuntuone.SyncDaemon'
670
670
 
671
671
    def connect(self):
672
672
        """ Push the SYS_CONNECT event with the tokens in the keyring. """
673
 
        from canonical.ubuntuone.storage.syncdaemon.main import NoAccessToken
 
673
        from ubuntuone.syncdaemon.main import NoAccessToken
674
674
        try:
675
675
            access_token = self.main.get_access_token()
676
676
            self.event_queue.push('SYS_CONNECT', access_token)