fix segfault on Re-edit

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a8bba4fc113ffa54ad00b285bd8b8e64af10da49..24929fb3a9de48da28db0898340e5859d059e42b 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -11,6 +11,9 @@
        * po/POTFILES.in
                add 'src/prefs_templates.c'
 
        * po/POTFILES.in
                add 'src/prefs_templates.c'
 

+       * src/compose.c, src/summaryview.c
+               fix segfault on 'Re_edit'               
+

 2001-08-30 [alfons]
 
        * configure.in, Makefile.am
 2001-08-30 [alfons]
 
        * configure.in, Makefile.am

diff --git a/src/compose.c b/src/compose.c
index e0cfea7218893e4b1fee00b01406f15e04d361d5..2e09465ca7a740217d9c345af9f77174c7654d52 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1080,6 +1080,8 @@ void compose_reedit(MsgInfo *msginfo)
        g_return_if_fail(msginfo != NULL);
        g_return_if_fail(msginfo->folder != NULL);
 
        g_return_if_fail(msginfo != NULL);
        g_return_if_fail(msginfo->folder != NULL);
 

+        account = msginfo->folder->folder->account;
+

         if(!account&& prefs_common.reedit_account_autosel) {
                        gchar from[BUFFSIZE];
                if(!get_header_from_msginfo(msginfo,from,sizeof(from),"FROM:")){ /* Found a FROM header */
         if(!account&& prefs_common.reedit_account_autosel) {
                        gchar from[BUFFSIZE];
                if(!get_header_from_msginfo(msginfo,from,sizeof(from),"FROM:")){ /* Found a FROM header */

diff --git a/src/summaryview.c b/src/summaryview.c
index 81b6faa6249a3acf0472c3a7cc408eedf74f4a91..e73fa76cbf138f75e4c7f10e7f76af276bcab37f 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -760,7 +760,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
        STATUSBAR_POP(summaryview->mainwin);
 
        is_refresh = (!prefs_common.open_inbox_on_inc &&
        STATUSBAR_POP(summaryview->mainwin);
 
        is_refresh = (!prefs_common.open_inbox_on_inc &&

-                     item == summaryview->folder_item) ? TRUE : FALSE;
+                     item == summaryview->folder_item &&
+                     update_cache == FALSE) ? TRUE : FALSE;

        if (is_refresh) {
                selected_msgnum = summary_get_msgnum(summaryview,
                                                     summaryview->selected);
        if (is_refresh) {
                selected_msgnum = summary_get_msgnum(summaryview,
                                                     summaryview->selected);


@@ -3859,7 +3860,9 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
 static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
 {
 
 static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
 {

-       if (summaryview->folder_item->stype == F_DRAFT)
+       if (summaryview->folder_item->stype == F_DRAFT  ||
+           summaryview->folder_item->stype == F_OUTBOX ||
+            summaryview->folder_item->stype == F_QUEUE)

                summary_reedit(summaryview);
        else
                summary_open_msg(summaryview);
                summary_reedit(summaryview);
        else
                summary_open_msg(summaryview);