From bad2ce943fe69bd6f682fd8e03e63d9e75830c64 Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Sat, 9 Apr 2016 17:20:17 -0500 Subject: [PATCH] add separate css file for gtk-3.20 --- configure.ac | 6 ++++++ src/Makefile.am | 8 +++++++- src/lightdm-webkit2-greeter-application-3.20.css | 3 +++ src/lightdm-webkit2-greeter-application.css | 4 ++-- 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 src/lightdm-webkit2-greeter-application-3.20.css diff --git a/configure.ac b/configure.ac index 850fcb9..044c9cb 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,12 @@ PKG_CHECK_MODULES([WEB_EXTENSION], [ webkit2gtk-web-extension-4.0 >= 2.10.8 ]) +PKG_CHECK_MODULES([GREETER], [gtk+-3.0 >= 3.20], + [AC_DEFINE([HAVE_GTK320], [1], [Use Gtk320])], + [AC_DEFINE([HAVE_GTK320], [0], [Use Gtk320])] +) +AM_CONDITIONAL([HAVE_GTK320], [test "$HAVE_GTK320" -eq 1]) + AC_SUBST([WEB_EXTENSION_CFLAGS]) AC_SUBST([WEB_EXTENSION_LIBS]) diff --git a/src/Makefile.am b/src/Makefile.am index b1b8260..bb5a605 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,13 @@ webextension_LTLIBRARIES = liblightdm-webkit2-greeter-ext.la webextensiondir = $(libdir)/lightdm-webkit2-greeter -lightdm-webkit2-greeter-css-application.h: $(srcdir)/lightdm-webkit2-greeter-application.css Makefile +if HAVE_GTK320 +ldmcssfile = lightdm-webkit2-greeter-application-3.20.css +else +ldmcssfile = lightdm-webkit2-greeter-application.css +endif + +lightdm-webkit2-greeter-css-application.h: $(srcdir)/$(ldmcssfile) Makefile $(AM_V_GEN) exo-csource --static --name=lightdm_webkit2_greeter_css_application $< >$@ liblightdm_webkit2_greeter_ext_la_SOURCES = lightdm-webkit2-greeter-ext.c diff --git a/src/lightdm-webkit2-greeter-application-3.20.css b/src/lightdm-webkit2-greeter-application-3.20.css new file mode 100644 index 0000000..a6aba4b --- /dev/null +++ b/src/lightdm-webkit2-greeter-application-3.20.css @@ -0,0 +1,3 @@ +window { + background: #000000; +} \ No newline at end of file diff --git a/src/lightdm-webkit2-greeter-application.css b/src/lightdm-webkit2-greeter-application.css index 9ad6d22..979bb85 100644 --- a/src/lightdm-webkit2-greeter-application.css +++ b/src/lightdm-webkit2-greeter-application.css @@ -1,3 +1,3 @@ GtkWindow { - background: #000000; -} \ No newline at end of file + background: #000000; +}