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

Updated the join dialog to use gtkutil stock helpers for the network image and OK button with an explicit label.

Browse Source 
Clarified GTK2-specific stock widget handling with explicit #elif !HAVE_GTK3 guards in the helper implementations.
This commit is contained in:
deepend
2026-01-30 08:21:55 -07:00
parent 2d3e1f8122
commit a2b35c289c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fe-gtk/gtkutil.c
View File

@@ -128,7 +128,7 @@ gtkutil_image_new_from_stock (const char *stock, GtkIconSize size)
const char *icon_name = gtkutil_icon_name_from_stock (stock); const char *icon_name = gtkutil_icon_name_from_stock (stock);
return gtk_image_new_from_icon_name (icon_name, size); return gtk_image_new_from_icon_name (icon_name, size);
#else #elif !HAVE_GTK3
return gtk_image_new_from_stock (stock, size); return gtk_image_new_from_stock (stock, size);
#endif #endif
} }
@@ -151,7 +151,7 @@ gtkutil_button_new_from_stock (const char *stock, const char *label)
} }
return button; return button;
#else #elif !HAVE_GTK3
if (stock) if (stock)
return gtk_button_new_from_stock (stock); return gtk_button_new_from_stock (stock);
if (label) if (label)

5
src/fe-gtk/joind.c
View File

@@ -38,6 +38,7 @@
#include "../common/fe.h" #include "../common/fe.h"
#include "fe-gtk.h" #include "fe-gtk.h"
#include "chanlist.h" #include "chanlist.h"
#include "gtkutil.h"
static void static void
@@ -157,7 +158,7 @@ joind_show_dialog (server *serv)
gtk_widget_show (hbox1); gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0); 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_widget_show (image1);
gtk_box_pack_start (GTK_BOX (hbox1), image1, FALSE, TRUE, 24); gtk_box_pack_start (GTK_BOX (hbox1), image1, FALSE, TRUE, 24);
#if HAVE_GTK3 #if HAVE_GTK3
@@ -277,7 +278,7 @@ joind_show_dialog (server *serv)
gtk_widget_show (dialog_action_area1); gtk_widget_show (dialog_action_area1);
gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END); 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_widget_show (okbutton1);
gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog1))), okbutton1, FALSE, TRUE, 0); 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); gtk_widget_set_can_default (okbutton1, TRUE);