From f78a8c04e607d1f68f9098791d3907add3098a09 Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Tue, 2 May 2017 11:53:26 +0100 Subject: 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. --- src/caja-application.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/caja-application.c') 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); -- cgit v1.2.1