gnome-desktop r5140 - trunk/libgnome-desktop

[ssp svn gnome org]

Author: ssp
Date: Tue Jul 15 22:49:07 2008
New Revision: 5140
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5140&view=rev

Log:
+Tue Jul 15 18:41:27 2008  Soren Sandmann  <sandmann redhat com>
+
+	* gnome-rr-config.c: Fix error handling in configurations_read(). 
+



Modified:
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/gnome-rr-config.c

Modified: trunk/libgnome-desktop/gnome-rr-config.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr-config.c	(original)
+++ trunk/libgnome-desktop/gnome-rr-config.c	Tue Jul 15 22:49:07 2008
@@ -430,23 +430,27 @@
     filename = get_config_filename ();
 
     err = NULL;
+    
     configs = configurations_read_from_file (filename, &err);
 
     g_free (filename);
 
-    if (g_error_matches (err, G_FILE_ERROR, G_FILE_ERROR_NOENT))
+    if (err)
     {
-	g_error_free (err);
-
-	/* Okay, so try the old configuration file */
-	filename = get_old_config_filename ();
-	configs = configurations_read_from_file (filename, error);
-	g_free (filename);
-
-	return configs;
+	if (g_error_matches (err, G_FILE_ERROR, G_FILE_ERROR_NOENT))
+	{
+	    g_error_free (err);
+	    
+	    /* Okay, so try the old configuration file */
+	    filename = get_old_config_filename ();
+	    configs = configurations_read_from_file (filename, error);
+	    g_free (filename);
+	}
+	else
+	{
+	    g_propagate_error (error, err);
+	}
     }
-
-    g_propagate_error (error, err);
     return configs;
 }