gnome-lirc-properties r41 - in trunk: . gnome_lirc_properties gnome_lirc_properties/ui

[hadess svn gnome org]

Author: hadess
Date: Mon Jun 30 16:23:20 2008
New Revision: 41
URL: http://svn.gnome.org/viewvc/gnome-lirc-properties?rev=41&view=rev

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

	* gnome_lirc_properties/backend.py:
	* gnome_lirc_properties/ui/CustomConfiguration.py: Fix a few
	calls to lirc.find_remote_config(), which only returns the
	location of the config file now



Modified:
   trunk/ChangeLog
   trunk/gnome_lirc_properties/backend.py
   trunk/gnome_lirc_properties/ui/CustomConfiguration.py

Modified: trunk/gnome_lirc_properties/backend.py
==============================================================================
--- trunk/gnome_lirc_properties/backend.py	(original)
+++ trunk/gnome_lirc_properties/backend.py	Mon Jun 30 16:23:20 2008
@@ -696,10 +696,9 @@
             self._write_hardware_configuration(remote_values=values)
 
         # Write remote configuration:
-        filename, include_needed = lirc.find_remote_config()
+        filename = lirc.find_remote_config()
 
-        if include_needed:
-            self.__write_include_statement(filename)
+        self.__write_include_statement(filename)
 
         print contents
 

Modified: trunk/gnome_lirc_properties/ui/CustomConfiguration.py
==============================================================================
--- trunk/gnome_lirc_properties/ui/CustomConfiguration.py	(original)
+++ trunk/gnome_lirc_properties/ui/CustomConfiguration.py	Mon Jun 30 16:23:20 2008
@@ -415,7 +415,7 @@
         self.__dialog.set_sensitive(False)
 
         net.post_file(target_uri=config.URI_UPLOADS,
-                      filename=lirc.find_remote_config()[0],
+                      filename=lirc.find_remote_config(),
                       content=self.__remote.configuration,
                       context=_('customized configuration file'),
                       finished_callback=on_upload_finished,