Refactor: move gtk detection to own header

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>

src/detection/gtk.c

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "detection/gtk.h"
 #include "common/properties.h"
 #include "common/settings.h"
 

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

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);
 

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>
 

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

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

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

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>