From 370cbd02d770a2c904f06359cfc7d91e28648720 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Fri, 19 Nov 2021 15:28:52 +0200
Subject: [PATCH 12/12] gtk: Drop unused buy_shell, rename_input from struct
city_dialog
See osdn #43239
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
client/gui-gtk-2.0/citydlg.c | 8 ++------
client/gui-gtk-3.0/citydlg.c | 8 ++------
client/gui-gtk-3.22/citydlg.c | 8 ++------
3 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/client/gui-gtk-2.0/citydlg.c b/client/gui-gtk-2.0/citydlg.c
index 4677a3cf0f..d249082407 100644
--- a/client/gui-gtk-2.0/citydlg.c
+++ b/client/gui-gtk-2.0/citydlg.c
@@ -180,9 +180,9 @@ struct city_dialog {
short block_signal;
} misc;
- GtkWidget *buy_shell, *sell_shell;
+ GtkWidget *sell_shell;
GtkTreeSelection *change_selection;
- GtkWidget *rename_shell, *rename_input;
+ GtkWidget *rename_shell;
GtkWidget *show_units_command;
GtkWidget *prev_command, *next_command;
@@ -1298,7 +1298,6 @@ static struct city_dialog *create_city_dialog(struct city *pcity)
pdialog = fc_malloc(sizeof(struct city_dialog));
pdialog->pcity = pcity;
- pdialog->buy_shell = NULL;
pdialog->sell_shell = NULL;
pdialog->rename_shell = NULL;
pdialog->happiness.map_canvas.sw = NULL; /* make sure NULL if spy */
@@ -2941,9 +2940,6 @@ static void city_destroy_callback(GtkWidget *w, gpointer data)
unit_node_vector_free(&pdialog->overview.supported_units);
unit_node_vector_free(&pdialog->overview.present_units);
- if (pdialog->buy_shell) {
- gtk_widget_destroy(pdialog->buy_shell);
- }
if (pdialog->sell_shell) {
gtk_widget_destroy(pdialog->sell_shell);
}
diff --git a/client/gui-gtk-3.0/citydlg.c b/client/gui-gtk-3.0/citydlg.c
index d999bfc06d..1dc54aafbb 100644
--- a/client/gui-gtk-3.0/citydlg.c
+++ b/client/gui-gtk-3.0/citydlg.c
@@ -195,9 +195,9 @@ struct city_dialog {
short block_signal;
} misc;
- GtkWidget *buy_shell, *sell_shell;
+ GtkWidget *sell_shell;
GtkTreeSelection *change_selection;
- GtkWidget *rename_shell, *rename_input;
+ GtkWidget *rename_shell;
GtkWidget *show_units_command;
GtkWidget *prev_command, *next_command;
@@ -1514,7 +1514,6 @@ static struct city_dialog *create_city_dialog(struct city *pcity)
pdialog = fc_malloc(sizeof(struct city_dialog));
pdialog->pcity = pcity;
- pdialog->buy_shell = NULL;
pdialog->sell_shell = NULL;
pdialog->rename_shell = NULL;
pdialog->happiness.map_canvas.sw = NULL; /* make sure NULL if spy */
@@ -3346,9 +3345,6 @@ static void city_destroy_callback(GtkWidget *w, gpointer data)
unit_node_vector_free(&pdialog->overview.supported_units);
unit_node_vector_free(&pdialog->overview.present_units);
- if (pdialog->buy_shell) {
- gtk_widget_destroy(pdialog->buy_shell);
- }
if (pdialog->sell_shell) {
gtk_widget_destroy(pdialog->sell_shell);
}
diff --git a/client/gui-gtk-3.22/citydlg.c b/client/gui-gtk-3.22/citydlg.c
index 4e16b1fff3..5b2c71afdc 100644
--- a/client/gui-gtk-3.22/citydlg.c
+++ b/client/gui-gtk-3.22/citydlg.c
@@ -195,9 +195,9 @@ struct city_dialog {
short block_signal;
} misc;
- GtkWidget *buy_shell, *sell_shell;
+ GtkWidget *sell_shell;
GtkTreeSelection *change_selection;
- GtkWidget *rename_shell, *rename_input;
+ GtkWidget *rename_shell;
GtkWidget *show_units_command;
GtkWidget *prev_command;
@@ -1553,7 +1553,6 @@ static struct city_dialog *create_city_dialog(struct city *pcity)
pdialog = fc_malloc(sizeof(struct city_dialog));
pdialog->pcity = pcity;
- pdialog->buy_shell = NULL;
pdialog->sell_shell = NULL;
pdialog->rename_shell = NULL;
pdialog->happiness.map_canvas.sw = NULL; /* make sure NULL if spy */
@@ -3378,9 +3377,6 @@ static void city_destroy_callback(GtkWidget *w, gpointer data)
unit_node_vector_free(&pdialog->overview.supported_units);
unit_node_vector_free(&pdialog->overview.present_units);
- if (pdialog->buy_shell) {
- gtk_widget_destroy(pdialog->buy_shell);
- }
if (pdialog->sell_shell) {
gtk_widget_destroy(pdialog->sell_shell);
}
--
2.33.0