1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-20 04:48:00 +01:00

(Try to) Fix mismatch between clients code and DBus API, thanks to Anthony Vital

This commit is contained in:
David Paleino
2011-12-08 22:45:58 +01:00
parent 292db57c97
commit c277831ddc
2 changed files with 2 additions and 3 deletions

View File

@@ -747,7 +747,7 @@ class appGUI():
iwconfig = wireless.GetIwconfig() iwconfig = wireless.GetIwconfig()
else: else:
iwconfig = '' iwconfig = ''
essid = wireless.GetCurrentNetwork() essid = wireless.GetCurrentNetwork(iwconfig)
stat = wireless.CheckWirelessConnectingMessage() 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:

View File

@@ -468,8 +468,7 @@ class appGui(object):
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":
stat = wireless.CheckWirelessConnectingMessage() stat = wireless.CheckWirelessConnectingMessage()
gobject.idle_add(self.set_status, "%s: %s" % \ gobject.idle_add(self.set_status, "%s: %s" % (info[1], stat))
(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())