deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-10 07:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kept legacy .zct/.hct import flow untouched while improving GTK3 archive validation logic: GTK3 import now explicitly distinguishes between archives that include gtk-3.0 but miss gtk.css, versus archives that are not GTK3 theme layouts at all. This is implemented in the GTK3 archive scan/import path only (zoitechat_find_gtk3_theme_root + zoitechat_import_gtk3_theme_archive).

Browse Source
This commit is contained in:
deepend
2026-02-26 01:01:09 -07:00
parent 607faa80ca
commit a1ba30865a
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/zoitechat.c
View File

@@ -462,7 +462,11 @@ zoitechat_copy_directory_recursive (const char *src_dir, const char *dest_dir, G
} }
static gboolean static gboolean
zoitechat_find_gtk3_theme_root (const char *search_dir, char **theme_root_out, gboolean *has_dark_css_out, GError **error) zoitechat_find_gtk3_theme_root (const char *search_dir,
char **theme_root_out,
gboolean *has_dark_css_out,
gboolean *missing_gtk_css_out,
GError **error)
{ {
GDir *dir; GDir *dir;
const char *name; const char *name;
@@ -498,8 +502,14 @@ zoitechat_find_gtk3_theme_root (const char *search_dir, char **theme_root_out, g
} }
g_free (gtk_css); g_free (gtk_css);
if (missing_gtk_css_out)
*missing_gtk_css_out = TRUE;
} }
else if (zoitechat_find_gtk3_theme_root (child, theme_root_out, has_dark_css_out, error)) else if (zoitechat_find_gtk3_theme_root (child,
theme_root_out,
has_dark_css_out,
missing_gtk_css_out,
error))
{ {
g_free (child); g_free (child);
g_dir_close (dir); g_dir_close (dir);
@@ -688,6 +698,7 @@ zoitechat_import_gtk3_theme_archive (const char *archive_path, GError **error)
int status = 0; int status = 0;
gboolean ok = FALSE; gboolean ok = FALSE;
gboolean has_dark_css = FALSE; gboolean has_dark_css = FALSE;
gboolean missing_gtk_css = FALSE;
if (!archive_path) if (!archive_path)
{ {
@@ -858,13 +869,17 @@ zoitechat_import_gtk3_theme_archive (const char *archive_path, GError **error)
} }
#endif #endif
if (!zoitechat_find_gtk3_theme_root (temp_dir, &theme_root, &has_dark_css, error)) if (!zoitechat_find_gtk3_theme_root (temp_dir, &theme_root, &has_dark_css, &missing_gtk_css, error))
{ {
if (error && *error) if (error && *error)
goto cleanup; goto cleanup;
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA, if (missing_gtk_css)
_("Archive does not contain a GTK3 theme. Expected gtk-3.0/gtk.css.")); g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
_("Archive contains a gtk-3.0 directory, but gtk-3.0/gtk.css is missing."));
else
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
_("Archive is not a GTK3 theme. Expected layout: <theme-name>/gtk-3.0/gtk.css."));
goto cleanup; goto cleanup;
} }