From 2898adec48009abad58847d3c2b4d783a7672a3b Mon Sep 17 00:00:00 2001 From: Dario Freddi Date: Sun, 1 Mar 2009 19:22:30 +0100 Subject: [PATCH] Adding the possibility of a custom iwconfig --- wicd/networking.py | 4 ++-- wicd/wicd-daemon.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/wicd/networking.py b/wicd/networking.py index 5f97455..c6b81ba 100644 --- a/wicd/networking.py +++ b/wicd/networking.py @@ -625,7 +625,7 @@ class Wireless(Controller): """ return self.wiface.GetBSSID() - def GetCurrentBitrate(self): + def GetCurrentBitrate(self, iwconfig): """ Get the current bitrate of the interface. Returns: @@ -633,7 +633,7 @@ class Wireless(Controller): None the bitrate can't be found. """ - return self.wiface.GetCurrentBitrate() + return self.wiface.GetCurrentBitrate(iwconfig) def GetIwconfig(self): """ Get the out of iwconfig. """ diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py index ecbf23f..7d75a27 100644 --- a/wicd/wicd-daemon.py +++ b/wicd/wicd-daemon.py @@ -997,8 +997,8 @@ class WirelessDaemon(dbus.service.Object): return self.wifi.GetBSSID() @dbus.service.method('org.wicd.daemon.wireless') - def GetCurrentBitrate(self): - return self.wifi.GetCurrentBitrate() + def GetCurrentBitrate(self, iwconfig): + return self.wifi.GetCurrentBitrate(iwconfig) @dbus.service.method('org.wicd.daemon.wireless') def CreateAdHocNetwork(self, essid, channel, ip, enctype, key, encused, @@ -1130,6 +1130,12 @@ class WirelessDaemon(dbus.service.Object): ip = self.wifi.GetIP(ifconfig) return ip + @dbus.service.method('org.wicd.daemon.wireless') + def GetOperationalMode(self, ifconfig=""): + """ Returns the IP associated with the wireless interface. """ + ip = self.wifi.GetOperationalMode(ifconfig) + return ip + @dbus.service.method('org.wicd.daemon.wireless') def CheckWirelessConnectingMessage(self): """ Returns the wireless interface's status message. """