2008-12-09 [paul] 3.6.1cvs65

	* src/messageview.c
		fix bug 1787, 'Prevent automatic PGP inline
		decryption attempts' use the noticeview to display
		decryption failure messages instead of the irritating
		popup dialog

diff --git a/ChangeLog b/ChangeLog
index 56adc8164cbbed878317873b0fbc9b6b6b3c6236..191611b938e190ea0f2c2df9bf0e089d28b30684 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-09 [paul]      3.6.1cvs65
+
+       * src/messageview.c
+               fix bug 1787, 'Prevent automatic PGP inline
+               decryption attempts' use the noticeview to display
+               decryption failure messages instead of the irritating
+               popup dialog
+
 2008-12-09 [colin]     3.6.1cvs64
 
        * src/prefs_filtering.c

diff --git a/PATCHSETS b/PATCHSETS
index a5bac5e91e7f525e497fb14baea05b7c63951c17..58f5c91e98cda4a12a23b505c35b8867626f7fd6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3646,3 +3646,4 @@
 ( cvs diff -u -r 1.105.2.148 -r 1.105.2.149 src/prefs_account.c;  cvs diff -u -r 1.5.2.54 -r 1.5.2.55 src/gtk/pluginwindow.c;  cvs diff -u -r 1.12.2.49 -r 1.12.2.50 src/gtk/prefswindow.c;  cvs diff -u -r 1.7.2.13 -r 1.7.2.14 src/gtk/prefswindow.h;  ) > 3.6.1cvs62.patchset
 ( cvs diff -u -r 1.60.2.66 -r 1.60.2.67 src/prefs_actions.c;  cvs diff -u -r 1.5.2.55 -r 1.5.2.56 src/gtk/pluginwindow.c;  ) > 3.6.1cvs63.patchset
 ( cvs diff -u -r 1.59.2.74 -r 1.59.2.75 src/prefs_filtering.c;  ) > 3.6.1cvs64.patchset
+( cvs diff -u -r 1.94.2.192 -r 1.94.2.193 src/messageview.c;  ) > 3.6.1cvs65.patchset

diff --git a/configure.ac b/configure.ac
index 9587dcd98e33a9068d03535718c9bc629b5ec7d0..2d869355a2f4319f41cdb97bb1586a4eabd5dd5e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=64
+EXTRA_VERSION=65
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/messageview.c b/src/messageview.c
index f0074edf2ef17a9e6c8ee95c94dd672c000e7b57..7c96aaeb69cf00d44808f47dc313d8f4966c01b5 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1107,6 +1107,7 @@ static MimeInfo *find_encrypted_part(MimeInfo *rootinfo)
 gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                      gboolean all_headers)
 {
+       gchar *text = NULL;
        gchar *file;
        MimeInfo *mimeinfo, *encinfo;
        gchar *subject = NULL;
@@ -1186,8 +1187,13 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        while ((encinfo = find_encrypted_part(mimeinfo)) != NULL) {
                debug_print("decrypting message part\n");
                if (privacy_mimeinfo_decrypt(encinfo) < 0) {
-                       alertpanel_error(_("Couldn't decrypt: %s"),
-                               privacy_get_error());
+                       text = g_strdup_printf(_("Couldn't decrypt: %s"),
+                                              privacy_get_error());
+                       noticeview_show(messageview->noticeview);
+                       noticeview_set_icon(messageview->noticeview,
+                                           STOCK_PIXMAP_NOTICE_WARN);
+                       noticeview_set_text(messageview->noticeview, text);
+                       g_free(text);
                        break;
                }
        }