diff options
| author | lukefromdc <[email protected]> | 2016-07-23 22:12:07 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-07-23 22:12:07 -0400 |
| commit | 09a27ea066cf2ec09d5312e52714303873c35915 (patch) | |
| tree | 70687bd211eff716dda13b83b56de2327cbdbe9b | |
| parent | f422500d641037778ef8120d7b734080fb31e6cf (diff) | |
| download | mate-settings-daemon-09a27ea066cf2ec09d5312e52714303873c35915.tar.bz2 mate-settings-daemon-09a27ea066cf2ec09d5312e52714303873c35915.tar.xz | |
GTK 3.21: Fix caja startup background
Make sure m-s-d knows to draw the background unconditionally when used with transparent version of Caja for GTK 3.21.3 or later
| -rw-r--r-- | plugins/background/msd-background-manager.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index 586589b..0b02e73 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -218,9 +218,10 @@ draw_background (MsdBackgroundManager *manager, { MsdBackgroundManagerPrivate *p = manager->priv; +#if !GTK_CHECK_VERSION(3, 21, 0) if (!p->msd_can_draw || p->draw_in_progress || caja_is_drawing_bg (manager)) return; - +#endif mate_settings_profile_start (NULL); GdkDisplay *display = gdk_display_get_default (); @@ -402,7 +403,7 @@ on_bg_handling_changed (GSettings *settings, MsdBackgroundManagerPrivate *p = manager->priv; mate_settings_profile_start (NULL); - +#if !GTK_CHECK_VERSION(3, 21, 0) if (caja_is_drawing_bg (manager)) { if (p->bg != NULL) @@ -410,9 +411,11 @@ on_bg_handling_changed (GSettings *settings, } else if (p->msd_can_draw && p->bg == NULL) { +#endif setup_background (manager); +#if !GTK_CHECK_VERSION(3, 21, 0) } - +#endif mate_settings_profile_end (NULL); } |