fixed a couple of bugs:
wnettools.py: DetectWirelessInterfaces() didn't return the wireless interface daemon.py: GetGlobalDNSAddresses() now returns a blank string instead of None for blank addresses; None could not be sent over dbus
This commit is contained in:
1 parent
ccf7960694
commit
096d4d40f4
2 files changed
+2
-2
No files matched your search
@@ -358,7 +358,7 @@ class ConnectionWizard(dbus.service.Object):
|
||||
def GetGlobalDNSAddresses(self):
|
||||
'''returns the global dns addresses'''
|
||||
print 'returning global dns addresses to client'
|
||||
return (self.dns1,self.dns2,self.dns3)
|
||||
return (misc.noneToString(self.dns1),misc.noneToString(self.dns2),misc.noneToString(self.dns3))
|
||||
#end function GetWirelessInterface
|
||||
|
||||
@dbus.service.method('org.wicd.daemon')
|
||||
|
||||
+1
-1
@@ -287,7 +287,7 @@ class Wireless(Controller):
|
||||
The first available wireless interface.
|
||||
|
||||
"""
|
||||
wnettools.GetWirelessInterfaces()
|
||||
return wnettools.GetWirelessInterfaces()
|
||||
|
||||
|
||||
def Disconnect(self):
|
||||
|
||||
Reference in new issue
Block a user