From dbc517de99ed52a83a5af15324ce256467a93e16 Mon Sep 17 00:00:00 2001 From: deepend Date: Wed, 18 Feb 2026 00:57:58 -0700 Subject: [PATCH] Updated channel list icon button creation to always use gtkutil_image_new_from_stock(..., GTK_ICON_SIZE_MENU) so it follows the same zc-menu-* icon resolution path on all GTK targets instead of mixing direct stock-image calls. Updated the GTK2 channel list context-menu icon path to use the same helper, removing direct gtk_image_new_from_stock usage for menu icons. Updated the GTK2 spell-entry popup icon path to use gtkutil_image_new_from_stock, aligning it with the same menu icon set/mapping pipeline used elsewhere (data/icons/menu). --- src/fe-gtk/chanlist.c | 6 +----- src/fe-gtk/sexy-spell-entry.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c index 098b7f7d..6453fbdf 100644 --- a/src/fe-gtk/chanlist.c +++ b/src/fe-gtk/chanlist.c @@ -122,11 +122,7 @@ chanlist_icon_button (const char *label, const char *icon_name, GtkWidget *image; button = gtk_button_new_with_mnemonic (label); -#if HAVE_GTK3 image = gtkutil_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU); -#elif !HAVE_GTK3 - image = gtk_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU); -#endif gtk_button_set_image (GTK_BUTTON (button), image); gtk_button_set_use_underline (GTK_BUTTON (button), TRUE); g_signal_connect (G_OBJECT (button), "clicked", callback, userdata); @@ -157,7 +153,7 @@ chanlist_icon_menu_item (const char *label, const char *icon_name, GtkWidget *image; item = gtk_image_menu_item_new_with_mnemonic (label); - image = gtk_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU); + image = gtkutil_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); #endif g_signal_connect (G_OBJECT (item), "activate", callback, userdata); diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c index 36cb0f28..c94e1d13 100644 --- a/src/fe-gtk/sexy-spell-entry.c +++ b/src/fe-gtk/sexy-spell-entry.c @@ -740,7 +740,7 @@ sexy_spell_entry_icon_menu_item (const char *label, const char *stock_name) GtkWidget *image; item = gtk_image_menu_item_new_with_label (label); - image = gtk_image_new_from_stock (stock_name, GTK_ICON_SIZE_MENU); + image = gtkutil_image_new_from_stock (stock_name, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); #endif