From 0a35f0989dbc2192d67924e09eda3707ebea2949 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Sat, 11 Apr 2009 22:45:13 -0400 Subject: [PATCH] Fix duplicate GetOperationalMode() methods. Switch misc.get_gettext() to translations.get_gettext() in configscript.py --- wicd/configscript.py | 4 ++-- wicd/wicd-daemon.py | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/wicd/configscript.py b/wicd/configscript.py index bb6fa28..b574d04 100755 --- a/wicd/configscript.py +++ b/wicd/configscript.py @@ -33,10 +33,10 @@ import ConfigParser import gtk.glade from wicd import wpath -from wicd import misc +from wicd import translations from wicd import dbusmanager -_ = misc.get_gettext() +_ = translations.get_gettext() language = {} language['configure_scripts'] = _("Configure Scripts") diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py index e4e26fc..513716b 100644 --- a/wicd/wicd-daemon.py +++ b/wicd/wicd-daemon.py @@ -1138,12 +1138,6 @@ 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. """