+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
( 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
gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
gboolean all_headers)
{
+ gchar *text = NULL;
gchar *file;
MimeInfo *mimeinfo, *encinfo;
gchar *subject = NULL;
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;
}
}