From a2b35c289c157bf16f1f5ee3ed610a3956ef62f0 Mon Sep 17 00:00:00 2001 From: deepend Date: Fri, 30 Jan 2026 08:21:55 -0700 Subject: [PATCH] Updated the join dialog to use gtkutil stock helpers for the network image and OK button with an explicit label. Clarified GTK2-specific stock widget handling with explicit #elif !HAVE_GTK3 guards in the helper implementations. --- src/fe-gtk/gtkutil.c | 4 ++-- src/fe-gtk/joind.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c index 85237f3d..4ac86292 100644 --- a/src/fe-gtk/gtkutil.c +++ b/src/fe-gtk/gtkutil.c @@ -128,7 +128,7 @@ gtkutil_image_new_from_stock (const char *stock, GtkIconSize size) const char *icon_name = gtkutil_icon_name_from_stock (stock); return gtk_image_new_from_icon_name (icon_name, size); -#else +#elif !HAVE_GTK3 return gtk_image_new_from_stock (stock, size); #endif } @@ -151,7 +151,7 @@ gtkutil_button_new_from_stock (const char *stock, const char *label) } return button; -#else +#elif !HAVE_GTK3 if (stock) return gtk_button_new_from_stock (stock); if (label) diff --git a/src/fe-gtk/joind.c b/src/fe-gtk/joind.c index ca1a9ce3..4ddedf96 100644 --- a/src/fe-gtk/joind.c +++ b/src/fe-gtk/joind.c @@ -38,6 +38,7 @@ #include "../common/fe.h" #include "fe-gtk.h" #include "chanlist.h" +#include "gtkutil.h" static void @@ -157,7 +158,7 @@ joind_show_dialog (server *serv) gtk_widget_show (hbox1); gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0); - image1 = gtk_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_LARGE_TOOLBAR); + image1 = gtkutil_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_widget_show (image1); gtk_box_pack_start (GTK_BOX (hbox1), image1, FALSE, TRUE, 24); #if HAVE_GTK3 @@ -277,7 +278,7 @@ joind_show_dialog (server *serv) gtk_widget_show (dialog_action_area1); gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END); - okbutton1 = gtk_button_new_from_stock ("gtk-ok"); + okbutton1 = gtkutil_button_new_from_stock ("gtk-ok", _("_OK")); gtk_widget_show (okbutton1); gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog1))), okbutton1, FALSE, TRUE, 0); gtk_widget_set_can_default (okbutton1, TRUE);