[Xfce4-commits] <ristretto:master> Preserve the selected style when the monitor changes.

[Stephan Arts]

Updating branch refs/heads/master
         to 2923174c4b9c1417c96d35039c0d02634faa6ffb (commit)
       from 1355e8ff7d20c0b8f278415c34596388d0f59e79 (commit)

commit 2923174c4b9c1417c96d35039c0d02634faa6ffb
Author: Stephan Arts <stephan at xfce.org>
Date:   Fri Sep 16 09:43:55 2011 +0200

    Preserve the selected style when the monitor changes.

 src/xfce_wallpaper_manager.c |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/xfce_wallpaper_manager.c b/src/xfce_wallpaper_manager.c
index 9eb490b..82668c8 100644
--- a/src/xfce_wallpaper_manager.c
+++ b/src/xfce_wallpaper_manager.c
@@ -583,8 +583,12 @@ cb_monitor_chooser_changed (
         RsttoXfceWallpaperManager *manager)
 {
     gint monitor_id;
+    RsttoMonitorStyle style;
 
     monitor_id = rstto_monitor_chooser_get_selected (monitor_chooser);
+    style = gtk_combo_box_get_active (
+            GTK_COMBO_BOX(manager->priv->style_combo));
+
     rstto_monitor_chooser_set_pixbuf (
             monitor_chooser,
             manager->priv->monitor,
@@ -592,14 +596,20 @@ cb_monitor_chooser_changed (
             NULL);
 
     rstto_monitor_chooser_set_pixbuf (
-        RSTTO_MONITOR_CHOOSER(manager->priv->monitor_chooser),
-        monitor_id,
-        gdk_pixbuf_new_from_file_at_size(
-            g_file_get_path(manager->priv->file),
-            500,
-            500,
-            NULL),
-        NULL);
+            RSTTO_MONITOR_CHOOSER(manager->priv->monitor_chooser),
+            monitor_id,
+            gdk_pixbuf_new_from_file_at_size(
+                g_file_get_path(manager->priv->file),
+                500,
+                500,
+                NULL),
+            NULL);
+
+    rstto_monitor_chooser_set_style (
+            RSTTO_MONITOR_CHOOSER(manager->priv->monitor_chooser),
+            monitor_id,
+            style);
+        
 
     manager->priv->monitor = monitor_id;
 }