From aca65aa1858d923e8794b905624654cfcc8de66e Mon Sep 17 00:00:00 2001 From: hwspeedy Date: Mon, 27 May 2024 00:23:29 +0200 Subject: FIX Implicit declarations --- hardinfo2/hardinfo.c | 10 +++++++--- modules/benchmark/guibench.c | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/hardinfo2/hardinfo.c b/hardinfo2/hardinfo.c index b0258d97..2e273646 100644 --- a/hardinfo2/hardinfo.c +++ b/hardinfo2/hardinfo.c @@ -34,6 +34,7 @@ ProgramParameters params = { 0 }; +#if GTK_CHECK_VERSION(3,0,0) gulong interface_changed_sh; GSettings *settings=NULL; @@ -51,7 +52,7 @@ void interface_changed_cb(GSettings *settings, gchar *name, gpointer user_data) if(params.theme==6) cb_theme6(); g_free(theme); } - +#endif int main(int argc, char **argv) { @@ -124,12 +125,14 @@ int main(int argc, char **argv) //Get DarkMode state from system if(params.gui_running) { //get darkmode via gtk-theme has (d/D)ark as part of theme name from gsettings + params.darkmode=0; +#if GTK_CHECK_VERSION(3,0,0) settings=g_settings_new("org.gnome.desktop.interface"); interface_changed_sh = g_signal_connect(settings, "changed", G_CALLBACK(interface_changed_cb), NULL); char *theme=g_settings_get_string(settings,"gtk-theme"); - params.darkmode=0; if(strstr(theme,"Dark")||strstr(theme,"dark")) params.darkmode=1; g_free(theme); +#endif //get darkmode override from gtk-3.0/settings.ini - gtksettings gint dark=-1; g_object_get(gtk_settings_get_default(), "gtk-application-prefer-dark-theme", &dark, NULL); @@ -199,8 +202,9 @@ int main(int argc, char **argv) vendor_cleanup(); dmidecode_cache_free(); free_auto_free_final(); +#if GTK_CHECK_VERSION(3,0,0) g_object_unref(settings); - +#endif DEBUG("finished"); return exit_code; } diff --git a/modules/benchmark/guibench.c b/modules/benchmark/guibench.c index 7bef8a04..09dba879 100644 --- a/modules/benchmark/guibench.c +++ b/modules/benchmark/guibench.c @@ -18,6 +18,8 @@ #include #include +#include +#include #include "iconcache.h" #include "config.h" @@ -132,12 +134,14 @@ double guibench(double *frameTime, int *frameCount) //Get DarkMode state from system //get darkmode via gtk-theme has (d/D)ark as part of theme name from gsettings +#if GTK_CHECK_VERSION(3,0,0) GSettings *settings=g_settings_new("org.gnome.desktop.interface"); char *theme=g_settings_get_string(settings,"gtk-theme"); darkmode=0; if(strstr(theme,"Dark")||strstr(theme,"dark")) darkmode=1; g_free(theme); g_object_unref(settings); +#endif //get darkmode override from gtk-3.0/settings.ini - gtksettings gint dark=-1; g_object_get(gtk_settings_get_default(), "gtk-application-prefer-dark-theme", &dark, NULL); -- cgit v1.2.3