totem r5530 - in trunk: . src/plugins/lirc

[hadess svn gnome org]

Author: hadess
Date: Wed Jul 30 17:22:25 2008
New Revision: 5530
URL: http://svn.gnome.org/viewvc/totem?rev=5530&view=rev

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

	* src/plugins/lirc/totem-lirc.c (impl_activate): Also fail to load
	if we're missing a data file



Modified:
   trunk/ChangeLog
   trunk/src/plugins/lirc/totem-lirc.c

Modified: trunk/src/plugins/lirc/totem-lirc.c
==============================================================================
--- trunk/src/plugins/lirc/totem-lirc.c	(original)
+++ trunk/src/plugins/lirc/totem-lirc.c	Wed Jul 30 17:22:25 2008
@@ -245,15 +245,14 @@
 
 	/* Load the default Totem setup */
 	path = totem_plugin_find_file (plugin, "totem_lirc_default");
-	if (path != NULL) {
-		if (lirc_readconfig (path, &pi->lirc_config, NULL) == -1) {
-			g_set_error (error, TOTEM_PLUGIN_ERROR, TOTEM_PLUGIN_ERROR_ACTIVATION,
-				     _("Couldn't read lirc configuration."));
-			close (fd);
-			return FALSE;
-		}
+	if (path == NULL || lirc_readconfig (path, &pi->lirc_config, NULL) == -1) {
 		g_free (path);
+		g_set_error (error, TOTEM_PLUGIN_ERROR, TOTEM_PLUGIN_ERROR_ACTIVATION,
+			     _("Couldn't read lirc configuration."));
+		close (fd);
+		return FALSE;
 	}
+	g_free (path);
 
 	/* Load the user config, doesn't matter if it's not there */
 	lirc_readconfig (NULL, &pi->lirc_config, NULL);