From 096d4d40f4479c174c623d3630e9564aec34e0ad Mon Sep 17 00:00:00 2001
From: compwiz18 <>
Date: Thu, 16 Aug 2007 05:55:45 +0000
Subject: [PATCH] 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
---
 daemon.py     | 2 +-
 networking.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemon.py b/daemon.py
index 4e22398..8b5d6fb 100644
--- a/daemon.py
+++ b/daemon.py
@@ -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')
diff --git a/networking.py b/networking.py
index 0591724..c1d41d3 100644
--- a/networking.py
+++ b/networking.py
@@ -287,7 +287,7 @@ class Wireless(Controller):
         The first available wireless interface.
         
         """
-        wnettools.GetWirelessInterfaces()
+        return wnettools.GetWirelessInterfaces()
 
 
     def Disconnect(self):