From 2a3f65bc3bd99ab77f92936ed0a4846b72bbc86d Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 12 Sep 2026 14:28:31 +0300 Subject: [PATCH 69/69] gtk: Drop unused network_[login|host|port]_label See RM #2225 Signed-off-by: Marko Lindqvist --- client/gui-gtk-3.22/pages.c | 9 +++------ client/gui-gtk-4.0/pages.c | 9 +++------ client/gui-gtk-5.0/pages.c | 9 +++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/client/gui-gtk-3.22/pages.c b/client/gui-gtk-3.22/pages.c index 299f967156..ac434d3e9d 100644 --- a/client/gui-gtk-3.22/pages.c +++ b/client/gui-gtk-3.22/pages.c @@ -692,9 +692,9 @@ static GtkWidget *save_dialog_new(const char *title, const char *savelabel, /**************************************************************************** NETWORK PAGE ****************************************************************************/ -static GtkWidget *network_login_label, *network_login; -static GtkWidget *network_host_label, *network_host; -static GtkWidget *network_port_label, *network_port; +static GtkWidget *network_login; +static GtkWidget *network_host; +static GtkWidget *network_port; static GtkWidget *network_password_label, *network_password; static GtkWidget *network_confirm_password_label, *network_confirm_password; @@ -1334,7 +1334,6 @@ GtkWidget *create_network_page(void) "xalign", 0.0, "yalign", 0.5, NULL); - network_host_label = label; gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1); network_port = gtk_entry_new(); @@ -1349,7 +1348,6 @@ GtkWidget *create_network_page(void) "xalign", 0.0, "yalign", 0.5, NULL); - network_port_label = label; gtk_grid_attach(GTK_GRID(table), label, 0, 1, 1, 1); network_login = gtk_entry_new(); @@ -1366,7 +1364,6 @@ GtkWidget *create_network_page(void) "yalign", 0.5, NULL); gtk_widget_set_margin_top(label, 10); - network_login_label = label; gtk_grid_attach(GTK_GRID(table), label, 0, 3, 1, 1); network_password = gtk_entry_new(); diff --git a/client/gui-gtk-4.0/pages.c b/client/gui-gtk-4.0/pages.c index 79120e9129..1dc67fa301 100644 --- a/client/gui-gtk-4.0/pages.c +++ b/client/gui-gtk-4.0/pages.c @@ -703,9 +703,9 @@ static GtkWidget *save_dialog_new(const char *title, const char *savelabel, /**************************************************************************** NETWORK PAGE ****************************************************************************/ -static GtkWidget *network_login_label, *network_login; -static GtkWidget *network_host_label, *network_host; -static GtkWidget *network_port_label, *network_port; +static GtkWidget *network_login; +static GtkWidget *network_host; +static GtkWidget *network_port; static GtkWidget *network_password_label, *network_password; static GtkWidget *network_confirm_password_label, *network_confirm_password; @@ -1365,7 +1365,6 @@ GtkWidget *create_network_page(void) "xalign", 0.0, "yalign", 0.5, NULL); - network_host_label = label; gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1); network_port = gtk_entry_new(); @@ -1380,7 +1379,6 @@ GtkWidget *create_network_page(void) "xalign", 0.0, "yalign", 0.5, NULL); - network_port_label = label; gtk_grid_attach(GTK_GRID(table), label, 0, 1, 1, 1); network_login = gtk_entry_new(); @@ -1397,7 +1395,6 @@ GtkWidget *create_network_page(void) "yalign", 0.5, NULL); gtk_widget_set_margin_top(label, 10); - network_login_label = label; gtk_grid_attach(GTK_GRID(table), label, 0, 3, 1, 1); network_password = gtk_entry_new(); diff --git a/client/gui-gtk-5.0/pages.c b/client/gui-gtk-5.0/pages.c index 7f5df24c3d..8d8aed9328 100644 --- a/client/gui-gtk-5.0/pages.c +++ b/client/gui-gtk-5.0/pages.c @@ -980,9 +980,9 @@ static GtkWidget *save_dialog_new(const char *title, const char *savelabel, /**************************************************************************** NETWORK PAGE ****************************************************************************/ -static GtkWidget *network_login_label, *network_login; -static GtkWidget *network_host_label, *network_host; -static GtkWidget *network_port_label, *network_port; +static GtkWidget *network_login; +static GtkWidget *network_host; +static GtkWidget *network_port; static GtkWidget *network_password_label, *network_password; static GtkWidget *network_confirm_password_label, *network_confirm_password; @@ -1781,7 +1781,6 @@ GtkWidget *create_network_page(void) "xalign", 0.0, "yalign", 0.5, NULL); - network_host_label = label; gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1); network_port = gtk_entry_new(); @@ -1796,7 +1795,6 @@ GtkWidget *create_network_page(void) "xalign", 0.0, "yalign", 0.5, NULL); - network_port_label = label; gtk_grid_attach(GTK_GRID(table), label, 0, 1, 1, 1); network_login = gtk_entry_new(); @@ -1813,7 +1811,6 @@ GtkWidget *create_network_page(void) "yalign", 0.5, NULL); gtk_widget_set_margin_top(label, 10); - network_login_label = label; gtk_grid_attach(GTK_GRID(table), label, 0, 3, 1, 1); network_password = gtk_entry_new(); -- 2.53.0