From 643ea9c7fb04444062ea78a957dcf21d54bcc7b2 Mon Sep 17 00:00:00 2001 From: deepend Date: Tue, 17 Feb 2026 20:39:12 -0700 Subject: [PATCH] =?UTF-8?q?Removed=20the=20Windows-specific=20forced=20Adw?= =?UTF-8?q?aita=20icon=20theme=20override=20from=20win32=5Fconfigure=5Fico?= =?UTF-8?q?n=5Ftheme(),=20so=20ZoiteChat=20will=20no=20longer=20switch=20t?= =?UTF-8?q?o=20Adwaita=20at=20runtime=20and=20can=20use=20the=20app?= =?UTF-8?q?=E2=80=99s=20own=20icon=20assets=20from=20the=20configured=20ic?= =?UTF-8?q?on=20search=20path.=20Removed=20Adwaita=20icon=20bundle=20copy?= =?UTF-8?q?=20rules=20from=20the=20Windows=20packaging=20project=20(copy.v?= =?UTF-8?q?cxproj),=20so=20share/icons/Adwaita=20is=20no=20longer=20pulled?= =?UTF-8?q?=20into=20Windows=20build=20artifacts.=20Removed=20Adwaita=20ic?= =?UTF-8?q?on=20inclusion=20from=20the=20Windows=20installer=20manifest=20?= =?UTF-8?q?(zoitechat.iss.tt),=20so=20installer=20builds=20no=20longer=20s?= =?UTF-8?q?hip=20Adwaita=20icon=20files.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fe-gtk/fe-gtk.c | 8 -------- win32/copy/copy.vcxproj | 2 -- win32/installer/zoitechat.iss.tt | 1 - 3 files changed, 11 deletions(-) diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index 46678e74..c75bc748 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -180,7 +180,6 @@ win32_configure_icon_theme (void) GtkIconTheme *theme; char *base_path; char *icons_path; - char *adwaita_path; theme = gtk_icon_theme_get_default (); if (!theme) @@ -191,17 +190,10 @@ win32_configure_icon_theme (void) return; icons_path = g_build_filename (base_path, "share", "icons", NULL); - adwaita_path = g_build_filename (icons_path, "Adwaita", NULL); if (g_file_test (icons_path, G_FILE_TEST_IS_DIR)) gtk_icon_theme_append_search_path (theme, icons_path); - /* GtkEntry's emoji chooser uses symbolic category/menu icons only present in - * Adwaita in our Windows bundle. Force it when available. */ - if (g_file_test (adwaita_path, G_FILE_TEST_IS_DIR)) - gtk_icon_theme_set_custom_theme (theme, "Adwaita"); - - g_free (adwaita_path); g_free (icons_path); g_free (base_path); } diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj index f0d1b972..3ef04afe 100644 --- a/win32/copy/copy.vcxproj +++ b/win32/copy/copy.vcxproj @@ -88,7 +88,6 @@ - @@ -102,7 +101,6 @@ - diff --git a/win32/installer/zoitechat.iss.tt b/win32/installer/zoitechat.iss.tt index ff17bf6a..c06df2e4 100644 --- a/win32/installer/zoitechat.iss.tt +++ b/win32/installer/zoitechat.iss.tt @@ -114,7 +114,6 @@ Source: "cert.pem"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs Source: "share\doc\*"; DestDir: "{app}\share\doc"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs Source: "share\themes\MS-Windows\*"; DestDir: "{app}\share\themes\MS-Windows"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs -Source: "share\icons\Adwaita\*"; DestDir: "{app}\share\icons\Adwaita"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs Source: "share\glib-2.0\schemas\*"; DestDir: "{app}\share\glib-2.0\schemas"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations Source: "etc\fonts\*"; DestDir: "{app}\etc\fonts"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs