From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 31 Aug 2001 09:22:09 +0000 (+0000)
Subject: fix segfault on Re-edit
X-Git-Tag: pre_compose_gui_improvement~20
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d347e9ea26614a0636e99b743d75d8b6e9b205f4

fix segfault on Re-edit
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a8bba4fc1..24929fb3a 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -11,6 +11,9 @@
 	* 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
diff --git a/src/compose.c b/src/compose.c
index e0cfea721..2e09465ca 100644
--- 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);
 
+        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 */
diff --git a/src/summaryview.c b/src/summaryview.c
index 81b6faa62..e73fa76cb 100644
--- 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 &&
-		      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);
@@ -3859,7 +3860,9 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
 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);