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

[hadess svn gnome org]

Author: hadess
Date: Mon Jun 30 14:17:03 2008
New Revision: 40
URL: http://svn.gnome.org/viewvc/gnome-lirc-properties?rev=40&view=rev

Log:
2008-06-30  Bastien Nocera  <hadess hadess net>

	* configure.ac: Remove "--resume" check
	* gnome_lirc_properties/backend.py: Remove use of the "--resume"
	flag for irrecord flags, as irrecord correctly resumes sessions
	from lirc 0.8.4 onwards (Closes: #536811)



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gnome_lirc_properties/backend.py

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Jun 30 14:17:03 2008
@@ -142,17 +142,6 @@
 AC_ARG_VAR([LIRC_IRRECORD], [path of the irrecord program])
 AC_SUBST([LIRC_IRRECORD])
 
-AC_MSG_CHECKING([if irrecord supports repeative key lerning])
-if "$LIRC_IRRECORD" --help | grep -wq  -- --resume
-then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-
-  patch=`ls "${srcdir}/patches/"*resume*irrecord*`
-  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],

Modified: trunk/gnome_lirc_properties/backend.py
==============================================================================
--- trunk/gnome_lirc_properties/backend.py	(original)
+++ trunk/gnome_lirc_properties/backend.py	Mon Jun 30 14:17:03 2008
@@ -476,20 +476,7 @@
         return None
 
     def _spawn_external_tool(self):
-        '''Runs irrecord with --resume switch when supported.'''
-        irrecord = os.popen('%s --help' % config.LIRC_IRRECORD)
-
-        if -1 == irrecord.read().find('--resume'):
-            logging.warning('irrecord doesn\'t have --resume switch')
-
-            self.ReportFailure(_(
-                'The installed lirc does not support key code learning ' +
-                'because its irrecord command does not have the --resume ' +
-                'option. Please file a bug against your Linux distribution.'))
-
-            return 0, -1
-
-        self._cmdargs.insert(1, '--resume')
+        '''Runs irrecord.'''
         return super(LearnKeyCodeDriver, self)._spawn_external_tool()
 
 class BackendService(PolicyKitService):