summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-12-03 03:53:33 +0200
committerJasmine Hassan <[email protected]>2012-12-03 03:57:37 +0200
commit75003d6304a61488a1737733c423fd120e4bbb48 (patch)
treebefb5d9e7d5fd5a0de6204ab17ded5b2c768e124 /plugins
parentd4fa668e674bbf38054aa8573539892738a1815d (diff)
downloadmate-settings-daemon-75003d6304a61488a1737733c423fd120e4bbb48.tar.bz2
mate-settings-daemon-75003d6304a61488a1737733c423fd120e4bbb48.tar.xz
[background] Also check if caja is drawing bg when detecting settings changes
hopefully to avoid taking over background-drawing when Caja is doing it.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/background/msd-background-manager.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c
index c98a225..b347c53 100644
--- a/plugins/background/msd-background-manager.c
+++ b/plugins/background/msd-background-manager.c
@@ -473,8 +473,11 @@ background_handling_changed (GSettings *settings,
const char *key,
MsdBackgroundManager *manager)
{
- if (dont_draw_background (manager) == FALSE)
- queue_timeout (manager);
+ if (!dont_draw_background (manager) &&
+ !caja_is_drawing_background (manager))
+ {
+ queue_timeout (manager);
+ }
}
gboolean