gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-19 12:28:08 +01:00
Code Issues Projects Releases Wiki Activity

Fixed wireless connecting status message

Browse Source
This commit is contained in:
fox
2011-07-03 19:16:50 +02:00
parent 340725e9a7
commit 92c58eef7f
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/wicd-cli.py
View File

@@ -184,7 +184,7 @@ if options.connect:
wireless.ConnectWireless(options.network) wireless.ConnectWireless(options.network)
check = lambda: wireless.CheckIfWirelessConnecting() check = lambda: wireless.CheckIfWirelessConnecting()
message = lambda: wireless.CheckWirelessConnectingMessage() message = lambda: wireless.CheckWirelessConnectingMessage()[1]
elif options.wired: elif options.wired:
print "Connecting to wired connection on %s" % wired.DetectWiredInterface() print "Connecting to wired connection on %s" % wired.DetectWiredInterface()
wired.ConnectWired() wired.ConnectWired()

9
curses/wicd-curses.py
View File

@@ -733,12 +733,9 @@ class appGUI():
iwconfig = wireless.GetIwconfig() iwconfig = wireless.GetIwconfig()
else: else:
iwconfig = '' iwconfig = ''
# set_status is rigged to return false when it is not essid, stat = wireless.CheckWirelessConnectingMessage()
# connecting to anything, so this should work. return self.set_status("%s: %s" % (essid, language[str(stat)]),
return self.set_status(wireless.GetCurrentNetwork(iwconfig) + True)
': ' +
language[str(wireless.CheckWirelessConnectingMessage())],
True)
if wired_connecting: if wired_connecting:
return self.set_status( language['wired_network'] + return self.set_status( language['wired_network'] +
': ' + ': ' +

5
gtk/gui.py
View File

@@ -446,8 +446,9 @@ class appGui(object):
if self.statusID: if self.statusID:
gobject.idle_add(self.status_bar.remove_message, 1, self.statusID) gobject.idle_add(self.status_bar.remove_message, 1, self.statusID)
if info[0] == "wireless": if info[0] == "wireless":
gobject.idle_add(self.set_status, str(info[1]) + ': ' + essid, stat = wireless.CheckWirelessConnectingMessage()
language[str(wireless.CheckWirelessConnectingMessage())]) gobject.idle_add(self.set_status, "%s: %s" % (essid,
language[str(stat)]))
elif info[0] == "wired": elif info[0] == "wired":
gobject.idle_add(self.set_status, language['wired_network'] + ': ' + gobject.idle_add(self.set_status, language['wired_network'] + ': ' +
language[str(wired.CheckWiredConnectingMessage())]) language[str(wired.CheckWiredConnectingMessage())])

3
wicd/wicd-daemon.py
View File

@@ -1201,8 +1201,9 @@ class WirelessDaemon(dbus.service.Object):
def CheckWirelessConnectingMessage(self): def CheckWirelessConnectingMessage(self):
""" Returns the wireless interface's status message. """ """ Returns the wireless interface's status message. """
if not self.wifi.connecting_thread == None: if not self.wifi.connecting_thread == None:
essid = self.wifi.connecting_thread.network["essid"]
stat = self.wifi.connecting_thread.GetStatus() stat = self.wifi.connecting_thread.GetStatus()
return stat return essid, stat
else: else:
return False return False