Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <erikos@laptop.pennylane>2010-06-01 15:34:27 (GMT)
committer Simon Schampijer <erikos@laptop.pennylane>2010-06-01 15:34:27 (GMT)
commite9bc53279851db9811e59d9b4ba8e4d088fcd1e7 (patch)
tree0fe3dd639029409a63155cb566a1652e58dcc56a
parent17b1a4a54cb75b1305bb6e438e9b51eed432e96b (diff)
Does not automatically connect to wifi network at startup anymore #1883
The mesh support tried to connect to a mesh network automatically, even though there was a connection set in the configuration.
-rw-r--r--src/jarabe/model/olpcmesh.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/jarabe/model/olpcmesh.py b/src/jarabe/model/olpcmesh.py
index 7215d53..60f6be4 100644
--- a/src/jarabe/model/olpcmesh.py
+++ b/src/jarabe/model/olpcmesh.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 One Laptop per Child
+# Copyright (C) 2009, 2010 One Laptop per Child
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -83,9 +83,9 @@ class OlpcMeshManager(object):
self._eth_device_state = DEVICE_STATE_UNKNOWN
if self._have_configured_connections():
- self._start_automesh()
- else:
self._start_automesh_timer()
+ else:
+ self._start_automesh()
def _get_companion_device(self):
props = dbus.Interface(self.mesh_device,