diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2010-10-16 14:06:33 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha-pgp@silbe.org> | 2010-11-24 19:22:01 (GMT) |
| commit | 69dbe0fb1723b6f0402d23a19d137a3395f2f8e2 (patch) | |
| tree | 8b8b77ccfa4dd22a461bd7f381bead1d523fc0e8 /src | |
| parent | 468fe070e0a60e9690e89a0649919509c310974e (diff) | |
fix EOL spaces
Reviewed-by: James Cameron <quozl@laptop.org>
Reviewed-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/desktop/favoritesview.py | 2 | ||||
| -rw-r--r-- | src/jarabe/journal/journaltoolbox.py | 2 | ||||
| -rw-r--r-- | src/jarabe/model/network.py | 8 | ||||
| -rw-r--r-- | src/jarabe/model/olpcmesh.py | 2 | ||||
| -rw-r--r-- | src/jarabe/util/emulator.py | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index ac847e2..ada55e0 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -386,7 +386,7 @@ class ActivityIcon(CanvasIcon): break def _get_last_activity_async(self, bundle_id, properties): - query = {'activity': bundle_id} + query = {'activity': bundle_id} datastore.find(query, sorting=['+timestamp'], limit=self._MAX_RESUME_ENTRIES, properties=properties, diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py index cbf105d..c6bd0fb 100644 --- a/src/jarabe/journal/journaltoolbox.py +++ b/src/jarabe/journal/journaltoolbox.py @@ -451,7 +451,7 @@ class EntryToolbar(gtk.Toolbar): model.copy(self._metadata, mount_point) except IOError, e: logging.exception('Error while copying the entry. %s', e.strerror) - self.emit('volume-error', + self.emit('volume-error', _('Error while copying the entry. %s') % e.strerror, _('Error')) diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py index 79e4360..d76e408 100644 --- a/src/jarabe/model/network.py +++ b/src/jarabe/model/network.py @@ -471,14 +471,14 @@ class SecretsGsm(object): self.password = None self.pin = None self.puk = None - + def get_dict(self): secrets = {} if self.password is not None: secrets['password'] = self.password if self.pin is not None: secrets['pin'] = self.pin - if self.puk is not None: + if self.puk is not None: secrets['puk'] = self.puk return {'gsm': secrets} @@ -870,10 +870,10 @@ def load_gsm_connection(): if username and number and apn: settings = SettingsGsm() - settings.gsm.username = username + settings.gsm.username = username settings.gsm.number = number settings.gsm.apn = apn - + secrets = SecretsGsm() secrets.pin = pin secrets.puk = puk diff --git a/src/jarabe/model/olpcmesh.py b/src/jarabe/model/olpcmesh.py index 60f6be4..7873692 100644 --- a/src/jarabe/model/olpcmesh.py +++ b/src/jarabe/model/olpcmesh.py @@ -119,7 +119,7 @@ class OlpcMeshManager(object): def __eth_device_state_changed_cb(self, new_state, old_state, reason): """If a connection is activated on the eth device, stop trying our automatic connections. - + """ self._eth_device_state = new_state self._maybe_schedule_idle_check() diff --git a/src/jarabe/util/emulator.py b/src/jarabe/util/emulator.py index 6a43044..9ab1979 100644 --- a/src/jarabe/util/emulator.py +++ b/src/jarabe/util/emulator.py @@ -36,7 +36,7 @@ default_dimensions = (800, 600) def _run_xephyr(display, dpi, dimensions, fullscreen): cmd = [ 'Xephyr' ] cmd.append(':%d' % display) - cmd.append('-ac') + cmd.append('-ac') cmd += ['-title', _('Sugar in a window')] screen_size = (gtk.gdk.screen_width(), gtk.gdk.screen_height()) |