diff options
| author | Federico Mena Quintero <federico@novell.com> | 2009-02-04 00:04:21 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2009-02-04 00:04:21 +0000 |
| commit | 769b1499e1ca8da88bfee7a27f6e834ff0f4f269 (patch) | |
| tree | d33d9d3c75b30a5461e6273e381e4359031af8a8 | |
| parent | 0412098492d39135b4b6afd4734e1aa532633190 (diff) | |
| download | gnome-settings-daemon-769b1499e1ca8da88bfee7a27f6e834ff0f4f269.tar.gz | |
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>
svn path=/trunk/; revision=690
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | plugins/xrandr/gsd-xrandr-manager.c | 8 |
2 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,13 @@ +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. + 2009-02-01 Frederic Peters <fpeters@0d.be> * plugins/housekeeping/Makefile.am: diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c index e5cca731..1429a111 100644 --- a/plugins/xrandr/gsd-xrandr-manager.c +++ b/plugins/xrandr/gsd-xrandr-manager.c @@ -127,7 +127,7 @@ restore_backup_configuration (GsdXrandrManager *manager, const char *backup_file 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 @@ try_to_apply_intended_configuration (GsdXrandrManager *manager, GError **error) 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 @@ apply_intended_configuration (GsdXrandrManager *manager, const char *intended_fi 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 @@ apply_stored_configuration_at_startup (GsdXrandrManager *manager) 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 |