[Xfce4-commits] [apps/xfce4-screensaver] 01/01: Fix color property pulling, support background filename with no placement (bug #14769)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 341d377055671b4de087e0748a39b9a9d1e22494
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Thu Oct 25 05:51:16 2018 -0400

    Fix color property pulling, support background filename with no placement (bug #14769)
---
 src/xfce-bg.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/xfce-bg.c b/src/xfce-bg.c
index 3204f1d..732422f 100644
--- a/src/xfce-bg.c
+++ b/src/xfce-bg.c
@@ -390,7 +390,6 @@ xfce_bg_load_from_xfconf (XfceBG        *bg,
     gchar           *property;
 
     g_return_if_fail(XFCE_IS_BG(bg));
-    //g_return_if_fail (G_IS_SETTINGS (settings));
 
     if (monitor == NULL)
     {
@@ -453,16 +452,16 @@ xfce_bg_load_from_xfconf (XfceBG        *bg,
 
     /* Colors */
     g_free(property);
-    property = g_strconcat(prop_prefix, "/workspace0/rgba1", NULL);
+    property = g_strconcat(prop_prefix, "/rgba1", NULL);
     color_from_array(channel, property, &c1);
 
     g_free(property);
-    property = g_strconcat(prop_prefix, "/workspace0/rgba2", NULL);
+    property = g_strconcat(prop_prefix, "/rgba2", NULL);
     color_from_array(channel, property, &c2);
 
     /* Color type */
     g_free(property);
-    property = g_strconcat(prop_prefix, "/workspace0/color-style", NULL);
+    property = g_strconcat(prop_prefix, "/color-style", NULL);
     ctype = xfconf_channel_get_int(channel, property, XFCE_BG_COLOR_SOLID);
 
     g_free(property);
@@ -976,7 +975,7 @@ xfce_bg_draw (XfceBG    *bg,
         return;
 
     draw_color (bg, dest);
-    if (bg->filename) {
+    if (bg->filename && bg->placement != XFCE_BG_PLACEMENT_NONE) {
         draw_once (bg, dest);
     }
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.