From bc7cd6c4089a2c41f6f6a69d6a29ecdb76ce052b Mon Sep 17 00:00:00 2001 From: Bryan Clark Date: Mon, 30 Aug 2004 04:20:09 +0000 Subject: [PATCH] 2004-08-30 Bryan Clark * examples/python/NetworkManager.py: Bug fixes to the code so we get all the device information that we need in get_device() * examples/python/NMTester.py: Fixed _print_device_list to print_device_list git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@107 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 9 +++++++++ examples/python/NMTester.py | 2 +- examples/python/NetworkManager.py | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19c9361fc6..6740008906 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-08-30 Bryan Clark + + * examples/python/NetworkManager.py: + Bug fixes to the code so we get all the device information + that we need in get_device() + + * examples/python/NMTester.py: + Fixed _print_device_list to print_device_list + 2004-08-29 Seth Nickell * configure.in: diff --git a/examples/python/NMTester.py b/examples/python/NMTester.py index 778a418dc2..3eb54dfcf9 100755 --- a/examples/python/NMTester.py +++ b/examples/python/NMTester.py @@ -30,7 +30,7 @@ class NMTester(NetworkManager): def nm_signal_handler(self, interface, signal_name, service, path, message): - self._print_device_list() + self.print_device_list() def nmi_signal_handler(self, interface, signal_name, service, path, message): diff --git a/examples/python/NetworkManager.py b/examples/python/NetworkManager.py index 0628abb7e2..143673a0fe 100755 --- a/examples/python/NetworkManager.py +++ b/examples/python/NetworkManager.py @@ -102,14 +102,14 @@ class NetworkManager: if device in self.__devices: for k,v in d.iteritems(): - self.__devices[device][k] = [v] - return d + self.__devices[device][k] = v + return self.__devices[device] else: hal = self._get_hal_info(d["nm.udi"]) for k,v in hal.iteritems(): d[k] = v self.__devices[device] = d - return d + return self.__devices[device] except: return None