gnome-settings-daemon r690 - in trunk: . plugins/xrandr

[federico svn gnome org]

Author: federico
Date: Wed Feb  4 00:04:21 2009
New Revision: 690
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=690&view=rev

Log:
RANDR - Use gnome_rr_config_apply_from_filename(), which is the non-deprecated API

2009-02-03  Federico Mena Quintero  <federico novell com>

	* plugins/xrandr/gsd-xrandr-manager.c
	(restore_backup_configuration): Use
	gnome_rr_config_apply_from_filename(), as that's the new,
	non-deprecated API.
	(try_to_apply_intended_configuration): Likewise.
	(apply_intended_configuration): Likewise.
	(apply_stored_configuration_at_startup): Likewise.

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

Modified:
   trunk/ChangeLog
   trunk/plugins/xrandr/gsd-xrandr-manager.c

Modified: trunk/plugins/xrandr/gsd-xrandr-manager.c
==============================================================================
--- trunk/plugins/xrandr/gsd-xrandr-manager.c	(original)
+++ trunk/plugins/xrandr/gsd-xrandr-manager.c	Wed Feb  4 00:04:21 2009
@@ -127,7 +127,7 @@
                 GError *error;
 
                 error = NULL;
-                if (!gnome_rr_config_apply_stored (priv->rw_screen, intended_filename, &error)) {
+                if (!gnome_rr_config_apply_from_filename (priv->rw_screen, intended_filename, &error)) {
                         error_message (manager, _("Could not restore the display's configuration"), error, NULL);
 
                         if (error)
@@ -251,7 +251,7 @@
         backup_filename = gnome_rr_config_get_backup_filename ();
         intended_filename = gnome_rr_config_get_intended_filename ();
 
-        result = gnome_rr_config_apply_stored (priv->rw_screen, intended_filename, error);
+        result = gnome_rr_config_apply_from_filename (priv->rw_screen, intended_filename, error);
         if (!result) {
                 error_message (manager, _("The selected configuration for displays could not be applied"), error ? *error : NULL, NULL);
                 restore_backup_configuration_without_messages (backup_filename, intended_filename);
@@ -1291,7 +1291,7 @@
         GError *my_error;
 
         my_error = NULL;
-        if (!gnome_rr_config_apply_stored (manager->priv->rw_screen, intended_filename, &my_error)) {
+        if (!gnome_rr_config_apply_from_filename (manager->priv->rw_screen, intended_filename, &my_error)) {
                 if (my_error) {
                         if (g_error_matches (my_error, GNOME_RR_ERROR, GNOME_RR_ERROR_NO_MATCHING_CONFIG)) {
                                 /* This is not an error; the user probably
@@ -1325,7 +1325,7 @@
 
         my_error = NULL;
 
-        success = gnome_rr_config_apply_stored (manager->priv->rw_screen, backup_filename, &my_error);
+        success = gnome_rr_config_apply_from_filename (manager->priv->rw_screen, backup_filename, &my_error);
         if (success) {
                 /* The backup configuration existed, and could be applied
                  * successfully, so we must restore it on top of the