[gnome-settings-daemon] background: drop duplicate gnome_bg_load_from_preferences call

[Ray Strode <halfline src gnome org>]

commit c9d62bab8acb166aa720fa5d0356657177be6be5
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Thu Dec 2 14:33:17 2010 -0500

    background: drop duplicate gnome_bg_load_from_preferences call
    
    setup_bg calls gnome_bg_load_from_preferences before returning,
    so there's no need to call it in background_changed if setup_bg
    gets called first.

 plugins/background/gsd-background-manager.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/plugins/background/gsd-background-manager.c b/plugins/background/gsd-background-manager.c
index 071eb85..9d42449 100644
--- a/plugins/background/gsd-background-manager.c
+++ b/plugins/background/gsd-background-manager.c
@@ -225,9 +225,10 @@ background_changed (GsdBackgroundManager *manager,
         if (!nautilus_is_running () || !show_desktop_icons) {
                 if (manager->priv->bg == NULL) {
                         setup_bg (manager);
+                } else {
+                        gnome_bg_load_from_preferences (manager->priv->bg,
+                                                        manager->priv->settings);
                 }
-                gnome_bg_load_from_preferences (manager->priv->bg,
-                                                manager->priv->settings);
                 draw_background (manager, use_crossfade);
         }
 }