From e9bc53279851db9811e59d9b4ba8e4d088fcd1e7 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <erikos@laptop.pennylane>
Date: Tue, 01 Jun 2010 15:34:27 +0000
Subject: 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.
---
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,
--
cgit v0.9.1