talons

commit 485639046096e8d8902c8ae2ac94bf99704a7c9c
parent f3cdbe7e8979f811c434dba47f48afec614e4834
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 15 Feb 2008 10:02:19 +0000

2008-02-15 [colin]	3.3.0cvs13

	* src/main.c
		Always focus folder tree at startup
	* src/compose.c
		Fix bug 1521, 'Cannot close compose window after
		replying to a non-existent news message'

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/compose.c
 | 
6
+++++-
M
src/main.c
 | 
5
++---

5 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-15 [colin]	3.3.0cvs13
+
+	* src/main.c
+		Always focus folder tree at startup
+	* src/compose.c
+		Fix bug 1521, 'Cannot close compose window after 
+		replying to a non-existent news message'
+
 2008-02-13 [colin]	3.3.0cvs12
 
 	* src/folderview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3226,3 +3226,4 @@
 ( cvs diff -u -r 1.75.2.54 -r 1.75.2.55 src/matcher.c;  ) > 3.3.0cvs10.patchset
 ( cvs diff -u -r 1.179.2.209 -r 1.179.2.210 src/imap.c;  cvs diff -u -r 1.1.4.96 -r 1.1.4.97 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/etpan/imap-thread.h;  ) > 3.3.0cvs11.patchset
 ( cvs diff -u -r 1.207.2.196 -r 1.207.2.197 src/folderview.c;  ) > 3.3.0cvs12.patchset
+( cvs diff -u -r 1.115.2.186 -r 1.115.2.187 src/main.c;  cvs diff -u -r 1.382.2.437 -r 1.382.2.438 src/compose.c;  ) > 3.3.0cvs13.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=13
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -1499,7 +1499,11 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
 		g_free(folderidentifier);
 	}
 
-	if (compose_parse_header(compose, msginfo) < 0) return NULL;
+	if (compose_parse_header(compose, msginfo) < 0) {
+		compose->updating = FALSE;
+		compose_destroy(compose);
+		return NULL;
+	}
 
 	textview = (GTK_TEXT_VIEW(compose->text));
 	textbuf = gtk_text_view_get_buffer(textview);
diff --git a/src/main.c b/src/main.c
@@ -1474,9 +1474,8 @@ int main(int argc, char *argv[])
 	} else if (cmd.receive && !cmd.target) {
 		start_done = FALSE;
 		g_timeout_add(1000, defer_check, NULL);
-	} else {
-		gtk_widget_grab_focus(folderview->ctree);
-	}
+	} 
+	gtk_widget_grab_focus(folderview->ctree);
 
 	if (cmd.compose) {
 		open_compose_new(cmd.compose_mailto, cmd.attach_files);