From c277831ddcc76d4c7ce69eb69c887d5f108bc18a Mon Sep 17 00:00:00 2001 From: David Paleino Date: Thu, 8 Dec 2011 22:45:58 +0100 Subject: [PATCH] (Try to) Fix mismatch between clients code and DBus API, thanks to Anthony Vital --- curses/wicd-curses.py | 2 +- gtk/gui.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py index 8f03c66..e5e1326 100755 --- a/curses/wicd-curses.py +++ b/curses/wicd-curses.py @@ -747,7 +747,7 @@ class appGUI(): iwconfig = wireless.GetIwconfig() else: iwconfig = '' - essid = wireless.GetCurrentNetwork() + essid = wireless.GetCurrentNetwork(iwconfig) stat = wireless.CheckWirelessConnectingMessage() return self.set_status("%s: %s" % (essid, stat), True) if wired_connecting: diff --git a/gtk/gui.py b/gtk/gui.py index 9c138a5..bcc768f 100644 --- a/gtk/gui.py +++ b/gtk/gui.py @@ -468,8 +468,7 @@ class appGui(object): gobject.idle_add(self.status_bar.remove_message, 1, self.statusID) if info[0] == "wireless": stat = wireless.CheckWirelessConnectingMessage() - gobject.idle_add(self.set_status, "%s: %s" % \ - (wireless.GetCurrentNetwork(), stat)) + gobject.idle_add(self.set_status, "%s: %s" % (info[1], stat)) elif info[0] == "wired": gobject.idle_add(self.set_status, _('Wired Network') + ': ' \ + wired.CheckWiredConnectingMessage())