From b0b271274c98274d4c53608c856194270ae12d0f Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Fri, 4 Sep 2020 08:26:04 +0100
Subject: Make GTK UI resources more consistent

The GTK UI resources have to be different resources between major versions.

When kept in one directory with slightly different filenames they were
  difficult to distinguish and resource definition was difficult to update.

The resources for both gtk versions were stored in both builds resulting in
  unneccessary increased binary size.

The new stratagy lists the UI files once in a single gresources file and only
  includes what is required. If a UI file is added it must be provided in both
  gtk2 and 3 or a build failure will occour rather than a runtime error.
---
 frontends/gtk/res/netsurf.gresource.xml | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'frontends/gtk/res/netsurf.gresource.xml')

diff --git a/frontends/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml
index 272c1ade2..ada2d59fc 100644
--- a/frontends/gtk/res/netsurf.gresource.xml
+++ b/frontends/gtk/res/netsurf.gresource.xml
@@ -1,32 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/netsurf">
-    <file>cookies.gtk2.ui</file>
-    <file>cookies.gtk3.ui</file>
-    <file>downloads.gtk2.ui</file>
-    <file>downloads.gtk3.ui</file>
-    <file>globalhistory.gtk2.ui</file>
-    <file>globalhistory.gtk3.ui</file>
-    <file>hotlist.gtk2.ui</file>
-    <file>hotlist.gtk3.ui</file>
-    <file>localhistory.gtk2.ui</file>
-    <file>localhistory.gtk3.ui</file>
-    <file>netsurf.gtk2.ui</file>
-    <file>netsurf.gtk3.ui</file>
-    <file>options.gtk2.ui</file>
-    <file>options.gtk3.ui</file>
-    <file>pageinfo.gtk2.ui</file>
-    <file>pageinfo.gtk3.ui</file>
-    <file>password.gtk2.ui</file>
-    <file>password.gtk3.ui</file>
-    <file>tabcontents.gtk2.ui</file>
-    <file>tabcontents.gtk3.ui</file>
-    <file>toolbar.gtk2.ui</file>
-    <file>toolbar.gtk3.ui</file>
-    <file>viewdata.gtk2.ui</file>
-    <file>viewdata.gtk3.ui</file>
-    <file>warning.gtk3.ui</file>
-    <file>warning.gtk2.ui</file>
     <file preprocess="to-pixdata">favicon.png</file>
     <file preprocess="to-pixdata">netsurf.xpm</file>
     <file preprocess="to-pixdata">menu_cursor.png</file>
-- 
cgit v1.2.3