Replaced #else with #elif !HAVE_GTK3 anywhere the legacy alignment calls appear, so the GTK2/legacy path is now explicitly scoped to non-GTK3 builds while preserving the existing GTK3 halign/valign behavior across the requested files (maingui.c, chanlist.c, dccgui.c, joind.c, servlistgui.c).

Applied the same explicit !HAVE_GTK3 guard style in setup.c, including the gtk_alignment_* block and the padding/margin section you called out.
2026-03-10 07:50:19 +00:00 · 2026-01-23 20:34:48 -07:00
parent 31e198f772
commit 7a37918ec7
6 changed files with 38 additions and 38 deletions
--- a/src/fe-gtk/chanlist.c
+++ b/src/fe-gtk/chanlist.c
@@ -89,7 +89,7 @@ chanlist_set_label_alignment (GtkWidget *widget)
 #if HAVE_GTK3
 	gtk_widget_set_halign (widget, GTK_ALIGN_START);
 	gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
 #endif
 }
--- a/src/fe-gtk/dccgui.c
+++ b/src/fe-gtk/dccgui.c
@@ -753,7 +753,7 @@ dcc_detail_label (char *text, GtkWidget *box, int num)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label, GTK_ALIGN_START);
 	gtk_widget_set_valign (label, GTK_ALIGN_START);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 #endif
 	gtk_table_attach (GTK_TABLE (box), label, 0, 1, 0 + num, 1 + num, GTK_FILL, GTK_FILL, 0, 0);
@@ -763,7 +763,7 @@ dcc_detail_label (char *text, GtkWidget *box, int num)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label, GTK_ALIGN_START);
 	gtk_widget_set_valign (label, GTK_ALIGN_START);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 #endif
 	gtk_table_attach (GTK_TABLE (box), label, 1, 2, 0 + num, 1 + num, GTK_FILL, GTK_FILL, 0, 0);
--- a/src/fe-gtk/joind.c
+++ b/src/fe-gtk/joind.c
@@ -155,7 +155,7 @@ joind_show_dialog (server *serv)
 #if HAVE_GTK3
 	gtk_widget_set_halign (image1, GTK_ALIGN_CENTER);
 	gtk_widget_set_valign (image1, GTK_ALIGN_START);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (image1), 0.5f, 0.06f);
 #endif

@@ -174,7 +174,7 @@ joind_show_dialog (server *serv)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label, GTK_ALIGN_START);
 	gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 #endif

@@ -185,7 +185,7 @@ joind_show_dialog (server *serv)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label, GTK_ALIGN_START);
 	gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 #endif

@@ -195,7 +195,7 @@ joind_show_dialog (server *serv)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label, GTK_ALIGN_START);
 	gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 #endif

@@ -228,7 +228,7 @@ joind_show_dialog (server *serv)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label, GTK_ALIGN_START);
 	gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 #endif

@@ -246,7 +246,7 @@ joind_show_dialog (server *serv)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label, GTK_ALIGN_START);
 	gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 #endif

--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -108,7 +108,7 @@ mg_set_label_alignment_start (GtkWidget *widget)
 #if HAVE_GTK3
 	gtk_widget_set_halign (widget, GTK_ALIGN_START);
 	gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
 #endif
 }
--- a/src/fe-gtk/servlistgui.c
+++ b/src/fe-gtk/servlistgui.c
@@ -1280,7 +1280,7 @@ servlist_create_entry (GtkWidget *table, char *labeltext, int row,
 #if HAVE_GTK3
 	gtk_widget_set_halign (label, GTK_ALIGN_START);
 	gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 #endif

@@ -1714,7 +1714,7 @@ bold_label (char *text)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label, GTK_ALIGN_START);
 	gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 #endif
 	gtk_widget_show (label);
@@ -1935,7 +1935,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label_logintype, GTK_ALIGN_START);
 	gtk_widget_set_valign (label_logintype, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label_logintype), 0, 0.5);
 #endif
 	combobox_logintypes = servlist_create_logintypecombo (notebook);
@@ -1951,7 +1951,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label34, GTK_ALIGN_START);
 	gtk_widget_set_valign (label34, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label34), 0, 0.5);
 #endif
 	comboboxentry_charset = servlist_create_charsetcombo ();
@@ -2062,7 +2062,7 @@ servlist_open_networks (void)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label3, GTK_ALIGN_START);
 	gtk_widget_set_valign (label3, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label3), 0, 0.5);
 #endif

@@ -2074,7 +2074,7 @@ servlist_open_networks (void)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label4, GTK_ALIGN_START);
 	gtk_widget_set_valign (label4, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5);
 #endif

@@ -2086,7 +2086,7 @@ servlist_open_networks (void)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label5, GTK_ALIGN_START);
 	gtk_widget_set_valign (label5, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label5), 0, 0.5);
 #endif

@@ -2098,7 +2098,7 @@ servlist_open_networks (void)
 #if HAVE_GTK3
 	gtk_widget_set_halign (label6, GTK_ALIGN_START);
 	gtk_widget_set_valign (label6, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (label6), 0, 0.5);
 #endif

--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -730,7 +730,7 @@ setup_headlabel (GtkWidget *tab, int row, int col, char *text)
 #if HAVE_GTK3
        gtk_widget_set_halign (label, GTK_ALIGN_START);
        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 #endif
        gtk_table_attach (GTK_TABLE (tab), label, col, col + 1, row, row + 1, 0, 0, 4, 0);
@@ -756,7 +756,7 @@ setup_create_3oggle (GtkWidget *tab, int row, const setting *set)
 #if HAVE_GTK3
        gtk_widget_set_halign (label, GTK_ALIGN_START);
        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 #endif
        if (set->tooltip)
@@ -875,7 +875,7 @@ setup_create_spin (GtkWidget *table, int row, const setting *set)
 #if HAVE_GTK3
        gtk_widget_set_halign (label, GTK_ALIGN_START);
        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 #endif
        gtk_table_attach (GTK_TABLE (table), label, 2, 3, row, row + 1,
@@ -953,7 +953,7 @@ setup_create_hscale (GtkWidget *table, int row, const setting *set)
 #if HAVE_GTK3
        gtk_widget_set_halign (wid, GTK_ALIGN_START);
        gtk_widget_set_valign (wid, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (wid), 0.0, 0.5);
 #endif
        gtk_table_attach (GTK_TABLE (table), wid, 2, 3, row, row + 1,
@@ -1017,7 +1017,7 @@ setup_create_radio (GtkWidget *table, int row, const setting *set)
 #if HAVE_GTK3
        gtk_widget_set_halign (wid, GTK_ALIGN_START);
        gtk_widget_set_valign (wid, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (wid), 0.0, 0.5);
 #endif
        gtk_table_attach (GTK_TABLE (table), wid, 2, 3, row, row + 1,
@@ -1085,7 +1085,7 @@ setup_create_id_menu (GtkWidget *table, char *label, int row, char *dest)
 #if HAVE_GTK3
        gtk_widget_set_halign (wid, GTK_ALIGN_START);
        gtk_widget_set_valign (wid, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (wid), 0.0, 0.5);
 #endif
        gtk_table_attach (GTK_TABLE (table), wid, 2, 3, row, row + 1,
@@ -1136,7 +1136,7 @@ setup_create_menu (GtkWidget *table, int row, const setting *set)
 #if HAVE_GTK3
        gtk_widget_set_halign (wid, GTK_ALIGN_START);
        gtk_widget_set_valign (wid, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (wid), 0.0, 0.5);
 #endif
        gtk_table_attach (GTK_TABLE (table), wid, 2, 3, row, row + 1,
@@ -1302,7 +1302,7 @@ setup_create_entry (GtkWidget *table, int row, const setting *set)
 #if HAVE_GTK3
        gtk_widget_set_halign (label, GTK_ALIGN_START);
        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 #endif
        gtk_table_attach (GTK_TABLE (table), label, 2, 3, row, row + 1,
@@ -1370,7 +1370,7 @@ setup_create_header (GtkWidget *table, int row, char *labeltext)
 #if HAVE_GTK3
        gtk_widget_set_halign (label, GTK_ALIGN_START);
        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 #endif
        gtk_table_attach (GTK_TABLE (table), label, 0, 4, row, row + 1,
@@ -1518,7 +1518,7 @@ setup_create_dark_mode_menu (GtkWidget *table, int row, const setting *set)
 #if HAVE_GTK3
 	gtk_widget_set_halign (wid, GTK_ALIGN_START);
 	gtk_widget_set_valign (wid, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
 	gtk_misc_set_alignment (GTK_MISC (wid), 0.0, 0.5);
 #endif
 	gtk_table_attach (GTK_TABLE (table), wid, 2, 3, row, row + 1,
@@ -1747,7 +1747,7 @@ setup_create_color_button (GtkWidget *table, int num, int row, int col)
 #if HAVE_GTK3
                gtk_widget_set_halign (alignment, GTK_ALIGN_CENTER);
                gtk_widget_set_valign (alignment, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
                gtk_alignment_set (GTK_ALIGNMENT (alignment), 0.5, 0.5, 1.0, 1.0);
                gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 0, 0);
 #endif
@@ -1776,7 +1776,7 @@ setup_create_other_colorR (char *text, int num, int row, GtkWidget *tab)
 #if HAVE_GTK3
        gtk_widget_set_halign (label, GTK_ALIGN_START);
        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 #endif
        gtk_table_attach (GTK_TABLE (tab), label, 5, 9, row, row + 1,
@@ -1793,7 +1793,7 @@ setup_create_other_color (char *text, int num, int row, GtkWidget *tab)
 #if HAVE_GTK3
        gtk_widget_set_halign (label, GTK_ALIGN_START);
        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 #endif
        gtk_table_attach (GTK_TABLE (tab), label, 2, 3, row, row + 1,
@@ -1824,7 +1824,7 @@ setup_create_color_page (void)
 #if HAVE_GTK3
        gtk_widget_set_halign (label, GTK_ALIGN_START);
        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 #endif
        gtk_table_attach (GTK_TABLE (tab), label, 2, 3, 1, 2,
@@ -1837,7 +1837,7 @@ setup_create_color_page (void)
 #if HAVE_GTK3
        gtk_widget_set_halign (label, GTK_ALIGN_START);
        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 #endif
        gtk_table_attach (GTK_TABLE (tab), label, 2, 3, 2, 3,
@@ -1870,7 +1870,7 @@ setup_create_color_page (void)
 #if HAVE_GTK3
        gtk_widget_set_halign (label, GTK_ALIGN_START);
        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 #endif
        gtk_table_attach (GTK_TABLE (tab), label, 2, 3, 16, 17,
@@ -2085,7 +2085,7 @@ setup_create_theme_page (void)
 #if HAVE_GTK3
        gtk_widget_set_halign (label, GTK_ALIGN_START);
        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 #endif
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
@@ -2122,7 +2122,7 @@ setup_create_theme_page (void)
 #if HAVE_GTK3
        gtk_widget_set_halign (ui->status_label, GTK_ALIGN_START);
        gtk_widget_set_valign (ui->status_label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (ui->status_label), 0.0, 0.5);
 #endif
        gtk_box_pack_start (GTK_BOX (box), ui->status_label, FALSE, FALSE, 0);
@@ -2358,7 +2358,7 @@ setup_create_sound_page (void)
 #if HAVE_GTK3
        gtk_widget_set_halign (sound_label, GTK_ALIGN_START);
        gtk_widget_set_valign (sound_label, GTK_ALIGN_CENTER);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (sound_label), 0, 0.5);
 #endif

@@ -2415,7 +2415,7 @@ setup_add_page (const char *title, GtkWidget *book, GtkWidget *tab)
        gtk_widget_set_margin_end (label, 2);
        gtk_widget_set_margin_top (label, 1);
        gtk_widget_set_margin_bottom (label, 1);
-#else
+#elif !HAVE_GTK3
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
        gtk_misc_set_padding (GTK_MISC (label), 2, 1);
 #endif