hal/tools/device-manager DeviceManager.py, 1.10, 1.11 LibGladeApplication.py, 1.1, 1.2 hal-device-manager, 1.3, 1.4

[David Zeuthen]

Update of /cvs/hal/hal/tools/device-manager
In directory pdx:/tmp/cvs-serv6555/tools/device-manager

Modified Files:
	DeviceManager.py LibGladeApplication.py hal-device-manager 
Log Message:
2004-07-14  David Zeuthen  <david at fubar.dk>

	Patch from Sjoerd Simons <sjoerd at luon.net>

	* tools/device-manager/DeviceManager.py:
	* tools/device-manager/LibGladeApplication.py:
	* tools/device-manager/hal-device-manager:
	Attached patch makes hal-device-manager shows the error about hald
	not running in a gtk messagedialog instead of on the
	console. Which ensures that when running it from the menu you see
	more then just a flash if hald isn't running :) Also it changes
	some deprecated functions to use their non-deprecated counterparts



Index: DeviceManager.py
===================================================================
RCS file: /cvs/hal/hal/tools/device-manager/DeviceManager.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- DeviceManager.py	12 Apr 2004 21:25:39 -0000	1.10
+++ DeviceManager.py	14 Jul 2004 20:14:30 -0000	1.11
@@ -56,7 +56,12 @@
         try:
             device_names = self.hal_manager.GetAllDevices()
         except:
-            sys.exit("Could not get device list. Make sure hald is running")
+            dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, 
+                                       gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE,
+                                       "Could not get device list. "
+                                       "Make sure hald is running!")
+            dialog.run()
+            sys.exit(1)
 
         for name in device_names:
             self.bus.add_signal_receiver(self.device_changed,

Index: LibGladeApplication.py
===================================================================
RCS file: /cvs/hal/hal/tools/device-manager/LibGladeApplication.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LibGladeApplication.py	3 Dec 2003 01:52:34 -0000	1.1
+++ LibGladeApplication.py	14 Jul 2004 20:14:30 -0000	1.2
@@ -62,4 +62,4 @@
 
     def on_quit_activate(self, *args):
         """Ignore args and call gtk.mainquit()."""
-        gtk.mainquit()
+        gtk.main_quit()

Index: hal-device-manager
===================================================================
RCS file: /cvs/hal/hal/tools/device-manager/hal-device-manager,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hal-device-manager	13 Jan 2004 22:18:46 -0000	1.3
+++ hal-device-manager	14 Jul 2004 20:14:30 -0000	1.4
@@ -13,4 +13,4 @@
 
 gnome.program_init(Const.NAME, Const.VERSION)
 DeviceManager()
-gtk.mainloop()
+gtk.main()