[evince] shell: Remove style for gtk < 3.18



commit ab54d554666924a226a3301df3c0c4d03597faa1
Author: Germán Poo-Caamaño <gpoo gnome org>
Date:   Thu Sep 24 22:12:48 2020 -0300

    shell: Remove style for gtk < 3.18
    
    Evince depends on gtk 3.22, therefore it does not make sense to
    keep theme compatibility workarounds for gtk < 3.20

 shell/evince-3-18.css                              | 57 ----------------------
 ...vince.gresource.xml.in => evince.gresource.xml} |  2 +-
 shell/meson.build                                  | 17 +------
 3 files changed, 3 insertions(+), 73 deletions(-)
---
diff --git a/shell/evince.gresource.xml.in b/shell/evince.gresource.xml
similarity index 93%
rename from shell/evince.gresource.xml.in
rename to shell/evince.gresource.xml
index 873a444c..c7dcc175 100644
--- a/shell/evince.gresource.xml.in
+++ b/shell/evince.gresource.xml
@@ -18,7 +18,7 @@
 <gresources>
   <gresource prefix="/org/gnome/evince">
     <file alias="gtk/help-overlay.ui" preprocess="xml-stripblanks">help-overlay.ui</file>
-    <file alias="ui/evince.css" compressed="true">@EVINCE_CSS@</file>
+    <file alias="ui/evince.css" compressed="true">evince.css</file>
     <file alias="ui/thumbnail-frame.png" compressed="true">thumbnail-frame.png</file>
     <file alias="gtk/menus.ui" compressed="true" preprocess="xml-stripblanks">evince-menus.ui</file>
   </gresource>
diff --git a/shell/meson.build b/shell/meson.build
index 7d76839c..eefaf045 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -33,29 +33,16 @@ sources = files(
   'ev-zoom-action.c',
 )
 
-evince_css = (gtk_dep.version().version_compare('>= 3.20.0') ? 'evince.css' : 'evince-3.18.css')
-
 resource_data = files(
-  evince_css,
+  'evince.css',
   '../data/thumbnail-frame.png',
   'evince-menus.ui',
   'help-overlay.ui',
 )
 
-resource_conf = configuration_data()
-resource_conf.set('EVINCE_CSS',  evince_css)
-
-resource = 'evince.gresource.xml'
-
-resource_xml = configure_file(
-  input: resource + '.in',
-  output: resource,
-  configuration: resource_conf,
-)
-
 sources += gnome.compile_resources(
   'ev-resources',
-  resource_xml,
+  'evince.gresource.xml',
   source_dir: data_dir,
   c_name: ev_code_prefix.to_lower(),
   dependencies: resource_data,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]