From d5a50901d0fa1fa91e61c5568dcfc6fbec52694a Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 18 Aug 2026 23:14:39 +0300 Subject: [PATCH 55/55] gtk: Drop unused city_dialog_shell_is_modal See RM #2148 Signed-off-by: Marko Lindqvist --- client/gui-gtk-3.22/cityrep.c | 4 ---- client/gui-gtk-4.0/cityrep.c | 4 ---- client/gui-gtk-5.0/cityrep.c | 4 ---- 3 files changed, 12 deletions(-) diff --git a/client/gui-gtk-3.22/cityrep.c b/client/gui-gtk-3.22/cityrep.c index 4cf74b76c4..dda8ff57bc 100644 --- a/client/gui-gtk-3.22/cityrep.c +++ b/client/gui-gtk-3.22/cityrep.c @@ -159,8 +159,6 @@ static GtkWidget *select_units_item; static GtkWidget *select_wonders_item; static GtkWidget *select_cma_item; -static int city_dialog_shell_is_modal; - bool select_menu_cached; /************************************************************************//** @@ -292,8 +290,6 @@ static void city_model_fill(GtkListStore *store, void city_report_dialog_popup(bool raise) { if (!city_dialog_shell) { - city_dialog_shell_is_modal = FALSE; - create_city_report_dialog(FALSE); select_menu_cached = FALSE; diff --git a/client/gui-gtk-4.0/cityrep.c b/client/gui-gtk-4.0/cityrep.c index 4eb60b3a8a..b463d15d09 100644 --- a/client/gui-gtk-4.0/cityrep.c +++ b/client/gui-gtk-4.0/cityrep.c @@ -137,8 +137,6 @@ static GMenu *impr_a_select_menu; static GMenu *wndr_a_select_menu; static GMenu *governor_select_menu; -static int city_dialog_shell_is_modal; - static GMenu *cityrep_menu; static GActionGroup *cityrep_group; static GMenu *display_menu; @@ -272,8 +270,6 @@ static void city_model_fill(GtkListStore *store, void city_report_dialog_popup(bool raise) { if (!city_dialog_shell) { - city_dialog_shell_is_modal = FALSE; - create_city_report_dialog(FALSE); } diff --git a/client/gui-gtk-5.0/cityrep.c b/client/gui-gtk-5.0/cityrep.c index 788f34f8ba..697dc27cda 100644 --- a/client/gui-gtk-5.0/cityrep.c +++ b/client/gui-gtk-5.0/cityrep.c @@ -140,8 +140,6 @@ static GMenu *impr_a_select_menu; static GMenu *wndr_a_select_menu; static GMenu *governor_select_menu; -static int city_dialog_shell_is_modal; - static GMenu *cityrep_menu; static GActionGroup *cityrep_group; static GMenu *display_menu; @@ -421,8 +419,6 @@ static void city_store_fill(GListStore *store, void city_report_dialog_popup(bool raise) { if (!city_dialog_shell) { - city_dialog_shell_is_modal = FALSE; - create_city_report_dialog(FALSE); } -- 2.53.0