[Commits] passphrase.c 1.1.2.35 1.1.2.36 select-keys.c 1.1.2.29 1.1.2.30

[colin at claws-mail.org]

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

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

	* src/account.c
	* src/action.c
	* src/addr_compl.c
	* src/addrcustomattr.c
	* src/addrduplicates.c
	* src/addressadd.c
	* src/addressbook.c
	* src/addressbook_foldersel.c
	* src/addrgather.c
	* src/alertpanel.c
	* src/browseldap.c
	* src/compose.c
	* src/editaddress.c
	* src/editaddress_other_attributes_ldap.c
	* src/editbook.c
	* src/editgroup.c
	* src/editjpilot.c
	* src/editldap.c
	* src/editldap_basedn.c
	* src/edittags.c
	* src/editvcard.c
	* src/exphtmldlg.c
	* src/expldifdlg.c
	* src/export.c
	* src/foldersel.c
	* src/folderview.c
	* src/grouplistdialog.c
	* src/import.c
	* src/importldif.c
	* src/importmutt.c
	* src/importpine.c
	* src/mainwindow.c
	* src/message_search.c
	* src/messageview.c
	* src/mimeview.c
	* src/prefs_actions.c
	* src/prefs_customheader.c
	* src/prefs_display_header.c
	* src/prefs_filtering.c
	* src/prefs_filtering_action.c
	* src/prefs_folder_column.c
	* src/prefs_matcher.c
	* src/prefs_msg_colors.c
	* src/prefs_other.c
	* src/prefs_summaries.c
	* src/prefs_summary_column.c
	* src/prefs_summary_open.c
	* src/prefs_template.c
	* src/prefs_toolbar.c
	* src/printing.c
	* src/sourcewindow.c
	* src/ssl_manager.c
	* src/summary_search.c
	* src/summaryview.c
	* src/textview.c
	* src/uri_opener.c
	* src/gtk/about.c
	* src/gtk/colorsel.c
	* src/gtk/combobox.c
	* src/gtk/description_window.c
	* src/gtk/foldersort.c
	* src/gtk/gtkaspell.c
	* src/gtk/gtkcmclist.c
	* src/gtk/gtkcmctree.c
	* src/gtk/gtkcmoptionmenu.c
	* src/gtk/gtkutils.c
	* src/gtk/icon_legend.c
	* src/gtk/inputdialog.c
	* src/gtk/logwindow.c
	* src/gtk/pluginwindow.c
	* src/gtk/prefswindow.c
	* src/gtk/quicksearch.c
	* src/plugins/pgpcore/passphrase.c
	* src/plugins/pgpcore/select-keys.c
		Bug #2371, "Port to GTK+ 3.0". Monster-patch by Hanno Meyer-Thurow
		to replace GDK_* by GDK_KEY_*.

Index: passphrase.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/pgpcore/Attic/passphrase.c,v
retrieving revision 1.1.2.35
retrieving revision 1.1.2.36
diff -u -d -r1.1.2.35 -r1.1.2.36
--- passphrase.c	7 Oct 2011 09:08:57 -0000	1.1.2.35
+++ passphrase.c	7 Oct 2011 09:17:51 -0000	1.1.2.36
@@ -227,7 +227,7 @@
 static gboolean
 passphrase_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-    if (event && event->keyval == GDK_Escape)
+    if (event && event->keyval == GDK_KEY_Escape)
         passphrase_cancel_cb(NULL, NULL);
     return FALSE;
 }

Index: select-keys.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/pgpcore/Attic/select-keys.c,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -d -r1.1.2.29 -r1.1.2.30
--- select-keys.c	16 Feb 2011 07:16:24 -0000	1.1.2.29
+++ select-keys.c	7 Oct 2011 09:17:51 -0000	1.1.2.30
@@ -487,7 +487,7 @@
     struct select_keys_s *sk = data;
 
     cm_return_val_if_fail (sk, FALSE);
-    if (event && event->keyval == GDK_Escape) {
+    if (event && event->keyval == GDK_KEY_Escape) {
         sk->okay = 0;
         gtk_main_quit ();
     }