gnome-lirc-properties r74 - in trunk: . gnome_lirc_properties

[hadess svn gnome org]

Author: hadess
Date: Mon Oct 27 12:49:58 2008
New Revision: 74
URL: http://svn.gnome.org/viewvc/gnome-lirc-properties?rev=74&view=rev

Log:
2008-10-27  Bastien Nocera  <hadess hadess net>

	* gnome_lirc_properties/hardware.py: Fix USB hiddev device (without
	a product or vendor ID) causing backtraces



Modified:
   trunk/ChangeLog
   trunk/gnome_lirc_properties/hardware.py

Modified: trunk/gnome_lirc_properties/hardware.py
==============================================================================
--- trunk/gnome_lirc_properties/hardware.py	(original)
+++ trunk/gnome_lirc_properties/hardware.py	Mon Oct 27 12:49:58 2008
@@ -488,10 +488,13 @@
         for udi in self.__hal.FindDeviceStringMatch('info.subsystem', 'usb_device'):
             device = self.lookup_device(udi)
 
-            if (device['usb_device.vendor_id'] == receiver.vendor_id and
-                device['usb_device.product_id'] == receiver.product_id):
-                return device.find_device_node(receiver.kernel_module,
-                                               receiver.lirc_driver)
+	    try:
+                if (device['usb_device.vendor_id'] == receiver.vendor_id and
+                    device['usb_device.product_id'] == receiver.product_id):
+                    return device.find_device_node(receiver.kernel_module,
+						   receiver.lirc_driver)
+	    except KeyError, key:
+	        continue
 
         return None