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

Revert 576: it was properly fixed in 640

Browse Source
This commit is contained in:
David Paleino
2011-11-14 09:29:45 +01:00
parent 5963971a1a
commit 2f651538dc
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/wicd-cli.py
View File

@@ -189,8 +189,8 @@ if options.connect:
wireless.ConnectWireless(options.network) wireless.ConnectWireless(options.network)
check = lambda: wireless.CheckIfWirelessConnecting() check = lambda: wireless.CheckIfWirelessConnecting()
status = lambda: wireless.CheckWirelessConnectingStatus()[1] status = lambda: wireless.CheckWirelessConnectingStatus()
message = lambda: wireless.CheckWirelessConnectingMessage()[1] message = lambda: wireless.CheckWirelessConnectingMessage()
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()

3
curses/wicd-curses.py
View File

@@ -747,7 +747,8 @@ class appGUI():
iwconfig = wireless.GetIwconfig() iwconfig = wireless.GetIwconfig()
else: else:
iwconfig = '' iwconfig = ''
essid, stat = wireless.CheckWirelessConnectingMessage() essid = wireless.GetCurrentNetwork()
stat = wireless.CheckWirelessConnectingMessage()
return self.set_status("%s: %s" % (essid, stat), True) return self.set_status("%s: %s" % (essid, stat), True)
if wired_connecting: if wired_connecting:
return self.set_status(_('Wired Network') + return self.set_status(_('Wired Network') +

5
gtk/gui.py
View File

@@ -467,8 +467,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":
essid, stat = wireless.CheckWirelessConnectingMessage() stat = wireless.CheckWirelessConnectingMessage()
gobject.idle_add(self.set_status, "%s: %s" % (essid, stat)) gobject.idle_add(self.set_status, "%s: %s" % \
(wireless.GetCurrentNetwork(), stat))
elif info[0] == "wired": elif info[0] == "wired":
gobject.idle_add(self.set_status, _('Wired Network') + ': ' \ gobject.idle_add(self.set_status, _('Wired Network') + ': ' \
+ wired.CheckWiredConnectingMessage()) + wired.CheckWiredConnectingMessage())

7
wicd/wicd-daemon.py
View File

@@ -1179,9 +1179,8 @@ class WirelessDaemon(dbus.service.Object):
def CheckWirelessConnectingStatus(self): def CheckWirelessConnectingStatus(self):
""" Returns the wireless interface's status code. """ """ Returns the wireless interface's status code. """
if self.wifi.connecting_thread: if self.wifi.connecting_thread:
essid = self.wifi.connecting_thread.network["essid"]
stat = self.wifi.connecting_thread.GetStatus() stat = self.wifi.connecting_thread.GetStatus()
return essid, stat return stat
else: else:
return False return False
@@ -1189,8 +1188,8 @@ 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 self.wifi.connecting_thread: if self.wifi.connecting_thread:
essid, stat = self.CheckWirelessConnectingStatus() stat = self.CheckWirelessConnectingStatus()
return essid, _status_dict[stat] return _status_dict[stat]
else: else:
return False return False