From 3890cb055e106d4d682a5c32dd1111c35c9b1f9b Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Fri, 10 Jul 2009 10:39:03 +0000
Subject: Don't save the adhoc networks to the config file

---
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index abbdaa6..5e3658c 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -1,4 +1,5 @@
 # Copyright (C) 2006-2007 Red Hat, Inc.
+# Copyright (C) 2009 Tomeu Vizoso, Simon Schampijer
 #
 # 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
@@ -46,6 +47,7 @@ from jarabe.model import bundleregistry
 from jarabe.model import network
 from jarabe.model import shell
 from jarabe.model.network import Settings
+from jarabe.model.network import IP4Config
 from jarabe.model.network import WirelessSecurity
 
 _NM_SERVICE = 'org.freedesktop.NetworkManager'
@@ -228,7 +230,8 @@ class AccessPointView(CanvasPulsingIcon):
         if state == network.DEVICE_STATE_ACTIVATED:
             connection = network.find_connection(self._name)
             if connection:
-                connection.set_connected()
+                if self._mode == network.NM_802_11_MODE_INFRA:
+                    connection.set_connected()
 
             icon_name = '%s-connected' % _ICON_NAME
         else:
@@ -357,6 +360,9 @@ class AccessPointView(CanvasPulsingIcon):
                 settings.wireless.mode = 'infrastructure'
             elif self._mode == network.NM_802_11_MODE_ADHOC:
                 settings.wireless.mode = 'adhoc'
+                settings.wireless.band = 'bg'
+                settings.ip4_config = IP4Config()
+                settings.ip4_config.method = 'shared'
 
             wireless_security = self._get_security()
             settings.wireless_security = wireless_security
diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py
index 1876f97..2607005 100644
--- a/src/jarabe/model/network.py
+++ b/src/jarabe/model/network.py
@@ -1,4 +1,5 @@
 # Copyright (C) 2008 Red Hat, Inc.
+# Copyright (C) 2009 Tomeu Vizoso, Simon Schampijer
 #
 # 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
@@ -263,15 +264,11 @@ class NMSettingsConnection(dbus.service.Object):
             config.set(identifier, 'type', self._settings.connection.type)
             config.set(identifier, 'ssid', self._settings.wireless.ssid)
             config.set(identifier, 'uuid', self._settings.connection.uuid)
-            config.set(identifier, 'mode', self._settings.wireless.mode)
             config.set(identifier, 'autoconnect', 
                        self._settings.connection.autoconnect)
             if self._settings.connection.timestamp is not None:
                 config.set(identifier, 'timestamp', 
                            self._settings.connection.timestamp)
-            if self._settings.wireless.band is not None:
-                config.set(identifier, 'band', 
-                           self._settings.wireless.band)
             if self._settings.wireless_security is not None:
                 if self._settings.wireless_security.key_mgmt is not None:
                     config.set(identifier, 'key-mgmt',
@@ -288,10 +285,6 @@ class NMSettingsConnection(dbus.service.Object):
                 if self._settings.wireless.security is not None:
                     config.set(identifier, 'security',
                                self._settings.wireless.security)
-            if self._settings.ip4_config is not None:
-                if self._settings.ip4_config.method is not None:
-                    config.set(identifier, 'method', 
-                               self._settings.ip4_config.method)
             if self._secrets is not None:
                 if self._settings.wireless_security.key_mgmt == 'none':
                     config.set(identifier, 'key', self._secrets.wep_key)
@@ -388,8 +381,6 @@ def load_connections():
             settings.connection.uuid = uuid
             nmtype = config.get(section, 'type')
             settings.connection.type = nmtype
-            mode = config.get(section, 'mode')
-            settings.wireless.mode = mode
             autoconnect = bool(config.get(section, 'autoconnect'))
             settings.connection.autoconnect = autoconnect
 
@@ -397,15 +388,6 @@ def load_connections():
                 timestamp = int(config.get(section, 'timestamp'))
                 settings.connection.timestamp = timestamp
 
-            if config.has_option(section, 'band'):
-                band = config.get(section, 'band')
-                settings.wireless.band = band
-
-            if config.has_option(section, 'method'):
-                method = config.get(section, 'method')
-                settings.ip4_config = IP4Config()
-                settings.ip4_config.method = method
-
             secrets = None
             if config.has_option(section, 'key-mgmt'):
                 secrets = Secrets()
--
cgit v0.9.1