2005-10-18 [colin] 1.9.15cvs73
authorColin Leroy <colin@colino.net>
Tue, 18 Oct 2005 17:40:27 +0000 (17:40 +0000)
committerColin Leroy <colin@colino.net>
Tue, 18 Oct 2005 17:40:27 +0000 (17:40 +0000)
* src/plugins/pgpcore/passphrase.c
Don't XGrabServer, and try a bit more to
sync everything before grabbing mouse/keyboard

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/plugins/pgpcore/passphrase.c

index 6f2df3c..b64e721 100644 (file)
@@ -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
index 927750c..936e225 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index d8dcacc..9c222a7 100644 (file)
@@ -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=
 
index 6756af1..6935c22 100644 (file)
@@ -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();
     }