← Back to branch summary

~nataliabidart/ubuntuone-client/use-sso-qt

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/states.py

  • Committer: Natalia B. Bidart
  • Date: 2012-02-22 20:50:31 UTC
  • mfrom: (1193.1.3 ubuntuone-client)
  • Revision ID: natalia.bidart@canonical.com-20120222205031-kxwlj8fxzykyvrw1
Merged trunk in.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/states.py
400
400
                self._state_changed()
401
401
            return
402
402
 
403
 
        # NetworkManager and User events
 
403
        # User events
404
404
        if event in ('SYS_NET_CONNECTED', 'SYS_USER_CONNECT',
405
405
                     'SYS_NET_DISCONNECTED', 'SYS_USER_DISCONNECT',
406
406
                     'SYS_CONNECTION_LOST', 'SYS_HANDSHAKE_TIMEOUT'):