2006-10-07 [colin] 2.5.3cvs17
authorColin Leroy <colin@colino.net>
Sat, 7 Oct 2006 19:24:57 +0000 (19:24 +0000)
committerColin Leroy <colin@colino.net>
Sat, 7 Oct 2006 19:24:57 +0000 (19:24 +0000)
* src/plugins/pgpcore/sgpgme.c
Be sure not to crash on 'application/pgp-signature' that
are not application/pgp-signatures

ChangeLog
PATCHSETS
configure.ac
src/plugins/pgpcore/sgpgme.c

index ec43fbb62558b23a653053f720233e872b9bbbc1..3dba2802d9826ace5cddbde8b027fbe45b03a552 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-07 [colin]     2.5.3cvs17
+
+       * src/plugins/pgpcore/sgpgme.c
+               Be sure not to crash on 'application/pgp-signature' that
+               are not application/pgp-signatures
+
 2006-10-07 [colin]     2.5.3cvs16
 
        * src/textview.c
index c44397930b395cb4e01cb8bfc6d15fe0d2ab83e6..447c12f6305ab72df9ee6aff13fbdcc51dea5d2a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.58.2.25 -r 1.58.2.26 po/de.po;  cvs diff -u -r 1.60.2.35 -r 1.60.2.36 po/es.po;  ) > 2.5.3cvs14.patchset
 ( cvs diff -u -r 1.207.2.129 -r 1.207.2.130 src/folderview.c;  cvs diff -u -r 1.179.2.132 -r 1.179.2.133 src/imap.c;  cvs diff -u -r 1.105.2.67 -r 1.105.2.68 src/prefs_account.c;  cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/wizard.c;  ) > 2.5.3cvs15.patchset
 ( cvs diff -u -r 1.96.2.153 -r 1.96.2.154 src/textview.c;  cvs diff -u -r 1.12.2.13 -r 1.12.2.14 src/textview.h;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpcore/plugin.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/pgpcore/sgpgme.c;  ) > 2.5.3cvs16.patchset
+( cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/plugins/pgpcore/sgpgme.c;  ) > 2.5.3cvs17.patchset
index fc2c49d70fc5072cfcaddcc562a4b1ac94e1794f..3fafbfd3780b8e3748598d745289a991b01e0a2e 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 40e2969a55e677f8d254ce2c85ea6ece89159ddf..50065751cd1c1a23659ad81e2ef9740a9d110237 100644 (file)
@@ -715,7 +715,7 @@ again:
                        if (res == 0) {
                                alertpanel_notice(_("Key exported."));
                        } else {
-                               alertpanel_notice(_("Couldn't export key."));
+                               alertpanel_error(_("Couldn't export key."));
                        }
                        g_free(cmd);
 #else