[balsa/gtk4: 273/294] sendmsg-window: Connect to the "unrealize" signal
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gtk4: 273/294] sendmsg-window: Connect to the "unrealize" signal
- Date: Sun, 10 Oct 2021 00:03:45 +0000 (UTC)
commit a2d1b473b8b2c26a480b8635f948d2ead3cd5a00
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Tue Nov 24 13:46:19 2020 -0500
sendmsg-window: Connect to the "unrealize" signal
GtkWindow no longer emits the "destroy" signal. Also fix the signature
of the "close-request" signal handler.
src/sendmsg-window.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index d2ee1e910..2352364bc 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -479,12 +479,8 @@ delete_handler(gpointer user_data)
g_debug("%s", __func__);
- if (bsmsg == NULL)
- return G_SOURCE_REMOVE;
-
if (bsmsg->state == SENDMSG_STATE_CLEAN) {
- if (GTK_IS_WINDOW(bsmsg->window))
- gtk_window_destroy(GTK_WINDOW(bsmsg->window));
+ gtk_window_destroy(GTK_WINDOW(bsmsg->window));
return G_SOURCE_REMOVE;
}
@@ -521,7 +517,7 @@ delete_handler(gpointer user_data)
}
static gboolean
-sw_close_request_cb(GtkWidget * widget, GdkEvent * e, gpointer data)
+sw_close_request_cb(GtkWindow * window, gpointer data)
{
BalsaSendmsg *bsmsg = data;
@@ -545,13 +541,12 @@ sw_close_activated(GSimpleAction * action,
g_debug("close_window_cb: end");
}
-static gint
-destroy_event_cb(GtkWidget * widget, gpointer data)
+static void
+sw_unrealize_cb(GtkWidget * widget, gpointer data)
{
BalsaSendmsg *bsmsg = data;
balsa_sendmsg_destroy_handler(bsmsg);
- return TRUE;
}
/* the balsa_sendmsg destructor; copies first the shown headers setting
@@ -7378,8 +7373,8 @@ sendmsg_window_new()
g_signal_connect(window, "close-request",
G_CALLBACK(sw_close_request_cb), bsmsg);
- g_signal_connect(window, "destroy",
- G_CALLBACK(destroy_event_cb), bsmsg);
+ g_signal_connect(window, "unrealize",
+ G_CALLBACK(sw_unrealize_cb), bsmsg);
/* If any compose windows are open when Balsa is closed, we want
* them also to be closed. */
g_object_weak_ref(G_OBJECT(balsa_app.main_window),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]