← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ubuntuone-client/trusty-proposed

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/main.py

  • Committer: Package Import Robot
  • Author(s): Rodney Dawes
  • Date: 2012-10-03 11:07:27 UTC
  • mfrom: (1.1.75)
  • Revision ID: package-import@ubuntu.com-20121003110727-twy7j76gz07k8pj0
Tags: 4.0.0-0ubuntu1
https://launchpad.net/bugs/1059571
https://launchpad.net/bugs/1058334
https://launchpad.net/bugs/1052922
https://launchpad.net/bugs/1052956
https://launchpad.net/bugs/1053775
https://launchpad.net/bugs/1053519
* New upstream release.
  - Clicking U1 icon in messaging menu doesn't work. (LP: #1059571)
  - Opening Ubuntu One from sync indicator menu doesn't work. (LP: #1058334)
  - Excessive CPU usage with sync menu integration. (LP: #1052922)
  - Re-order transfers in sync menu to be more useful. (LP: #1052956)
  - Don't fail when sync menu is not available. (LP: #1053775)
  - Fix missing icon in dash and alt+tab. (LP: #1053519)
* debian/patches:
  - Remove patches included in new upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/main.py
48
48
    volume_manager,
49
49
)
50
50
from ubuntuone import syncdaemon, clientdefs
51
 
from ubuntuone.platform import (
52
 
    event_logging,
53
 
    sync_menu,
54
 
)
 
51
from ubuntuone.platform import event_logging
55
52
from ubuntuone.syncdaemon import status_listener
56
53
from ubuntuone.syncdaemon.interaction_interfaces import SyncdaemonService
57
54
from ubuntuone.syncdaemon.states import StateManager, QueueManager
159
156
        self.mark = task.LoopingCall(self.log_mark)
160
157
        self.mark.start(mark_interval)
161
158
 
162
 
        self.sync_menu = None
163
 
        self.start_sync_menu()
164
 
 
165
 
    def start_sync_menu(self):
166
 
        """Create the sync menu and run the loop."""
167
 
        self.sync_menu = sync_menu.UbuntuOneSyncMenu(self)
168
 
        self.sync_menu.start_timer()
169
 
 
170
159
    def start_event_logger(self):
171
160
        """Start the event logger if it's available for this platform."""
172
161
        self.eventlog_listener = event_logging.get_listener(self.fs, self.vm)
176
165
 
177
166
    def start_status_listener(self):
178
167
        """Start the status listener if it is configured to start."""
179
 
        self.status_listener = status_listener.get_listener(self.fs, self.vm)
 
168
        self.status_listener = status_listener.get_listener(self.fs, self.vm,
 
169
            self.external)
180
170
        # subscribe to EQ, to be unsubscribed in shutdown
181
171
        if self.status_listener:
182
172
            self.event_q.subscribe(self.status_listener)