From 92c58eef7fb0922daaba3164b98b641939cee0ea Mon Sep 17 00:00:00 2001
From: fox <fox1991@gmail.com>
Date: Sun, 3 Jul 2011 19:16:50 +0200
Subject: [PATCH] Fixed wireless connecting status message

---
 cli/wicd-cli.py       | 2 +-
 curses/wicd-curses.py | 9 +++------
 gtk/gui.py            | 5 +++--
 wicd/wicd-daemon.py   | 3 ++-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/cli/wicd-cli.py b/cli/wicd-cli.py
index a7be3d7..117e1fa 100644
--- a/cli/wicd-cli.py
+++ b/cli/wicd-cli.py
@@ -184,7 +184,7 @@ if options.connect:
 		wireless.ConnectWireless(options.network)
 
 		check = lambda: wireless.CheckIfWirelessConnecting()
-		message = lambda: wireless.CheckWirelessConnectingMessage()
+		message = lambda: wireless.CheckWirelessConnectingMessage()[1]
 	elif options.wired:
 		print "Connecting to wired connection on %s" % wired.DetectWiredInterface()
 		wired.ConnectWired()
diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py
index b4a388b..d08b4bc 100755
--- a/curses/wicd-curses.py
+++ b/curses/wicd-curses.py
@@ -733,12 +733,9 @@ class appGUI():
                 iwconfig = wireless.GetIwconfig()
             else:
                 iwconfig = ''
-            # set_status is rigged to return false when it is not
-            # connecting to anything, so this should work.
-            return self.set_status(wireless.GetCurrentNetwork(iwconfig) +
-                    ': ' +
-                    language[str(wireless.CheckWirelessConnectingMessage())],
-                    True)
+            essid, stat = wireless.CheckWirelessConnectingMessage()
+            return self.set_status("%s: %s" % (essid, language[str(stat)]),
+                                   True)
         if wired_connecting:
             return self.set_status( language['wired_network'] +
                     ': ' +
diff --git a/gtk/gui.py b/gtk/gui.py
index 9027f2b..318278f 100644
--- a/gtk/gui.py
+++ b/gtk/gui.py
@@ -446,8 +446,9 @@ class appGui(object):
         if self.statusID:
             gobject.idle_add(self.status_bar.remove_message, 1, self.statusID)
         if info[0] == "wireless":
-            gobject.idle_add(self.set_status, str(info[1]) + ': ' +
-                   language[str(wireless.CheckWirelessConnectingMessage())])
+            essid, stat = wireless.CheckWirelessConnectingMessage()
+            gobject.idle_add(self.set_status, "%s: %s" % (essid,
+                                                          language[str(stat)]))
         elif info[0] == "wired":
             gobject.idle_add(self.set_status, language['wired_network'] + ': ' +
                          language[str(wired.CheckWiredConnectingMessage())])
diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py
index 6d8b149..4c6f1c7 100644
--- a/wicd/wicd-daemon.py
+++ b/wicd/wicd-daemon.py
@@ -1201,8 +1201,9 @@ class WirelessDaemon(dbus.service.Object):
     def CheckWirelessConnectingMessage(self):
         """ Returns the wireless interface's status message. """
         if not self.wifi.connecting_thread == None:
+            essid = self.wifi.connecting_thread.network["essid"]
             stat = self.wifi.connecting_thread.GetStatus()
-            return stat
+            return essid, stat
         else:
             return False