diff options
| author | Clement Lefebvre <[email protected]> | 2017-05-02 11:53:26 +0100 |
|---|---|---|
| committer | monsta <[email protected]> | 2017-05-03 21:38:35 +0300 |
| commit | f78a8c04e607d1f68f9098791d3907add3098a09 (patch) | |
| tree | dc1a5ce1e81f45f5958d77b155e67a33de68737b /src | |
| parent | ecfc8ea6267f5cf87243b9ce8053060b17218d8a (diff) | |
| download | caja-f78a8c04e607d1f68f9098791d3907add3098a09.tar.bz2 caja-f78a8c04e607d1f68f9098791d3907add3098a09.tar.xz | |
CSS: Load a different caja-desktop.css with GTK 3.14
In caja-desktop.css this line isn't compatible with GTK 3.14:
".caja-desktop:not(:selected):not(:active):not(.rubberband){"
It is needed for GTK 3.20/3.22 tough.
This PR checks the GTK version and loads the appropriate CSS.
This fixes desktop icons showing black text. That issue was
reproduced with Adwaita under LMDE with GTK 3.14.
Diffstat (limited to 'src')
| -rw-r--r-- | src/caja-application.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/caja-application.c b/src/caja-application.c index 513c9410..97fe138c 100644 --- a/src/caja-application.c +++ b/src/caja-application.c @@ -2226,8 +2226,12 @@ init_icons_and_styles (void) /* add our desktop CSS provider, ensures the desktop background does not get covered */ provider = gtk_css_provider_new (); - gtk_css_provider_load_from_path (provider, - CAJA_DATADIR G_DIR_SEPARATOR_S "caja-desktop.css", &error); + +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_css_provider_load_from_path (provider, CAJA_DATADIR G_DIR_SEPARATOR_S "caja-desktop.css", &error); +#else + gtk_css_provider_load_from_path (provider, CAJA_DATADIR G_DIR_SEPARATOR_S "caja-desktop-3.14.css", &error); +#endif if (error != NULL) { g_warning ("Can't parse Caja' CSS custom description: %s\n", error->message); |