Updating branch refs/heads/master
to 21d8017a80ac661c2de75cbe368f692df0878414 (commit)
from 5048172911a6c74305ffe891cd76d513042e8421 (commit)
commit 21d8017a80ac661c2de75cbe368f692df0878414
Author: Stephan Arts <[email protected]>
Date: Mon Sep 5 19:38:53 2011 +0200
Fix multiple-monitor support for xfdesktop-wallpapers (bug #7954)
Make sure the wallpaper can be set on multiple monitors on xfdesktop.
src/xfce_wallpaper_manager.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/xfce_wallpaper_manager.c b/src/xfce_wallpaper_manager.c
index 252e9ef..ce299d1 100644
--- a/src/xfce_wallpaper_manager.c
+++ b/src/xfce_wallpaper_manager.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) Stephan Arts 2009-2010 <[email protected]>
+ * Copyright (c) Stephan Arts 2009-2011 <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -134,11 +134,13 @@ rstto_xfce_wallpaper_manager_configure_dialog_run
(RsttoWallpaperManager *self,
{
gtk_table_attach (GTK_TABLE (prop_table), monitor_label, 0, 1, 1, 2,
0, 0, 0, 0);
gtk_table_attach (GTK_TABLE (prop_table), monitor_combo, 1, 2, 1, 2,
0, 0, 0, 0);
- for (i = 0; i < n_monitors; ++i)
- {
- gtk_combo_box_append_text (GTK_COMBO_BOX (monitor_combo), "1");
- }
}
+ for (i = 0; i < n_monitors; ++i)
+ {
+ gtk_combo_box_append_text (GTK_COMBO_BOX (monitor_combo), "1");
+ }
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (monitor_combo), 0);
manager->priv->screen = gdk_screen_get_number (screen);
@@ -151,7 +153,7 @@ rstto_xfce_wallpaper_manager_configure_dialog_run
(RsttoWallpaperManager *self,
manager->priv->style = gtk_combo_box_get_active (GTK_COMBO_BOX
(style_combo));
manager->priv->saturation = gtk_adjustment_get_value (GTK_ADJUSTMENT
(saturation_adjustment));
manager->priv->brightness = (gint)gtk_adjustment_get_value
(GTK_ADJUSTMENT (brightness_adjustment));
- manager->priv->monitor = 0;
+ manager->priv->monitor = gtk_combo_box_get_active
(GTK_COMBO_BOX(monitor_combo));
}
gtk_widget_destroy (dialog);
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
