From ffbfa360bbdb1adf6e12f72ac09944bc8f772015 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 22 Sep 2026 03:22:59 +0300 Subject: [PATCH 70/70] gtk4(x): Drop unused meswin_dialog_popdown() See RM #2275 Signed-off-by: Marko Lindqvist --- client/gui-gtk-4.0/messagewin.c | 24 ------------------------ client/gui-gtk-4.0/messagewin.h | 4 +--- client/gui-gtk-5.0/messagewin.c | 24 ------------------------ client/gui-gtk-5.0/messagewin.h | 4 +--- 4 files changed, 2 insertions(+), 54 deletions(-) diff --git a/client/gui-gtk-4.0/messagewin.c b/client/gui-gtk-4.0/messagewin.c index 1ea1572e72..dfe509413d 100644 --- a/client/gui-gtk-4.0/messagewin.c +++ b/client/gui-gtk-4.0/messagewin.c @@ -402,19 +402,6 @@ static void meswin_dialog_init(struct meswin_dialog *pdialog) gui_dialog_show_all(pdialog->shell); } -/************************************************************************//** - Closes a message window dialog. -****************************************************************************/ -static void meswin_dialog_free(struct meswin_dialog *pdialog) -{ - fc_assert_ret(NULL != pdialog); - - gui_dialog_destroy(pdialog->shell); - fc_assert(NULL == pdialog->shell); - - memset(pdialog, 0, sizeof(*pdialog)); -} - /************************************************************************//** Popup the dialog inside the main-window, and optionally raise it. ****************************************************************************/ @@ -432,17 +419,6 @@ void meswin_dialog_popup(bool raise) } } -/************************************************************************//** - Closes the message window dialog. -****************************************************************************/ -void meswin_dialog_popdown(void) -{ - if (NULL != meswin.shell) { - meswin_dialog_free(&meswin); - fc_assert(NULL == meswin.shell); - } -} - /************************************************************************//** Return TRUE iff the message window is open. ****************************************************************************/ diff --git a/client/gui-gtk-4.0/messagewin.h b/client/gui-gtk-4.0/messagewin.h index 6242977a33..f3f47b4f43 100644 --- a/client/gui-gtk-4.0/messagewin.h +++ b/client/gui-gtk-4.0/messagewin.h @@ -16,6 +16,4 @@ /* client */ #include "messagewin_g.h" -void meswin_dialog_popdown(void); - -#endif /* FC__MESSAGEWIN_H */ +#endif /* FC__MESSAGEWIN_H */ diff --git a/client/gui-gtk-5.0/messagewin.c b/client/gui-gtk-5.0/messagewin.c index bb3baf446a..8acd38a3e2 100644 --- a/client/gui-gtk-5.0/messagewin.c +++ b/client/gui-gtk-5.0/messagewin.c @@ -402,19 +402,6 @@ static void meswin_dialog_init(struct meswin_dialog *pdialog) gui_dialog_show_all(pdialog->shell); } -/************************************************************************//** - Closes a message window dialog. -****************************************************************************/ -static void meswin_dialog_free(struct meswin_dialog *pdialog) -{ - fc_assert_ret(NULL != pdialog); - - gui_dialog_destroy(pdialog->shell); - fc_assert(NULL == pdialog->shell); - - memset(pdialog, 0, sizeof(*pdialog)); -} - /************************************************************************//** Popup the dialog inside the main-window, and optionally raise it. ****************************************************************************/ @@ -432,17 +419,6 @@ void meswin_dialog_popup(bool raise) } } -/************************************************************************//** - Closes the message window dialog. -****************************************************************************/ -void meswin_dialog_popdown(void) -{ - if (NULL != meswin.shell) { - meswin_dialog_free(&meswin); - fc_assert(NULL == meswin.shell); - } -} - /************************************************************************//** Return TRUE iff the message window is open. ****************************************************************************/ diff --git a/client/gui-gtk-5.0/messagewin.h b/client/gui-gtk-5.0/messagewin.h index 6242977a33..f3f47b4f43 100644 --- a/client/gui-gtk-5.0/messagewin.h +++ b/client/gui-gtk-5.0/messagewin.h @@ -16,6 +16,4 @@ /* client */ #include "messagewin_g.h" -void meswin_dialog_popdown(void); - -#endif /* FC__MESSAGEWIN_H */ +#endif /* FC__MESSAGEWIN_H */ -- 2.53.0