From fdebe80d60b6f29ef5bb4c30c9e3bc7c5b5fd8f9 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 7 Oct 2005 17:09:45 +0000 Subject: [PATCH] 2005-10-07 [colin] 1.9.15cvs20 * src/plugins/pgpcore/passphrase.c Fix bug #826 (X-Server hangs when right-clicking a PGP encrypted message) --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/pgpcore/passphrase.c | 6 ++++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 8898df866..73584b1e0 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2005-10-07 [colin] 1.9.15cvs20 + + * src/plugins/pgpcore/passphrase.c + Fix bug #826 (X-Server hangs when + right-clicking a PGP encrypted message) + 2005-10-07 [paul] 1.9.15cvs19 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index a44790c08..f68c38fa2 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -856,3 +856,4 @@ ( cvs diff -u -r 1.395.2.131 -r 1.395.2.132 src/summaryview.c; cvs diff -u -r 1.43.2.28 -r 1.43.2.29 src/toolbar.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/wizard.c; cvs diff -u -r 1.3.2.28 -r 1.3.2.29 src/prefs_themes.c; ) > 1.9.15cvs17.patchset ( cvs diff -u -r 1.1 -r 1.2 src/pixmaps/address.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/address_book.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/book.xpm; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/pixmaps/check_spelling.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/checkbox_off.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/checkbox_on.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/close.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/complete.xpm; cvs diff -u -r 1.1.16.1 -r 1.1.16.2 src/pixmaps/continue.xpm; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 src/pixmaps/deleted.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/down_arrow.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/exec.xpm; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 src/pixmaps/forwarded.xpm; cvs diff -u -r 1.1.1.1.16.1 -r 1.1.1.1.16.2 src/pixmaps/group.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/ignorethread.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/interface.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/jpilot.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/ldap.xpm; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 src/pixmaps/linewrap.xpm; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/pixmaps/linewrapcurrent.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mail.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mail_attach.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mail_compose.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mail_forward.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mail_receive.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mail_receive_all.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mail_reply.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mail_reply_to_all.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mail_reply_to_author.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mail_send.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mail_send_queue.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mime_application.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mime_audio.xpm; cvs diff -u -r 1.2 -r 1.3 src/pixmaps/mime_image.xpm; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/pixmaps/mime_message.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mime_text_enriched.xpm; cvs diff -u -r 1.2 -r 1.3 src/pixmaps/mime_text_html.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mime_text_plain.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/mime_unknown.xpm; cvs diff -u -r 1.2 -r 1.3 src/pixmaps/new.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/news_compose.xpm; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/pixmaps/offline.xpm; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/pixmaps/online.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/paste.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/preferences.xpm; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/privacy_emblem_encrypted.xpm; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/pixmaps/privacy_expired.xpm; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/pixmaps/privacy_failed.xpm; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/pixmaps/privacy_passed.xpm; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/pixmaps/privacy_signed.xpm; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/pixmaps/privacy_unknown.xpm; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/pixmaps/privacy_warn.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/properties.xpm; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 src/pixmaps/replied.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/search.xpm; cvs diff -u -r 1.2.16.1 -r 1.2.16.2 src/pixmaps/unread.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/up_arrow.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/vcard.xpm; ) > 1.9.15cvs18.patchset ( cvs diff -u -r 1.382.2.179 -r 1.382.2.180 src/compose.c; ) > 1.9.15cvs19.patchset +( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpcore/passphrase.c; ) > 1.9.15cvs20.patchset diff --git a/configure.ac b/configure.ac index 708af5147..8420b31f8 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=15 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=19 +EXTRA_VERSION=20 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c index a33e92a19..0e177f466 100644 --- a/src/plugins/pgpcore/passphrase.c +++ b/src/plugins/pgpcore/passphrase.c @@ -50,6 +50,8 @@ #include "prefs_gpg.h" #include "manage_window.h" #include "utils.h" +#include "mainwindow.h" +#include "summaryview.h" static gboolean grab_all = FALSE; @@ -85,6 +87,10 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad) GtkWidget *ok_button; GtkWidget *cancel_button; + SummaryView *summaryview = mainwindow_get_mainwindow()->summaryview; + + gtk_menu_popdown(GTK_MENU(summaryview->popupmenu)); + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(window), _("Passphrase")); gtk_widget_set_size_request(window, 450, -1); -- 2.25.1