[Commits] passphrase.c 1.1.2.34 1.1.2.35

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/plugins/pgpcore
In directory claws-mail:/tmp/cvs-serv23693/src/plugins/pgpcore

Modified Files:
      Tag: gtk2
	passphrase.c 
Log Message:
2011-10-07 [colin]	3.7.10cvs19

	* AUTHORS
	* src/account.c
	* src/action.c
	* src/addr_compl.c
	* src/addressbook.c
	* src/alertpanel.c
	* src/compose.c
	* src/edittags.c
	* src/folderview.c
	* src/grouplistdialog.c
	* src/image_viewer.c
	* src/mainwindow.c
	* src/mimeview.c
	* src/noticeview.c
	* src/prefs_filtering_action.c
	* src/prefs_folder_column.c
	* src/prefs_msg_colors.c
	* src/prefs_summary_column.c
	* src/prefs_toolbar.c
	* src/printing.c
	* src/stock_pixmap.c
	* src/summaryview.c
	* src/textview.c
	* src/undo.c
	* src/wizard.c
	* src/gtk/about.c
	* src/gtk/authors.h
	* src/gtk/colorlabel.c
	* src/gtk/colorsel.c
	* src/gtk/gtkcmclist.c
	* src/gtk/gtkcmctree.c
	* src/gtk/gtkcmoptionmenu.c
	* src/gtk/gtksctree.c
	* src/gtk/gtkutils.c
	* src/gtk/gtkvscrollbutton.c
	* src/gtk/inputdialog.c
	* src/gtk/logwindow.c
	* src/gtk/menu.c
	* src/gtk/prefswindow.c
	* src/gtk/progressdialog.c
	* src/plugins/pgpcore/passphrase.c
	* src/plugins/trayicon/trayicon.c
		Bug #2371, "Port to GTK+ 3.0": Use accessor functions.
		Patch by Hanno Thurow-Meyer, many thanks to him !

Index: passphrase.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/pgpcore/Attic/passphrase.c,v
retrieving revision 1.1.2.34
retrieving revision 1.1.2.35
diff -u -d -r1.1.2.34 -r1.1.2.35
--- passphrase.c	16 Feb 2011 07:16:23 -0000	1.1.2.34
+++ passphrase.c	7 Oct 2011 09:08:57 -0000	1.1.2.35
@@ -77,6 +77,7 @@
     GtkWidget *pass_entry;
     GtkWidget *ok_button;
     GtkWidget *cancel_button;
+    GdkWindow *gdkwin;
 
     SummaryView *summaryview = mainwindow_get_mainwindow()->summaryview;
     
@@ -147,14 +148,15 @@
         int err = 0, cnt = 0;
         /* make sure that window is viewable */
         gtk_widget_show_now(window);
-	gdk_window_process_updates(window->window, TRUE);
+	gdkwin = gtk_widget_get_window(window);
+	gdk_window_process_updates(gdkwin, TRUE);
 	gdk_flush();
 	while(gtk_events_pending()) {
 		gtk_main_iteration();
 	}
 try_again:
-        if ((err = gdk_pointer_grab(window->window, TRUE, 0,
-                             window->window, NULL, GDK_CURRENT_TIME))) {
+        if ((err = gdk_pointer_grab(gdkwin, TRUE, 0,
+                             gdkwin, NULL, GDK_CURRENT_TIME))) {
 	    if (err == GDK_GRAB_NOT_VIEWABLE && cnt < 10) {
 	        cnt++;
 		g_warning("trying to grab mouse again\n");
@@ -166,7 +168,7 @@
                 return NULL;
 	    }
         }
-        if (gdk_keyboard_grab(window->window, FALSE, GDK_CURRENT_TIME)) {
+        if (gdk_keyboard_grab(gdkwin, FALSE, GDK_CURRENT_TIME)) {
             gdk_display_pointer_ungrab(gdk_display_get_default(),
 			 	       GDK_CURRENT_TIME);
             g_warning("OOPS: Could not grab keyboard\n");