fix: quiet GTK/GLib warn spam; fix include order; normalize imported CSS

This commit is contained in:
2026-03-09 14:21:20 -06:00
parent a11687e3eb
commit 0aa6c26490
27 changed files with 126 additions and 57 deletions

View File

@@ -1,5 +1,6 @@
#include "../../fe-gtk.h"
#include <math.h>
#include <gtk/gtk.h>
#include "../theme-access.h"
#include "../theme-manager.h"

View File

@@ -1,4 +1,4 @@
#include <gtk/gtk.h>
#include "../../fe-gtk.h"
#include "../theme-application.h"
#include "../../maingui.h"

View File

@@ -1,11 +1,12 @@
#include "../../../common/zoitechat.h"
#include "../../../common/zoitechatc.h"
#include <glib.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
#include "../theme-gtk3.h"
#include "../../../common/gtk3-theme-service.h"
#include "../../../common/zoitechat.h"
#include "../../../common/zoitechatc.h"
struct session *current_sess;
struct session *current_tab;

View File

@@ -1,8 +1,7 @@
#include <gtk/gtk.h>
#include "../../fe-gtk.h"
#include "../theme-manager.h"
#include "../theme-gtk3.h"
#include "../../fe-gtk.h"
#include "../../../common/zoitechat.h"
#include "../../../common/zoitechatc.h"

View File

@@ -1,8 +1,8 @@
#include <gtk/gtk.h>
#include "../../fe-gtk.h"
#include <string.h>
#include "../theme-manager.h"
#include "../../fe-gtk.h"
#include "../../../common/zoitechat.h"
#include "../../../common/zoitechatc.h"

View File

@@ -1,8 +1,7 @@
#include <gtk/gtk.h>
#include "../../fe-gtk.h"
#include "../theme-palette.h"
#include "../theme-manager.h"
#include "../../fe-gtk.h"
#include "../../../common/zoitechat.h"
#include "../../../common/zoitechatc.h"

View File

@@ -1,9 +1,8 @@
#include <gtk/gtk.h>
#include "../../fe-gtk.h"
#include "../../../common/zoitechat.h"
#include "../../../common/zoitechatc.h"
#include "../../../common/gtk3-theme-service.h"
#include "../../fe-gtk.h"
#include "../theme-gtk3.h"
#include "../theme-manager.h"

View File

@@ -1,3 +1,6 @@
#include "../../../common/zoitechat.h"
#include "../../../common/zoitechatc.h"
#include <errno.h>
#include <math.h>
#include <fcntl.h>
@@ -8,8 +11,6 @@
#include <unistd.h>
#include "../theme-runtime.h"
#include "../../../common/zoitechat.h"
#include "../../../common/zoitechatc.h"
struct session *current_sess;
struct session *current_tab;

View File

@@ -40,9 +40,11 @@ theme_access_get_gtk_palette_map (GtkWidget *widget, ThemeGtkPaletteMap *out_map
return FALSE;
gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &out_map->text_foreground);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &out_map->text_background);
gtk_style_context_get_color (context, GTK_STATE_FLAG_SELECTED, &out_map->selection_foreground);
gtk_style_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &out_map->selection_background);
G_GNUC_END_IGNORE_DEPRECATIONS
gtk_style_context_get_color (context, GTK_STATE_FLAG_LINK, &accent);
if (accent.alpha <= 0.0)
accent = out_map->selection_background;

View File

@@ -1,7 +1,6 @@
#ifndef ZOITECHAT_THEME_APPLICATION_H
#define ZOITECHAT_THEME_APPLICATION_H
#include <glib.h>
#include "../fe-gtk.h"
gboolean theme_application_apply_mode (unsigned int mode, gboolean *palette_changed);

View File

@@ -1,5 +1,8 @@
#include "theme-gtk3.h"
#include "../../common/zoitechat.h"
#include "../../common/zoitechatc.h"
#include <gtk/gtk.h>
#include <glib/gstdio.h>
#include <gio/gio.h>
@@ -7,8 +10,6 @@
#include "theme-policy.h"
#include "../../common/gtk3-theme-service.h"
#include "../../common/zoitechat.h"
#include "../../common/zoitechatc.h"
static GPtrArray *theme_gtk3_providers_base;
static GPtrArray *theme_gtk3_providers_variant;

View File

@@ -1,7 +1,5 @@
#include "theme-policy.h"
#include <gtk/gtk.h>
#include "../fe-gtk.h"
#include "../../common/zoitechat.h"
#include "../../common/zoitechatc.h"

View File

@@ -1,7 +1,7 @@
#ifndef ZOITECHAT_THEME_POLICY_H
#define ZOITECHAT_THEME_POLICY_H
#include <glib.h>
#include "../fe-gtk.h"
gboolean theme_policy_system_prefers_dark (void);
gboolean theme_policy_is_dark_mode_active (unsigned int mode);

View File

@@ -1,6 +1,9 @@
#include <stdio.h>
#include <string.h>
#include "../../common/zoitechat.h"
#include "../../common/zoitechatc.h"
#include <gio/gio.h>
#include <glib/gstdio.h>
@@ -8,9 +11,7 @@
#include "../../common/fe.h"
#include "../../common/util.h"
#include "../../common/cfgfiles.h"
#include "../../common/zoitechat.h"
#include "../../common/gtk3-theme-service.h"
#include "../../common/zoitechatc.h"
#include "theme-gtk3.h"
#include "theme-manager.h"
#include "theme-preferences.h"

View File

@@ -1,12 +1,11 @@
#ifndef ZOITECHAT_THEME_PREFERENCES_H
#define ZOITECHAT_THEME_PREFERENCES_H
#include <gtk/gtk.h>
#include "theme-access.h"
#include "../fe-gtk.h"
#include "../../common/zoitechat.h"
#include "theme-access.h"
GtkWidget *theme_preferences_create_page (GtkWindow *parent,
struct zoitechatprefs *setup_prefs,
gboolean *color_change_flag);