hal: Branch 'master'

[Danny Kukawka]

 tools/device-manager/DeviceManager.py |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

New commits:
diff-tree 81dccee799c57a6507321459cb08244db37a8e8d (from 66bc00e332f4c99576d6c05c7cf5e9ad1d321404)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Mar 26 22:00:12 2007 +0200

    void hal-device-manager to open multiple about dialogs
    
    A quick-and-dirty patch for hal-device-manager to avoid open multiple 'About'
    dialogs. This fix also fd.o bug #9592.

diff --git a/tools/device-manager/DeviceManager.py b/tools/device-manager/DeviceManager.py
index 3477b64..914f183 100644
--- a/tools/device-manager/DeviceManager.py
+++ b/tools/device-manager/DeviceManager.py
@@ -29,8 +29,12 @@ class DeviceManager(LibGladeApplication)
 
     def on_about_activate(self, w):
         """Show the about dialog."""
-        gnome.ui.About(Const.NAME_LONG, Const.VERSION, Const.COPYRIGHT,
-                       Const.INFO, Const.AUTHORS).show()
+    	try:
+            self.about.destroy()
+        finally:
+            self.about = gnome.ui.About(Const.NAME_LONG, Const.VERSION, Const.COPYRIGHT,
+                                        Const.INFO, Const.AUTHORS).show()
+            self.about.show()
 
     def on_virtual_devices_activate(self, obj):
         self.dont_show_virtual = 1 - self.dont_show_virtual