From 0cc8be545f96d02444c4b5149880c82a1abb98a7 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 18 Oct 2005 17:40:27 +0000 Subject: [PATCH] 2005-10-18 [colin] 1.9.15cvs73 * src/plugins/pgpcore/passphrase.c Don't XGrabServer, and try a bit more to sync everything before grabbing mouse/keyboard --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/pgpcore/passphrase.c | 17 ++++------------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 6f2df3cee..b64e7212f 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2005-10-18 [colin] 1.9.15cvs73 + + * src/plugins/pgpcore/passphrase.c + Don't XGrabServer, and try a bit more to + sync everything before grabbing mouse/keyboard + 2005-10-18 [colin] 1.9.15cvs72 * src/Makefile.am diff --git a/PATCHSETS b/PATCHSETS index 927750cab..936e2254b 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -909,3 +909,4 @@ ( cvs diff -u -r 1.115.2.59 -r 1.115.2.60 src/main.c; ) > 1.9.15cvs70.patchset ( cvs diff -u -r 1.83.2.46 -r 1.83.2.47 src/mimeview.c; ) > 1.9.15cvs71.patchset ( cvs diff -u -r 1.155.2.32 -r 1.155.2.33 src/Makefile.am; cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/addressadd.c; cvs diff -u -r 1.60.2.37 -r 1.60.2.38 src/addressbook.c; cvs diff -u -r 1.207.2.73 -r 1.207.2.74 src/folderview.c; cvs diff -u -r 1.14.2.11 -r 1.14.2.12 src/grouplistdialog.c; cvs diff -u -r 1.83.2.47 -r 1.83.2.48 src/mimeview.c; cvs diff -u -r 1.25.2.18 -r 1.25.2.19 src/stock_pixmap.c; cvs diff -u -r 1.18.2.12 -r 1.18.2.13 src/stock_pixmap.h; cvs diff -u -r 1.395.2.140 -r 1.395.2.141 src/summaryview.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/gtksctree.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/gtksctree.h; diff -u /dev/null src/pixmaps/empty.xpm; ) > 1.9.15cvs72.patchset +( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/passphrase.c; ) > 1.9.15cvs73.patchset diff --git a/configure.ac b/configure.ac index d8dcacce3..9c222a72b 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=72 +EXTRA_VERSION=73 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c index 6756af18d..6935c2277 100644 --- a/src/plugins/pgpcore/passphrase.c +++ b/src/plugins/pgpcore/passphrase.c @@ -150,23 +150,20 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad) int err = 0, cnt = 0; /* make sure that window is viewable */ gtk_widget_show_now(window); + gdk_window_process_updates(window->window, TRUE); gdk_flush(); - while(gtk_events_pending()) + while(gtk_events_pending()) { gtk_main_iteration(); -#ifdef GDK_WINDOWING_X11 - gdk_x11_display_grab(gdk_display_get_default()); -#endif /* GDK_WINDOWING_X11 */ + } try_again: if ((err = gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, GDK_CURRENT_TIME))) { if (err == GDK_GRAB_NOT_VIEWABLE && cnt < 10) { cnt++; g_warning("trying to grab mouse again\n"); + gtk_main_iteration(); goto try_again; } else { -#ifdef GDK_WINDOWING_X11 - gdk_x11_display_ungrab(gdk_display_get_default()); -#endif /* GDK_WINDOWING_X11 */ g_warning("OOPS: Could not grab mouse\n"); gtk_widget_destroy(window); return NULL; @@ -175,9 +172,6 @@ try_again: if (gdk_keyboard_grab(window->window, FALSE, GDK_CURRENT_TIME)) { gdk_display_pointer_ungrab(gdk_display_get_default(), GDK_CURRENT_TIME); -#ifdef GDK_WINDOWING_X11 - gdk_x11_display_ungrab(gdk_display_get_default()); -#endif /* GDK_WINDOWING_X11 */ g_warning("OOPS: Could not grab keyboard\n"); gtk_widget_destroy(window); return NULL; @@ -190,9 +184,6 @@ try_again: gdk_display_keyboard_ungrab(gdk_display_get_default(), GDK_CURRENT_TIME); gdk_display_pointer_ungrab(gdk_display_get_default(), GDK_CURRENT_TIME); -#ifdef GDK_WINDOWING_X11 - gdk_x11_display_ungrab(gdk_display_get_default()); -#endif /* GDK_WINDOWING_X11 */ gdk_flush(); } -- 2.25.1