gnome-desktop r5319 - in trunk/libgnome-desktop: . libgnomeui

[federico svn gnome org]

Author: federico
Date: Thu Dec  4 00:30:40 2008
New Revision: 5319
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5319&view=rev

Log:
Check arguments in gnome_rr_config_save()

Signed-off-by: Federico Mena Quintero <federico novell com>

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

Modified: trunk/libgnome-desktop/gnome-rr-config.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr-config.c	(original)
+++ trunk/libgnome-desktop/gnome-rr-config.c	Thu Dec  4 00:30:40 2008
@@ -1051,14 +1051,19 @@
 
 
 gboolean
-gnome_rr_config_save (GnomeRRConfig *configuration, GError **err)
+gnome_rr_config_save (GnomeRRConfig *configuration, GError **error)
 {
     GnomeRRConfig **configurations;
-    GString *output = g_string_new("");
+    GString *output;
     int i;
     gchar *filename;
     gboolean result;
 
+    g_return_val_if_fail (configuration != NULL, FALSE);
+    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+    output = g_string_new ("");
+
     configurations = configurations_read (NULL); /* NULL-GError */
     
     g_string_append_printf (output, "<monitors version=\"1\">\n");
@@ -1079,7 +1084,7 @@
     g_string_append_printf (output, "</monitors>\n");
 
     filename = get_config_filename ();
-    result = g_file_set_contents (filename, output->str, -1, err);
+    result = g_file_set_contents (filename, output->str, -1, error);
     g_free (filename);
 
     if (result)

Modified: trunk/libgnome-desktop/libgnomeui/gnome-rr-config.h
==============================================================================
--- trunk/libgnome-desktop/libgnomeui/gnome-rr-config.h	(original)
+++ trunk/libgnome-desktop/libgnomeui/gnome-rr-config.h	Thu Dec  4 00:30:40 2008
@@ -81,7 +81,7 @@
 gboolean        gnome_rr_config_equal	     (GnomeRRConfig  *config1,
 					      GnomeRRConfig  *config2);
 gboolean        gnome_rr_config_save         (GnomeRRConfig  *configuration,
-					      GError        **err);
+					      GError        **error);
 void            gnome_rr_config_sanitize     (GnomeRRConfig  *configuration);
 gboolean	gnome_rr_config_apply        (GnomeRRConfig  *configuration,
 					      GnomeRRScreen  *screen,