← Back to branch summary

~verterok/ubuntuone-client/volumemanager_udfs-2

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/main.py

  • Committer: guillermo.gonzalez at canonical
  • Date: 2010-01-04 18:54:17 UTC
  • mfrom: (294.2.6 trunk)
  • Revision ID: guillermo.gonzalez@canonical.com-20100104185417-is0onxq4znx57u0j
merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/main.py
81
81
                 mark_interval=120, dbus_events=False,
82
82
                 handshake_timeout=30, max_handshake_timeouts=10,
83
83
                 shares_symlink_name='Shared With Me',
84
 
                 read_limit=None, write_limit=None, throttling_enabled=None):
 
84
                 read_limit=None, write_limit=None, throttling_enabled=False):
85
85
        """ create the instance. """
86
86
        self.root_dir = root_dir
87
87
        self.shares_dir = shares_dir
101
101
            read_limit = user_config.get_throttling_read_limit()
102
102
        if write_limit is None:
103
103
            write_limit = user_config.get_throttling_write_limit()
104
 
        if throttling_enabled is None:
 
104
        if not throttling_enabled:
105
105
            throttling_enabled = user_config.get_throttling()
106
106
 
107
107
        self.vm = volume_manager.VolumeManager(self)