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 ec0669b8f9b54487f7f3c1e1e354f2cab7d63508
Author: Sean Davis <smd.seanda...@gmail.com>
Date: Mon Oct 8 06:30:32 2018 -0400
Fix Xfdesktop wallpaper integration
---
src/xfce-bg.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 60 insertions(+), 4 deletions(-)
diff --git a/src/xfce-bg.c b/src/xfce-bg.c
index e34ebff..59b497d 100644
--- a/src/xfce-bg.c
+++ b/src/xfce-bg.c
@@ -288,6 +288,57 @@ xfce_bg_load_from_preferences (XfceBG *bg,
queue_changed (bg);
}
+static gboolean
+xfce_bg_check_property_prefix (XfconfChannel *channel,
+ gchar
*prefix)
+{
+ gchar *property;
+
+ property = g_strconcat (prefix, "/last-image", NULL);
+ if (xfconf_channel_has_property (channel, property)) {
+ g_free (property);
+ return TRUE;
+ }
+ g_free (property);
+
+ property = g_strconcat (prefix, "/image-path", NULL);
+ if (xfconf_channel_has_property (channel, property)) {
+ g_free (property);
+ return TRUE;
+ }
+ g_free (property);
+
+ property = g_strconcat (prefix, "/image-style", NULL);
+ if (xfconf_channel_has_property (channel, property)) {
+ g_free (property);
+ return TRUE;
+ }
+ g_free (property);
+
+ property = g_strconcat (prefix, "/rgba1", NULL);
+ if (xfconf_channel_has_property (channel, property)) {
+ g_free (property);
+ return TRUE;
+ }
+ g_free (property);
+
+ property = g_strconcat (prefix, "/rgba2", NULL);
+ if (xfconf_channel_has_property (channel, property)) {
+ g_free (property);
+ return TRUE;
+ }
+ g_free (property);
+
+ property = g_strconcat (prefix, "/color-style", NULL);
+ if (xfconf_channel_has_property (channel, property)) {
+ g_free (property);
+ return TRUE;
+ }
+ g_free (property);
+
+ return FALSE;
+}
+
static gchar*
xfce_bg_get_property_prefix (XfconfChannel *channel,
const gchar
*monitor_name)
@@ -296,14 +347,15 @@ xfce_bg_get_property_prefix (XfconfChannel *channel,
/* Check for workspace usage */
prefix = g_strconcat("/backdrop/screen0/monitor", monitor_name,
"/workspace0", NULL);
- if (xfconf_channel_has_property (channel, prefix)) {
+ if (xfce_bg_check_property_prefix (channel, prefix))
+ {
return prefix;
}
g_free(prefix);
/* Check for non-workspace usage */
prefix = g_strconcat("/backdrop/screen0/monitor", monitor_name, NULL);
- if (xfconf_channel_has_property(channel, prefix))
+ if (xfce_bg_check_property_prefix (channel, prefix))
{
return prefix;
}
@@ -311,7 +363,7 @@ xfce_bg_get_property_prefix (XfconfChannel *channel,
/* Check defaults */
prefix = g_strdup("/backdrop/screen0/monitor0/workspace0");
- if (xfconf_channel_has_property(channel, prefix))
+ if (xfce_bg_check_property_prefix (channel, prefix))
{
return prefix;
}
@@ -362,7 +414,11 @@ xfce_bg_load_from_xfconf (XfceBG *bg,
/* Filename */
g_free(property);
- property = g_strconcat(prop_prefix, "/image-path", NULL);
+ property = g_strconcat(prop_prefix, "/last-image", NULL);
+ if (!xfconf_channel_has_property (channel, property)) {
+ g_free(property);
+ property = g_strconcat(prop_prefix, "/image-path", NULL);
+ }
filename = NULL;
tmp = xfconf_channel_get_string(channel, property,
XFCE_BG_FALLBACK_IMG);
if (tmp && *tmp != '\0') {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
