From 9c49eceec823f042ffc93bea6e11e1e72d85df90 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com>
Date: Sun, 8 Oct 2023 16:29:36 +0200
Subject: [PATCH] Remove geany-3.0.css and geany-3.20.css

Since we require GTK 3.24, the css will be the same everywhere. The stuff
from geany-3.20.css can be moved directly to geany.css.
---
 data/Makefile.am    | 2 --
 data/geany-3.0.css  | 8 --------
 data/geany-3.20.css | 9 ---------
 data/geany.css      | 6 ++++++
 data/meson.build    | 2 --
 geany.nsi.in        | 1 -
 src/ui_utils.c      | 6 ++++--
 7 files changed, 10 insertions(+), 24 deletions(-)
 delete mode 100644 data/geany-3.0.css
 delete mode 100644 data/geany-3.20.css

diff --git a/data/Makefile.am b/data/Makefile.am
index edc2a2edc..082e92c56 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -126,8 +126,6 @@ nobase_dist_pkgdata_DATA = \
 	snippets.conf \
 	ui_toolbar.xml \
 	geany.glade \
-	geany-3.0.css \
-	geany-3.20.css \
 	geany.css
 
 nobase_pkgdata_DATA = \
diff --git a/data/geany-3.0.css b/data/geany-3.0.css
deleted file mode 100644
index b42525472..000000000
--- a/data/geany-3.0.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/* make close button on the editor's tabs smaller */
-#geany-close-tab-button {
-	-GtkWidget-focus-padding: 0;
-	-GtkWidget-focus-line-width: 0;
-	-GtkButton-default-border: 0;
-	-GtkButton-default-outside-border: 0;
-	-GtkButton-inner-border: 0;
-}
diff --git a/data/geany-3.20.css b/data/geany-3.20.css
deleted file mode 100644
index 7d3a70282..000000000
--- a/data/geany-3.20.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/* make close button on the editor's tabs smaller */
-#geany-close-tab-button {
-	outline-offset: 0;
-	outline-width: 0;
-	margin: 0;
-	margin-left: 0.5em;
-	min-width: 0;
-	min-height: 0;
-}
diff --git a/data/geany.css b/data/geany.css
index 044a3cc8c..e22615bee 100644
--- a/data/geany.css
+++ b/data/geany.css
@@ -2,6 +2,12 @@
 
 /* make close button on the editor's tabs smaller */
 #geany-close-tab-button {
+	outline-offset: 0;
+	outline-width: 0;
+	margin: 0;
+	margin-left: 0.5em;
+	min-width: 0;
+	min-height: 0;
 	padding: 0;
 }
 #geany-close-tab-button image {
diff --git a/data/meson.build b/data/meson.build
index 498786637..eea76abe4 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -15,8 +15,6 @@ misc = [
     'snippets.conf',
     'ui_toolbar.xml',
     'geany.glade',
-    'geany-3.0.css',
-    'geany-3.20.css',
     'geany.css',
 ]
 install_data(sources: misc, install_dir: cdata.get('GEANY_DATA_DIR'))
diff --git a/geany.nsi.in b/geany.nsi.in
index 13ef6b11b..0f687f4da 100644
--- a/geany.nsi.in
+++ b/geany.nsi.in
@@ -154,7 +154,6 @@ Section "!Program Files" SEC01
 	File "${GEANY_RELEASE_DIR}\data\GPL-2"
 	File "${GEANY_RELEASE_DIR}\data\filetype_extensions.conf"
 	File "${GEANY_RELEASE_DIR}\data\geany.glade"
-	File "${GEANY_RELEASE_DIR}\data\geany-3.20.css"
 	File "${GEANY_RELEASE_DIR}\data\geany.css"
 	File "${GEANY_RELEASE_DIR}\data\snippets.conf"
 	File "${GEANY_RELEASE_DIR}\data\ui_toolbar.xml"
diff --git a/src/ui_utils.c b/src/ui_utils.c
index 18919b755..498a2e554 100644
--- a/src/ui_utils.c
+++ b/src/ui_utils.c
@@ -2585,8 +2585,10 @@ static void init_css_styles(void)
 	}
 	css_files[] =
 	{
-		{ 20, G_MAXUINT, "geany-3.20.css" },
-		{ 0, 19, "geany-3.0.css" },
+		/* Unused now but can be used to load css for different GTK versions, such as
+		 * { 20, G_MAXUINT, "geany-3.20.css" },
+		 * { 0, 19, "geany-3.0.css" },
+		 */
 	};
 
 	guint gtk_version = gtk_get_minor_version();
-- 
2.11.4.GIT