From: Colin Leroy Date: Mon, 23 May 2005 19:20:57 +0000 (+0000) Subject: 2005-05-23 [colin] 1.9.11cvs3 X-Git-Tag: rel_1_9_12~109 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=4d6669e32653d63d52947e4b26887966d01dd5e2 2005-05-23 [colin] 1.9.11cvs3 * src/plugins/pgpmime/pgpmime.c Change name to "PGP MIME" instead of "PGP/MIME" to avoid breaking menu accelerators and stuff. Users will have to reselect "PGP MIME" instead of "PGP/MIME" in their account's privacy preferences if needed. --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 27a7cccd8..5dd69118a 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,11 @@ +2005-05-23 [colin] 1.9.11cvs3 + + * src/plugins/pgpmime/pgpmime.c + Change name to "PGP MIME" instead of "PGP/MIME" to avoid + breaking menu accelerators and stuff. Users will have to + reselect "PGP MIME" instead of "PGP/MIME" in their + account's privacy preferences if needed. + 2005-05-22 [paul] * tools/kdeservicemenu/install.sh diff --git a/PATCHSETS b/PATCHSETS index 4ef9aadfa..1afd91247 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -491,3 +491,4 @@ ( cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/gtk/inputdialog.c; ) > 1.9.9cvs14.patchset ( cvs diff -u -r 1.150.2.23 -r 1.150.2.24 src/procmsg.c; ) > 1.9.11cvs1.patchset ( cvs diff -u -r 1.150.2.24 -r 1.150.2.25 src/procmsg.c; cvs diff -u -r 1.17.2.9 -r 1.17.2.10 src/send_message.c; ) > 1.9.11cvs2.patchset +( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpmime/pgpmime.c; ) > 1.9.11cvs3.patchset diff --git a/configure.ac b/configure.ac index 0b833af00..d6485a112 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=11 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=2 +EXTRA_VERSION=3 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c index a2487fd63..19d2a3757 100644 --- a/src/plugins/pgpmime/pgpmime.c +++ b/src/plugins/pgpmime/pgpmime.c @@ -590,7 +590,7 @@ gboolean pgpmime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data) static PrivacySystem pgpmime_system = { "pgpmime", /* id */ - "PGP/MIME", /* name */ + "PGP MIME", /* name */ pgpmime_free_privacydata, /* free_privacydata */