[balsa/gtk3] Check for NULL tree-view



commit 93cddb3c69a87b7991dbfed7450f0739bd5fd91e
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Fri Jun 21 12:42:25 2013 -0400

    Check for NULL tree-view
    
        * src/sendmsg-window.c (drag_data_quote), (bsmsg2message),
        (send_message_handler): check for NULL tree-view.

 ChangeLog            |    5 +++++
 src/sendmsg-window.c |   11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fe27e37..298db9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-06-21  Peter Bloomfield
 
+       * src/sendmsg-window.c (drag_data_quote), (bsmsg2message),
+       (send_message_handler): check for NULL tree-view.
+
+2013-06-21  Peter Bloomfield
+
        * src/sendmsg-window.c (remove_attachment), (change_attach_mode),
        (show_attachment_widget), (add_attachment),
        (add_urlref_attachment), (create_info_pane), (sw_attachment_list),
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index aa8795b..24b39cb 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -3194,8 +3194,9 @@ drag_data_quote(GtkWidget * widget,
 
            find_file.name = uri_list->data;
            find_file.found = FALSE;
-           gtk_tree_model_foreach(BALSA_MSG_ATTACH_MODEL(bsmsg),
-                                  has_file_attached, &find_file);
+            if (bsmsg->tree_view)
+                gtk_tree_model_foreach(BALSA_MSG_ATTACH_MODEL(bsmsg),
+                                       has_file_attached, &find_file);
             if (!find_file.found)
                 add_attachment(bsmsg, uri_list->data, FALSE, NULL);
         }
@@ -5699,8 +5700,9 @@ bsmsg2message(BalsaSendmsg * bsmsg)
     libbalsa_message_append_part(message, body);
 
     /* add attachments */
-    gtk_tree_model_foreach(BALSA_MSG_ATTACH_MODEL(bsmsg),
-                          attachment2message, message);
+    if (bsmsg->tree_view)
+        gtk_tree_model_foreach(BALSA_MSG_ATTACH_MODEL(bsmsg),
+                               attachment2message, message);
 
     message->headers->date = time(NULL);
 #ifdef HAVE_GPGME
@@ -5979,6 +5981,7 @@ send_message_handler(BalsaSendmsg * bsmsg, gboolean queue_only)
         gboolean warn_html_sign;
 
         warn_mp = (bsmsg->gpg_mode & LIBBALSA_PROTECT_MODE) != 0 &&
+            bsmsg->tree_view &&
             gtk_tree_model_get_iter_first(BALSA_MSG_ATTACH_MODEL(bsmsg), &iter);
         warn_html_sign = (bsmsg->gpg_mode & LIBBALSA_PROTECT_MODE) == LIBBALSA_PROTECT_SIGN &&
             bsmsg->send_mp_alt;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]