gnome-lirc-properties r32 - in trunk: . gnome_lirc_properties po

[hasselmm svn gnome org]

Author: hasselmm
Date: Sun May 18 20:04:53 2008
New Revision: 32
URL: http://svn.gnome.org/viewvc/gnome-lirc-properties?rev=32&view=rev

Log:
Use configure script to detect the Linux Input Device driver name.

* gnome_lirc_properties/config.py.in:
* configure.ac: Retrieve input driver name from lircd,
  and store that information in config.LIRC_INPUT_DRIVER.
* gnome_lirc_properties/hardware.py
 (HardwareManager._on_device_added()): Use config.LIRC_INPUT_DRIVER
  instead of hard-coded string to configure hot-plugged input devices.

* po/.gitignore: Updated to include *.gmo files.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gnome_lirc_properties/config.py.in
   trunk/gnome_lirc_properties/hardware.py
   trunk/po/.gitignore

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun May 18 20:04:53 2008
@@ -121,6 +121,15 @@
   AC_MSG_WARN([$LIRC_IRRECORD doesn't support the --resume switch. Please grab its sources and apply $patch.])
 fi
 
+dnl find name of input device layer driver
+
+AC_ARG_WITH([devinput_driver],
+            AS_HELP_STRING([--with-devinput-driver],
+                           [The name of the Linux Input Device driver.]),
+            [], [devinput_driver="`lircd --driver=help 2>&1 | sed -ne 's:^\s*\(dev/\?input\)\s*$:\1:p'`"])
+
+AC_SUBST([devinput_driver])
+
 dnl generate files ===
 
 AC_CONFIG_FILES([Makefile

Modified: trunk/gnome_lirc_properties/config.py.in
==============================================================================
--- trunk/gnome_lirc_properties/config.py.in	(original)
+++ trunk/gnome_lirc_properties/config.py.in	Sun May 18 20:04:53 2008
@@ -23,6 +23,8 @@
 LIRC_REMOTES_TARBALL  = path.join(PACKAGE_DIR, 'remotes.tar.gz')
 LIRC_IRRECORD         = '@LIRC_IRRECORD@'
 
+LIRC_INPUT_DRIVER     = '@devinput_driver@'
+
 URI_UPLOADS           = '@with_upload_uri@'
 URI_UPDATES           = '@with_download_uri@'
 

Modified: trunk/gnome_lirc_properties/hardware.py
==============================================================================
--- trunk/gnome_lirc_properties/hardware.py	(original)
+++ trunk/gnome_lirc_properties/hardware.py	Sun May 18 20:04:53 2008
@@ -27,7 +27,7 @@
 
 from ConfigParser          import SafeConfigParser
 from gettext               import gettext as _
-from gnome_lirc_properties import lirc
+from gnome_lirc_properties import config, lirc
 
 HAL_SERVICE = 'org.freedesktop.Hal'
 HAL_MANAGER_PATH = '/org/freedesktop/Hal/Manager'
@@ -255,7 +255,7 @@
 
             properties = {
                 'compatible-remotes': 'linux-input-layer',
-                'lirc-driver': 'devinput',
+                'lirc-driver': config.LIRC_INPUT_DRIVER,
                 'device': device_node,
                 'udi': udi,
             }

Modified: trunk/po/.gitignore
==============================================================================
--- trunk/po/.gitignore	(original)
+++ trunk/po/.gitignore	Sun May 18 20:04:53 2008
@@ -4,3 +4,4 @@
 Makefile.in.in
 stamp-it
 POTFILES
+*.gmo