2006-03-16 [colin] 2.0.0cvs142
authorColin Leroy <colin@colino.net>
Thu, 16 Mar 2006 19:17:01 +0000 (19:17 +0000)
committerColin Leroy <colin@colino.net>
Thu, 16 Mar 2006 19:17:01 +0000 (19:17 +0000)
* src/messageview.c
Complete the previous messageview crash fix

ChangeLog
PATCHSETS
configure.ac
src/messageview.c

index b652410..3c3e24a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-16 [colin]     2.0.0cvs142
+
+       * src/messageview.c
+               Complete the previous messageview crash fix
+
 2006-03-16 [colin]     2.0.0cvs141
 
        * src/procmsg.h
index 45092a2..730ca35 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.17.2.21 -r 1.17.2.22 src/alertpanel.c;  ) > 2.0.0cvs139.patchset
 ( cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/gtk/quicksearch.c;  cvs diff -u -r 1.395.2.181 -r 1.395.2.182 src/summaryview.c;  ) > 2.0.0cvs140.patchset
 ( cvs diff -u -r 1.150.2.57 -r 1.150.2.58 src/procmsg.c;  cvs diff -u -r 1.60.2.26 -r 1.60.2.27 src/procmsg.h;  cvs diff -u -r 1.213.2.85 -r 1.213.2.86 src/folder.c;  cvs diff -u -r 1.49.2.74 -r 1.49.2.75 src/procmime.c;  cvs diff -u -r 1.17.2.14 -r 1.17.2.15 src/procmime.h;  cvs diff -u -r 1.43.2.41 -r 1.43.2.42 src/toolbar.c;  cvs diff -u -r 1.94.2.80 -r 1.94.2.81 src/messageview.c;  cvs diff -u -r 1.19.2.7 -r 1.19.2.8 src/messageview.h;  ) > 2.0.0cvs141.patchset
+( cvs diff -u -r 1.94.2.81 -r 1.94.2.82 src/messageview.c;  ) > 2.0.0cvs142.patchset
index 831101b..f13d936 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=141
+EXTRA_VERSION=142
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 4f31456..6207eeb 100644 (file)
@@ -770,7 +770,15 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                                messageview->toolbar->learn_spam_btn, 
                                procmsg_spam_can_learn());
        }
+       messageview->updating = TRUE;
        mimeinfo = procmime_scan_message(msginfo);
+       messageview->updating = FALSE;
+       
+       if (messageview->deferred_destroy) {
+               messageview_destroy(messageview);
+               return 0;
+       }
+
        if (!mimeinfo) {
                textview_show_error(messageview->mimeview->textview);
                return -1;
@@ -782,14 +790,23 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                        break;
        }
        
+       messageview->updating = TRUE;
        file = procmsg_get_message_file_path(msginfo);
+       messageview->updating = FALSE;
+       
+       if (messageview->deferred_destroy) {
+               g_free(file);
+               messageview_destroy(messageview);
+               return 0;
+       }
+
        if (!file) {
                g_warning("can't get message file path.\n");
                procmime_mimeinfo_free_all(mimeinfo);
                textview_show_error(messageview->mimeview->textview);
                return -1;
        }
-
+       
        if (messageview->msginfo != msginfo) {
                procmsg_msginfo_free(messageview->msginfo);
                messageview->msginfo = procmsg_msginfo_get_full_info(msginfo);