diff options
| author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-09-30 22:26:06 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-09-30 22:26:06 (GMT) |
| commit | 5e485e658260c1579554ed0f3d902ed0a7a2be62 (patch) | |
| tree | 363798fede133420f9e51764d574f28cd10301c7 /src | |
| parent | a98020ab2fe950f24d06002918ca9027432f25b2 (diff) | |
Remove work around for old dbus-python.
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/view/shell.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/jarabe/view/shell.py b/src/jarabe/view/shell.py index 6f40f8c..d0608e5 100644 --- a/src/jarabe/view/shell.py +++ b/src/jarabe/view/shell.py @@ -38,13 +38,6 @@ from jarabe.view.launchwindow import LaunchWindow from jarabe.model import shellmodel from jarabe.journal import journalactivity -# #3903 - this constant can be removed and assumed to be 1 when dbus-python -# 0.82.3 is the only version used -if dbus.version >= (0, 82, 3): - DBUS_PYTHON_TIMEOUT_UNITS_PER_SECOND = 1 -else: - DBUS_PYTHON_TIMEOUT_UNITS_PER_SECOND = 1000 - class Shell(gobject.GObject): def __init__(self): gobject.GObject.__init__(self) @@ -77,15 +70,13 @@ class Shell(gobject.GObject): # Mount the datastore in internal flash ds_path = env.get_profile_path('datastore') try: - datastore.mount(ds_path, [], timeout=120 * \ - DBUS_PYTHON_TIMEOUT_UNITS_PER_SECOND) + datastore.mount(ds_path, [], timeout=120) except Exception, e: # Don't explode if there's corruption; move the data out of the way # and attempt to create a store from scratch. logging.error(e) shutil.move(ds_path, os.path.abspath(ds_path) + str(time.time())) - datastore.mount(ds_path, [], timeout=120 * \ - DBUS_PYTHON_TIMEOUT_UNITS_PER_SECOND) + datastore.mount(ds_path, [], timeout=120) journalactivity.start() |