From 75003d6304a61488a1737733c423fd120e4bbb48 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 3 Dec 2012 03:53:33 +0200 Subject: [background] Also check if caja is drawing bg when detecting settings changes hopefully to avoid taking over background-drawing when Caja is doing it. --- plugins/background/msd-background-manager.c | 7 +++++-- 1 file 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 -- cgit v1.2.1