[balsa/gtk3] Compose window may outlive main window

[Peter Bloomfield <peterb src gnome org>]

commit d51434bfc9c52e6d13920da631fb7c566f0a8ae0
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Mon Feb 2 09:09:01 2015 -0500

    Compose window may outlive main window
    
        * src/main-window.c (bw_send_msg_window_destroy_cb): check for
        NULL main-window.
        * src/sendmsg-window.c (balsa_sendmsg_destroy_handler): ditto.

 ChangeLog            |    8 ++++++++
 src/main-window.c    |    3 ++-
 src/sendmsg-window.c |   10 ++++++----
 3 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6c69a50..65ae2dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-02  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       Compose window may outlive main window
+
+       * src/main-window.c (bw_send_msg_window_destroy_cb): check for
+       NULL main-window.
+       * src/sendmsg-window.c (balsa_sendmsg_destroy_handler): ditto.
+
 2015-01-29  Peter Bloomfield  <pbloomfield bellsouth net>
 
        Possible fix for RedHat bug #1050738 (Geoff Leach)
diff --git a/src/main-window.c b/src/main-window.c
index 0d29fd5..9a086a1 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -4612,7 +4612,8 @@ bw_select_part_cb(BalsaMessage * bm, gpointer data)
 static void
 bw_send_msg_window_destroy_cb(GtkWidget * widget, gpointer data)
 {
-    balsa_window_enable_continue(BALSA_WINDOW(data));
+    if (balsa_app.main_window)
+        balsa_window_enable_continue(BALSA_WINDOW(data));
 }
 #endif /*ENABLE_TOUCH_UI */
 
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 30cf2f0..8ea60de 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -602,10 +602,12 @@ balsa_sendmsg_destroy_handler(BalsaSendmsg * bsmsg)
 
     g_assert(bsmsg != NULL);
 
-    g_signal_handler_disconnect(G_OBJECT(balsa_app.main_window),
-                                bsmsg->delete_sig_id);
-    g_signal_handler_disconnect(G_OBJECT(balsa_app.main_window),
-                                bsmsg->identities_changed_id);
+    if (balsa_app.main_window) {
+        g_signal_handler_disconnect(G_OBJECT(balsa_app.main_window),
+                                    bsmsg->delete_sig_id);
+        g_signal_handler_disconnect(G_OBJECT(balsa_app.main_window),
+                                    bsmsg->identities_changed_id);
+    }
     if(balsa_app.debug) g_message("balsa_sendmsg_destroy()_handler: Start.");
 
     if (bsmsg->parent_message) {