Split GTK3/GTK2 button creation guards in the server list UI so stock button calls live under explicit #if !HAVE_GTK3 blocks while GTK3 uses icon-name images.

This commit is contained in:
2026-01-30 09:04:26 -07:00
parent ffc9af18be
commit e0c1796035

View File

@@ -1898,7 +1898,8 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
buttonadd = gtk_button_new_with_mnemonic (_("_Add")); buttonadd = gtk_button_new_with_mnemonic (_("_Add"));
gtk_button_set_image (GTK_BUTTON (buttonadd), gtk_button_set_image (GTK_BUTTON (buttonadd),
gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_BUTTON)); gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_BUTTON));
#elif !HAVE_GTK3 #endif
#if !HAVE_GTK3
buttonadd = gtk_button_new_from_stock ("gtk-add"); buttonadd = gtk_button_new_from_stock ("gtk-add");
#endif #endif
g_signal_connect (G_OBJECT (buttonadd), "clicked", g_signal_connect (G_OBJECT (buttonadd), "clicked",
@@ -1910,7 +1911,8 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
buttonremove = gtk_button_new_with_mnemonic (_("_Remove")); buttonremove = gtk_button_new_with_mnemonic (_("_Remove"));
gtk_button_set_image (GTK_BUTTON (buttonremove), gtk_button_set_image (GTK_BUTTON (buttonremove),
gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_BUTTON)); gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_BUTTON));
#elif !HAVE_GTK3 #endif
#if !HAVE_GTK3
buttonremove = gtk_button_new_from_stock ("gtk-remove"); buttonremove = gtk_button_new_from_stock ("gtk-remove");
#endif #endif
g_signal_connect (G_OBJECT (buttonremove), "clicked", g_signal_connect (G_OBJECT (buttonremove), "clicked",
@@ -1990,7 +1992,8 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
button10 = gtk_button_new_with_mnemonic (_("_Close")); button10 = gtk_button_new_with_mnemonic (_("_Close"));
gtk_button_set_image (GTK_BUTTON (button10), gtk_button_set_image (GTK_BUTTON (button10),
gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_BUTTON)); gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_BUTTON));
#elif !HAVE_GTK3 #endif
#if !HAVE_GTK3
button10 = gtk_button_new_from_stock ("gtk-close"); button10 = gtk_button_new_from_stock ("gtk-close");
#endif #endif
g_signal_connect (G_OBJECT (button10), "clicked", g_signal_connect (G_OBJECT (button10), "clicked",
@@ -2263,7 +2266,8 @@ servlist_open_networks (void)
button_add = gtk_button_new_with_mnemonic (_("_Add")); button_add = gtk_button_new_with_mnemonic (_("_Add"));
gtk_button_set_image (GTK_BUTTON (button_add), gtk_button_set_image (GTK_BUTTON (button_add),
gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_BUTTON)); gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_BUTTON));
#elif !HAVE_GTK3 #endif
#if !HAVE_GTK3
button_add = gtk_button_new_from_stock ("gtk-add"); button_add = gtk_button_new_from_stock ("gtk-add");
#endif #endif
g_signal_connect (G_OBJECT (button_add), "clicked", g_signal_connect (G_OBJECT (button_add), "clicked",
@@ -2276,7 +2280,8 @@ servlist_open_networks (void)
button_remove = gtk_button_new_with_mnemonic (_("_Remove")); button_remove = gtk_button_new_with_mnemonic (_("_Remove"));
gtk_button_set_image (GTK_BUTTON (button_remove), gtk_button_set_image (GTK_BUTTON (button_remove),
gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_BUTTON)); gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_BUTTON));
#elif !HAVE_GTK3 #endif
#if !HAVE_GTK3
button_remove = gtk_button_new_from_stock ("gtk-remove"); button_remove = gtk_button_new_from_stock ("gtk-remove");
#endif #endif
g_signal_connect (G_OBJECT (button_remove), "clicked", g_signal_connect (G_OBJECT (button_remove), "clicked",
@@ -2322,7 +2327,8 @@ servlist_open_networks (void)
button_close = gtk_button_new_with_mnemonic (_("_Close")); button_close = gtk_button_new_with_mnemonic (_("_Close"));
gtk_button_set_image (GTK_BUTTON (button_close), gtk_button_set_image (GTK_BUTTON (button_close),
gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_BUTTON)); gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_BUTTON));
#elif !HAVE_GTK3 #endif
#if !HAVE_GTK3
button_close = gtk_button_new_from_stock ("gtk-close"); button_close = gtk_button_new_from_stock ("gtk-close");
#endif #endif
gtk_widget_show (button_close); gtk_widget_show (button_close);