From: Acid Burn <acid-burn@ACIDNET.(none)>
Date: Mon, 9 Nov 2009 16:58:03 +0000 (+0100)
Subject: Merge commit 'origin/bug_175_wlan_connection_problem' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=f1924b0eec8a16f8bc3b4d09f95f8e90dad0d7cb;hp=ab40b0a5518886c7aa94458425bdec90d5430ee9

Merge commit 'origin/bug_175_wlan_connection_problem' into experimental
---

diff --git a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
index 74520dc..9f6a13f 100755
--- a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
@@ -276,8 +276,15 @@ def configStrings(iface):
 		return "	pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -Dralink\n	post-down wpa_cli terminate"
 	if driver == 'madwifi':
 		if config.plugins.wlan.essid.value == "hidden...":
-			return "	pre-up iwconfig "+iface+" essid "+config.plugins.wlan.hiddenessid.value+"\n	pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -dd -Dmadwifi\n	post-down wpa_cli terminate"
-		return "	pre-up iwconfig "+iface+" essid "+config.plugins.wlan.essid.value+"\n	pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -dd -Dmadwifi\n	post-down wpa_cli terminate"
+			if ' ' in config.plugins.wlan.hiddenessid.value:
+				return '	pre-up iwconfig '+iface+' essid "'+config.plugins.wlan.hiddenessid.value+'"\n	pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -Dmadwifi\n	post-down wpa_cli terminate'
+			else:
+				return '	pre-up iwconfig '+iface+' essid '+config.plugins.wlan.hiddenessid.value+'\n	pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -Dmadwifi\n	post-down wpa_cli terminate'
+		else:
+			if ' ' in config.plugins.wlan.essid.value:
+				return '	pre-up iwconfig '+iface+' essid "'+config.plugins.wlan.essid.value+'"\n	pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -Dmadwifi\n	post-down wpa_cli terminate'
+			else:
+				return '	pre-up iwconfig '+iface+' essid '+config.plugins.wlan.essid.value+'\n	pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -Dmadwifi\n	post-down wpa_cli terminate'
 	if driver == 'zydas':
 		return "	pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -dd -Dzydas\n	post-down wpa_cli terminate"