2008-02-15 [colin] 3.3.0cvs13
authorColin Leroy <colin@colino.net>
Fri, 15 Feb 2008 10:02:19 +0000 (10:02 +0000)
committerColin Leroy <colin@colino.net>
Fri, 15 Feb 2008 10:02:19 +0000 (10:02 +0000)
* 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'

ChangeLog
PATCHSETS
configure.ac
src/compose.c
src/main.c

index a69af3b9c9bcb8e6e5ebe92022636afbacd0349c..1bd6c78f1a0c0a6b1cded2efbc3e8b66c8387ad7 100644 (file)
--- 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
index edf7784fa65bfca86f86114713d9d6d7b843de8c..129ff5799fd0ab9fea96c9089c1b759f4ee1a6d6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index c314cb7924bdb78983922901e6f2d338e31cbab2..1ff64dd63f6df51ddec9d000710b1acdf5b90aa4 100644 (file)
@@ -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=
 
index 378d4e8195d412e13a3ff2f2e412c8d0237e809a..7bdfa49e43f7db6de303fd011e89f3037870663d 100644 (file)
@@ -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);
index b5278e867a8388f0f1256eb6ecda09f940d5e60c..04e39375ffeec34abd59d6381da2b512f26d2b7a 100644 (file)
@@ -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);