From 46a27c4e39eda7ee7faeb3dcc551a7c28f71736a Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Tue, 26 Jul 2022 17:47:08 +0200
Subject: [PATCH] Refactor: move gtk detection to own header

---
 src/common/init.c     |  1 +
 src/detection/gtk.c   |  1 +
 src/detection/gtk.h   | 21 +++++++++++++++++++++
 src/fastfetch.h       | 14 --------------
 src/modules/cursor.c  |  1 +
 src/modules/font.c    |  1 +
 src/modules/icons.c   |  1 +
 src/modules/theme.c   |  1 +
 src/modules/wmtheme.c |  1 +
 9 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100644 src/detection/gtk.h

diff --git a/src/common/init.c b/src/common/init.c
index d24f06dd7..960807b44 100644
--- a/src/common/init.c
+++ b/src/common/init.c
@@ -1,6 +1,7 @@
 #include "fastfetch.h"
 #include "common/caching.h"
 #include "detection/qt.h"
+#include "detection/gtk.h"
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/detection/gtk.c b/src/detection/gtk.c
index 86e850467..bd4dbc314 100644
--- a/src/detection/gtk.c
+++ b/src/detection/gtk.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "detection/gtk.h"
 #include "common/properties.h"
 #include "common/settings.h"
 
diff --git a/src/detection/gtk.h b/src/detection/gtk.h
new file mode 100644
index 000000000..2f8324fbe
--- /dev/null
+++ b/src/detection/gtk.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#ifndef FF_INCLUDED_detection_gtk
+#define FF_INCLUDED_detection_gtk
+
+#include "util/FFstrbuf.h"
+
+typedef struct FFGTKResult
+{
+    FFstrbuf theme;
+    FFstrbuf icons;
+    FFstrbuf font;
+    FFstrbuf cursor;
+    FFstrbuf cursorSize;
+} FFGTKResult;
+
+const FFGTKResult* ffDetectGTK2(FFinstance* instance);
+const FFGTKResult* ffDetectGTK4(FFinstance* instance);
+const FFGTKResult* ffDetectGTK3(FFinstance* instance);
+
+#endif
diff --git a/src/fastfetch.h b/src/fastfetch.h
index 6320a6d91..f5974ea6b 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -173,15 +173,6 @@ typedef struct FFinstance
     FFstate state;
 } FFinstance;
 
-typedef struct FFGTKResult
-{
-    FFstrbuf theme;
-    FFstrbuf icons;
-    FFstrbuf font;
-    FFstrbuf cursor;
-    FFstrbuf cursorSize;
-} FFGTKResult;
-
 typedef struct FFTerminalShellResult
 {
     FFstrbuf shellProcessName;
@@ -306,11 +297,6 @@ void ffLogoBuiltinListAutocompletion();
 // Detection functions //
 /////////////////////////
 
-//detection/gtk.c
-const FFGTKResult* ffDetectGTK2(FFinstance* instance);
-const FFGTKResult* ffDetectGTK4(FFinstance* instance);
-const FFGTKResult* ffDetectGTK3(FFinstance* instance);
-
 //detection/displayServer.c
 const FFDisplayServerResult* ffConnectDisplayServer(const FFinstance* instance);
 
diff --git a/src/modules/cursor.c b/src/modules/cursor.c
index 18b756d0a..e50aec43b 100644
--- a/src/modules/cursor.c
+++ b/src/modules/cursor.c
@@ -3,6 +3,7 @@
 #include "common/printing.h"
 #include "common/parsing.h"
 #include "common/settings.h"
+#include "detection/gtk.h"
 
 #include <stdlib.h>
 
diff --git a/src/modules/font.c b/src/modules/font.c
index 67d82c1e2..952882180 100644
--- a/src/modules/font.c
+++ b/src/modules/font.c
@@ -3,6 +3,7 @@
 #include "common/printing.h"
 #include "common/parsing.h"
 #include "detection/qt.h"
+#include "detection/gtk.h"
 
 #define FF_FONT_MODULE_NAME "Font"
 #define FF_FONT_NUM_FORMAT_ARGS 21
diff --git a/src/modules/icons.c b/src/modules/icons.c
index e05b1c120..dad1e8aa9 100644
--- a/src/modules/icons.c
+++ b/src/modules/icons.c
@@ -2,6 +2,7 @@
 #include "common/printing.h"
 #include "common/parsing.h"
 #include "detection/qt.h"
+#include "detection/gtk.h"
 
 #define FF_ICONS_MODULE_NAME "Icons"
 #define FF_ICONS_NUM_FORMAT_ARGS 5
diff --git a/src/modules/theme.c b/src/modules/theme.c
index e2d362e78..96d656dfe 100644
--- a/src/modules/theme.c
+++ b/src/modules/theme.c
@@ -2,6 +2,7 @@
 #include "common/printing.h"
 #include "common/parsing.h"
 #include "detection/qt.h"
+#include "detection/gtk.h"
 
 #define FF_THEME_MODULE_NAME "Theme"
 #define FF_THEME_NUM_FORMAT_ARGS 7
diff --git a/src/modules/wmtheme.c b/src/modules/wmtheme.c
index ee600e2bb..b256fdd1f 100644
--- a/src/modules/wmtheme.c
+++ b/src/modules/wmtheme.c
@@ -3,6 +3,7 @@
 #include "common/printing.h"
 #include "common/parsing.h"
 #include "common/settings.h"
+#include "detection/gtk.h"
 
 #include <stdlib.h>
 #include <string.h>