2007-09-21 [mones] 3.0.1cvs17
authorRicardo Mones <mones@claws-mail.org>
Fri, 21 Sep 2007 09:21:39 +0000 (09:21 +0000)
committerRicardo Mones <mones@claws-mail.org>
Fri, 21 Sep 2007 09:21:39 +0000 (09:21 +0000)
* src/compose.c
Fix for bug 1327, 'segfault when replying to a non-existent
news message', thanks to Colin.

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index 9058ad8..c1fcd2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-21 [mones]     3.0.1cvs17
+
+       * src/compose.c
+               Fix for bug 1327, 'segfault when replying to a non-existent
+               news message', thanks to Colin.
+
 2007-09-21 [colin]     3.0.1cvs16
 
        * src/folderview.c
index d837791..dac21d6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/printing.c;  ) > 3.0.1cvs14.patchset
 ( cvs diff -u -r 1.207.2.183 -r 1.207.2.184 src/folderview.c;  cvs diff -u -r 1.20.2.21 -r 1.20.2.22 src/folderview.h;  ) > 3.0.1cvs15.patchset
 ( cvs diff -u -r 1.207.2.184 -r 1.207.2.185 src/folderview.c;  ) > 3.0.1cvs16.patchset
+( cvs diff -u -r 1.382.2.409 -r 1.382.2.410 src/compose.c;  ) > 3.0.1cvs17.patchset
index 3878815..26d647e 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index f006de0..cfc33e5 100644 (file)
@@ -1304,6 +1304,10 @@ static Compose *compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar
                g_warning("compose_reply_mode(): invalid Compose Mode: %d\n", mode);
        }
        
+       if (compose == NULL) {
+               alertpanel_error(_("Unable to reply. The original email probably doesn't exist."));
+               return NULL;
+       }
        ifactory = gtk_item_factory_from_widget(compose->menubar);
 
        compose->rmode = mode;
@@ -9981,7 +9985,7 @@ static void compose_reply_from_messageview_real(MessageView *msgview, GSList *ms
        } else
                compose = compose_reply_mode((ComposeMode)action, msginfo_list, body);
 
-       if (originally_enc) {
+       if (compose && originally_enc) {
                compose_force_encryption(compose, compose->account, FALSE);
        }