2011-10-07 [colin] 3.7.10cvs20
authorColin Leroy <colin@colino.net>
Fri, 7 Oct 2011 09:17:51 +0000 (09:17 +0000)
committerColin Leroy <colin@colino.net>
Fri, 7 Oct 2011 09:17:51 +0000 (09:17 +0000)
* 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_*.

77 files changed:
ChangeLog
PATCHSETS
configure.ac
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/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/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/plugins/pgpcore/passphrase.c
src/plugins/pgpcore/select-keys.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

index cfa8681..69c587d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,82 @@
+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_*.
+
 2011-10-07 [colin]     3.7.10cvs19
 
        * AUTHORS
index 85fd914..2f319d4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.101.2.67 -r 1.101.2.68 src/news.c;  ) > 3.7.10cvs17.patchset
 ( cvs diff -u -r 1.9.2.49 -r 1.9.2.50 src/common/ssl.c;  ) > 3.7.10cvs18.patchset
 ( cvs diff -u -r 1.100.2.79 -r 1.100.2.80 AUTHORS;  cvs diff -u -r 1.61.2.98 -r 1.61.2.99 src/account.c;  cvs diff -u -r 1.12.2.66 -r 1.12.2.67 src/action.c;  cvs diff -u -r 1.27.2.53 -r 1.27.2.54 src/addr_compl.c;  cvs diff -u -r 1.60.2.143 -r 1.60.2.144 src/addressbook.c;  cvs diff -u -r 1.17.2.43 -r 1.17.2.44 src/alertpanel.c;  cvs diff -u -r 1.382.2.580 -r 1.382.2.581 src/compose.c;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/edittags.c;  cvs diff -u -r 1.207.2.220 -r 1.207.2.221 src/folderview.c;  cvs diff -u -r 1.14.2.28 -r 1.14.2.29 src/grouplistdialog.c;  cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/image_viewer.c;  cvs diff -u -r 1.274.2.328 -r 1.274.2.329 src/mainwindow.c;  cvs diff -u -r 1.83.2.170 -r 1.83.2.171 src/mimeview.c;  cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/noticeview.c;  cvs diff -u -r 1.1.4.69 -r 1.1.4.70 src/prefs_filtering_action.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_folder_column.c;  cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/prefs_msg_colors.c;  cvs diff -u -r 1.10.2.27 -r 1.10.2.28 src/prefs_summary_column.c;  cvs diff -u -r 1.30.2.67 -r 1.30.2.68 src/prefs_toolbar.c;  cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/printing.c;  cvs diff -u -r 1.25.2.68 -r 1.25.2.69 src/stock_pixmap.c;  cvs diff -u -r 1.395.2.430 -r 1.395.2.431 src/summaryview.c;  cvs diff -u -r 1.96.2.232 -r 1.96.2.233 src/textview.c;  cvs diff -u -r 1.13.2.22 -r 1.13.2.23 src/undo.c;  cvs diff -u -r 1.1.2.84 -r 1.1.2.85 src/wizard.c;  cvs diff -u -r 1.4.2.79 -r 1.4.2.80 src/gtk/about.c;  cvs diff -u -r 1.1.2.73 -r 1.1.2.74 src/gtk/authors.h;  cvs diff -u -r 1.2.2.33 -r 1.2.2.34 src/gtk/colorlabel.c;  cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/gtk/colorsel.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/gtkcmoptionmenu.c;  cvs diff -u -r 1.1.4.60 -r 1.1.4.61 src/gtk/gtksctree.c;  cvs diff -u -r 1.5.2.95 -r 1.5.2.96 src/gtk/gtkutils.c;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.2.2.42 -r 1.2.2.43 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.4.37 -r 1.1.4.38 src/gtk/logwindow.c;  cvs diff -u -r 1.5.2.42 -r 1.5.2.43 src/gtk/menu.c;  cvs diff -u -r 1.12.2.56 -r 1.12.2.57 src/gtk/prefswindow.c;  cvs diff -u -r 1.1.4.27 -r 1.1.4.28 src/gtk/progressdialog.c;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.14.2.77 -r 1.14.2.78 src/plugins/trayicon/trayicon.c;  ) > 3.7.10cvs19.patchset
+( cvs diff -u -r 1.61.2.99 -r 1.61.2.100 src/account.c;  cvs diff -u -r 1.12.2.67 -r 1.12.2.68 src/action.c;  cvs diff -u -r 1.27.2.54 -r 1.27.2.55 src/addr_compl.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/addrcustomattr.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/addrduplicates.c;  cvs diff -u -r 1.9.2.32 -r 1.9.2.33 src/addressadd.c;  cvs diff -u -r 1.60.2.144 -r 1.60.2.145 src/addressbook.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/addressbook_foldersel.c;  cvs diff -u -r 1.5.10.33 -r 1.5.10.34 src/addrgather.c;  cvs diff -u -r 1.17.2.44 -r 1.17.2.45 src/alertpanel.c;  cvs diff -u -r 1.2.4.26 -r 1.2.4.27 src/browseldap.c;  cvs diff -u -r 1.382.2.581 -r 1.382.2.582 src/compose.c;  cvs diff -u -r 1.14.2.60 -r 1.14.2.61 src/editaddress.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/editaddress_other_attributes_ldap.c;  cvs diff -u -r 1.5.12.16 -r 1.5.12.17 src/editbook.c;  cvs diff -u -r 1.11.2.26 -r 1.11.2.27 src/editgroup.c;  cvs diff -u -r 1.5.12.18 -r 1.5.12.19 src/editjpilot.c;  cvs diff -u -r 1.8.2.40 -r 1.8.2.41 src/editldap.c;  cvs diff -u -r 1.10.2.18 -r 1.10.2.19 src/editldap_basedn.c;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/edittags.c;  cvs diff -u -r 1.5.12.17 -r 1.5.12.18 src/editvcard.c;  cvs diff -u -r 1.3.2.28 -r 1.3.2.29 src/exphtmldlg.c;  cvs diff -u -r 1.1.4.33 -r 1.1.4.34 src/expldifdlg.c;  cvs diff -u -r 1.8.2.31 -r 1.8.2.32 src/export.c;  cvs diff -u -r 1.26.2.46 -r 1.26.2.47 src/foldersel.c;  cvs diff -u -r 1.207.2.221 -r 1.207.2.222 src/folderview.c;  cvs diff -u -r 1.14.2.29 -r 1.14.2.30 src/grouplistdialog.c;  cvs diff -u -r 1.13.2.30 -r 1.13.2.31 src/import.c;  cvs diff -u -r 1.14.2.26 -r 1.14.2.27 src/importldif.c;  cvs diff -u -r 1.4.12.22 -r 1.4.12.23 src/importmutt.c;  cvs diff -u -r 1.1.14.22 -r 1.1.14.23 src/importpine.c;  cvs diff -u -r 1.274.2.329 -r 1.274.2.330 src/mainwindow.c;  cvs diff -u -r 1.3.12.39 -r 1.3.12.40 src/message_search.c;  cvs diff -u -r 1.94.2.218 -r 1.94.2.219 src/messageview.c;  cvs diff -u -r 1.83.2.171 -r 1.83.2.172 src/mimeview.c;  cvs diff -u -r 1.60.2.73 -r 1.60.2.74 src/prefs_actions.c;  cvs diff -u -r 1.16.2.41 -r 1.16.2.42 src/prefs_customheader.c;  cvs diff -u -r 1.16.2.43 -r 1.16.2.44 src/prefs_display_header.c;  cvs diff -u -r 1.59.2.82 -r 1.59.2.83 src/prefs_filtering.c;  cvs diff -u -r 1.1.4.70 -r 1.1.4.71 src/prefs_filtering_action.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/prefs_folder_column.c;  cvs diff -u -r 1.43.2.89 -r 1.43.2.90 src/prefs_matcher.c;  cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/prefs_msg_colors.c;  cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/prefs_other.c;  cvs diff -u -r 1.1.2.66 -r 1.1.2.67 src/prefs_summaries.c;  cvs diff -u -r 1.10.2.28 -r 1.10.2.29 src/prefs_summary_column.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_summary_open.c;  cvs diff -u -r 1.12.2.75 -r 1.12.2.76 src/prefs_template.c;  cvs diff -u -r 1.30.2.68 -r 1.30.2.69 src/prefs_toolbar.c;  cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/printing.c;  cvs diff -u -r 1.9.2.26 -r 1.9.2.27 src/sourcewindow.c;  cvs diff -u -r 1.3.2.35 -r 1.3.2.36 src/ssl_manager.c;  cvs diff -u -r 1.15.2.65 -r 1.15.2.66 src/summary_search.c;  cvs diff -u -r 1.395.2.431 -r 1.395.2.432 src/summaryview.c;  cvs diff -u -r 1.96.2.233 -r 1.96.2.234 src/textview.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/uri_opener.c;  cvs diff -u -r 1.4.2.80 -r 1.4.2.81 src/gtk/about.c;  cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/gtk/colorsel.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/gtk/combobox.c;  cvs diff -u -r 1.5.2.31 -r 1.5.2.32 src/gtk/description_window.c;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/gtk/foldersort.c;  cvs diff -u -r 1.9.2.72 -r 1.9.2.73 src/gtk/gtkaspell.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/gtkcmoptionmenu.c;  cvs diff -u -r 1.5.2.96 -r 1.5.2.97 src/gtk/gtkutils.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/gtk/icon_legend.c;  cvs diff -u -r 1.2.2.43 -r 1.2.2.44 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.4.38 -r 1.1.4.39 src/gtk/logwindow.c;  cvs diff -u -r 1.5.2.59 -r 1.5.2.60 src/gtk/pluginwindow.c;  cvs diff -u -r 1.12.2.57 -r 1.12.2.58 src/gtk/prefswindow.c;  cvs diff -u -r 1.1.2.103 -r 1.1.2.104 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/pgpcore/select-keys.c;  ) > 3.7.10cvs20.patchset
index dde22b5..b8a2f1b 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=19
+EXTRA_VERSION=20
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 05859db..42d56c2 100644 (file)
@@ -1230,7 +1230,7 @@ static gint account_delete_event(GtkWidget *widget, GdkEventAny *event,
 static gboolean account_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                    gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                account_edit_close(NULL, NULL);
        return FALSE;
 }
index d5b5e68..27d0796 100644 (file)
@@ -1185,9 +1185,9 @@ static void hide_io_dialog_cb(GtkWidget *w, gpointer data)
 static gint io_dialog_key_pressed_cb(GtkWidget *widget, GdkEventKey *event,
                                     gpointer data)
 {
-       if (event && (event->keyval == GDK_Escape ||
-                     event->keyval == GDK_Return ||
-                         event->keyval == GDK_KP_Enter))
+       if (event && (event->keyval == GDK_KEY_Escape ||
+                     event->keyval == GDK_KEY_Return ||
+                         event->keyval == GDK_KEY_KP_Enter))
                hide_io_dialog_cb(widget, data);
        return TRUE;
 }
index 4620310..f8e4407 100644 (file)
@@ -1212,14 +1212,14 @@ static gboolean address_completion_entry_key_pressed(GtkEntry    *entry,
                                                     GdkEventKey *ev,
                                                     gpointer     data)
 {
-       if (ev->keyval == GDK_Tab) {
+       if (ev->keyval == GDK_KEY_Tab) {
                addrcompl_clear_queue();
                _allowCommas_ = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry), ENTRY_DATA_ALLOW_COMMAS));
                if( address_completion_complete_address_in_entry( entry, TRUE ) ) {
                        /* route a void character to the default handler */
                        /* this is a dirty hack; we're actually changing a key
                         * reported by the system. */
-                       ev->keyval = GDK_AudibleBell_Enable;
+                       ev->keyval = GDK_KEY_AudibleBell_Enable;
                        ev->state &= ~GDK_SHIFT_MASK;
 
                        /* Create window */                     
@@ -1233,16 +1233,16 @@ static gboolean address_completion_entry_key_pressed(GtkEntry    *entry,
                else {
                        /* old behaviour */
                }
-       } else if (ev->keyval == GDK_Shift_L
-               || ev->keyval == GDK_Shift_R
-               || ev->keyval == GDK_Control_L
-               || ev->keyval == GDK_Control_R
-               || ev->keyval == GDK_Caps_Lock
-               || ev->keyval == GDK_Shift_Lock
-               || ev->keyval == GDK_Meta_L
-               || ev->keyval == GDK_Meta_R
-               || ev->keyval == GDK_Alt_L
-               || ev->keyval == GDK_Alt_R) {
+       } else if (ev->keyval == GDK_KEY_Shift_L
+               || ev->keyval == GDK_KEY_Shift_R
+               || ev->keyval == GDK_KEY_Control_L
+               || ev->keyval == GDK_KEY_Control_R
+               || ev->keyval == GDK_KEY_Caps_Lock
+               || ev->keyval == GDK_KEY_Shift_Lock
+               || ev->keyval == GDK_KEY_Meta_L
+               || ev->keyval == GDK_KEY_Meta_R
+               || ev->keyval == GDK_KEY_Alt_L
+               || ev->keyval == GDK_KEY_Alt_R) {
                /* these buttons should not clear the cache... */
        } else
                clear_completion_cache();
@@ -1451,17 +1451,17 @@ static gboolean completion_window_key_press(GtkWidget *widget,
        cm_return_val_if_fail(entry != NULL, FALSE);
 
        /* allow keyboard navigation in the alternatives tree view */
-       if (event->keyval == GDK_Up || event->keyval == GDK_Down ||
-           event->keyval == GDK_Page_Up || event->keyval == GDK_Page_Down) {
+       if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down ||
+           event->keyval == GDK_KEY_Page_Up || event->keyval == GDK_KEY_Page_Down) {
                completion_window_advance_selection
                        (GTK_TREE_VIEW(list_view),
-                        event->keyval == GDK_Down ||
-                        event->keyval == GDK_Page_Down ? TRUE : FALSE);
+                        event->keyval == GDK_KEY_Down ||
+                        event->keyval == GDK_KEY_Page_Down ? TRUE : FALSE);
                return FALSE;
        }               
 
        /* make tab move to next field */
-       if( event->keyval == GDK_Tab ) {
+       if( event->keyval == GDK_KEY_Tab ) {
                /* Reference to parent */
                parent = gtk_widget_get_parent(GTK_WIDGET(entry));
 
@@ -1477,7 +1477,7 @@ static gboolean completion_window_key_press(GtkWidget *widget,
        }
 
        /* make backtab move to previous field */
-       if( event->keyval == GDK_ISO_Left_Tab ) {
+       if( event->keyval == GDK_KEY_ISO_Left_Tab ) {
                /* Reference to parent */
                parent = gtk_widget_get_parent(GTK_WIDGET(entry));
 
@@ -1494,17 +1494,17 @@ static gboolean completion_window_key_press(GtkWidget *widget,
        _allowCommas_ = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry), ENTRY_DATA_ALLOW_COMMAS));
 
        /* look for presses that accept the selection */
-       if (event->keyval == GDK_Return || event->keyval == GDK_space ||
-                       event->keyval == GDK_KP_Enter ||
-                       (_allowCommas_ && event->keyval == GDK_comma)) {
+       if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_space ||
+                       event->keyval == GDK_KEY_KP_Enter ||
+                       (_allowCommas_ && event->keyval == GDK_KEY_comma)) {
                /* User selected address with a key press */
 
                /* Display selected address in entry field */           
                completion_window_apply_selection(
                        GTK_TREE_VIEW(list_view), GTK_ENTRY(entry),
-                       event->keyval != GDK_comma);
+                       event->keyval != GDK_KEY_comma);
 
-               if (event->keyval == GDK_comma) {
+               if (event->keyval == GDK_KEY_comma) {
                        gint pos = gtk_editable_get_position(GTK_EDITABLE(entry));
                        gtk_editable_insert_text(GTK_EDITABLE(entry), ", ", 2, &pos);
                        gtk_editable_set_position(GTK_EDITABLE(entry), pos + 1);
@@ -1517,16 +1517,16 @@ static gboolean completion_window_key_press(GtkWidget *widget,
        }
 
        /* key state keys should never be handled */
-       if (event->keyval == GDK_Shift_L
-                || event->keyval == GDK_Shift_R
-                || event->keyval == GDK_Control_L
-                || event->keyval == GDK_Control_R
-                || event->keyval == GDK_Caps_Lock
-                || event->keyval == GDK_Shift_Lock
-                || event->keyval == GDK_Meta_L
-                || event->keyval == GDK_Meta_R
-                || event->keyval == GDK_Alt_L
-                || event->keyval == GDK_Alt_R) {
+       if (event->keyval == GDK_KEY_Shift_L
+                || event->keyval == GDK_KEY_Shift_R
+                || event->keyval == GDK_KEY_Control_L
+                || event->keyval == GDK_KEY_Control_R
+                || event->keyval == GDK_KEY_Caps_Lock
+                || event->keyval == GDK_KEY_Shift_Lock
+                || event->keyval == GDK_KEY_Meta_L
+                || event->keyval == GDK_KEY_Meta_R
+                || event->keyval == GDK_KEY_Alt_L
+                || event->keyval == GDK_KEY_Alt_R) {
                return FALSE;
        }
 
index 93730d1..30faf63 100644 (file)
@@ -433,9 +433,9 @@ static void custom_attr_window_del_attr_cb(GtkWidget *widget,
 static gboolean custom_attr_window_key_pressed(GtkWidget *widget,
                                                                                           GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                custom_attr_window_close();
-       else if (event && event->keyval == GDK_Delete)
+       else if (event && event->keyval == GDK_KEY_Delete)
                custom_attr_popup_delete(NULL, NULL);
        return FALSE;
 }
@@ -443,7 +443,7 @@ static gboolean custom_attr_window_key_pressed(GtkWidget *widget,
 static gboolean custom_attr_window_add_key_pressed(GtkWidget *widget,
                                                                                                   GdkEventKey *event, gpointer data)
 {
-       if (event && (event->keyval == GDK_KP_Enter || event->keyval == GDK_Return)) {
+       if (event && (event->keyval == GDK_KEY_KP_Enter || event->keyval == GDK_KEY_Return)) {
                custom_attr_window_add_attr();
                gtk_entry_set_text(GTK_ENTRY(custom_attr_window.add_entry), "");
                gtk_widget_grab_focus(custom_attr_window.attr_list);
index 2825246..8526dd2 100644 (file)
@@ -885,9 +885,9 @@ static gboolean cb_finder_results_dialog_key_pressed(GtkWidget *widget,
         gpointer data)
 {
        if(event) {
-               if(event->keyval == GDK_Delete && detail_view_has_focus)
+               if(event->keyval == GDK_KEY_Delete && detail_view_has_focus)
                        cb_del_btn_clicked(NULL,NULL);
-               else if(event->keyval == GDK_Escape)
+               else if(event->keyval == GDK_KEY_Escape)
                        gtk_widget_destroy(dialog);
        }
 
index 5cec6f3..7aaf015 100644 (file)
@@ -88,7 +88,7 @@ static gint addressadd_delete_event( GtkWidget *widget, GdkEventAny *event, gboo
 }
 
 static gboolean addressadd_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                addressadd_cancelled = TRUE;
                gtk_main_quit();
        }
index e424e69..9673e04 100644 (file)
@@ -694,9 +694,9 @@ void addressbook_refresh( void )
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                addressbook_close();
-       else if (event && event->keyval == GDK_Delete) {
+       else if (event && event->keyval == GDK_KEY_Delete) {
                /* TODO: enable deletion when focus is in ctree (needs implementation in _del_clicked() */
                if ( /* address_index_has_focus || */ address_list_has_focus )
                        addressbook_del_clicked(NULL, NULL);
@@ -4378,7 +4378,7 @@ void addressbook_export_to_file( void ) {
 
 static gboolean addressbook_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter))
+       if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter))
                addressbook_lup_clicked(NULL, NULL);
        return FALSE;
 }
index b68ec43..8065315 100644 (file)
@@ -90,7 +90,7 @@ static gint addressbook_foldersel_delete_event( GtkWidget *widget, GdkEventAny *
 
 static gboolean addressbook_foldersel_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled )
 {
-       if ( event && event->keyval == GDK_Escape ) {
+       if ( event && event->keyval == GDK_KEY_Escape ) {
                addressbook_foldersel_cancelled = TRUE;
                gtk_main_quit();
        }
index cc9e1b3..e268178 100644 (file)
@@ -121,7 +121,7 @@ static gint addrgather_dlg_delete_event(
 static gboolean addrgather_dlg_key_pressed(
        GtkWidget *widget, GdkEventKey *event, gpointer data )
 {
-       if( event && event->keyval == GDK_Escape ) {
+       if( event && event->keyval == GDK_KEY_Escape ) {
                addrgather_dlg.cancelled = TRUE;
                gtk_main_quit();
        }
index 41b4a20..34cbd2d 100644 (file)
@@ -421,7 +421,7 @@ static gboolean alertpanel_close(GtkWidget *widget, GdkEventAny *event,
                                 gpointer data)
 {
        if (event->type == GDK_KEY_PRESS)
-               if (((GdkEventKey *)event)->keyval != GDK_Escape)
+               if (((GdkEventKey *)event)->keyval != GDK_KEY_Escape)
                        return FALSE;
 
        value = (value & ~G_ALERT_VALUE_MASK) | (AlertValue)data;
index 72e9f7b..6cd72f5 100644 (file)
@@ -179,7 +179,7 @@ static gint browse_delete_event(
 static void browse_key_pressed(
                GtkWidget *widget, GdkEventKey *event, gboolean *cancelled )
 {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                gtk_main_quit();
        }
 }
index 84ffd4d..f26aada 100644 (file)
@@ -8797,11 +8797,11 @@ static gboolean attach_property_key_pressed(GtkWidget *widget,
                                            GdkEventKey *event,
                                            gboolean *cancelled)
 {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                *cancelled = TRUE;
                gtk_main_quit();
        }
-       if (event && event->keyval == GDK_Return) {
+       if (event && event->keyval == GDK_KEY_Return) {
                *cancelled = FALSE;
                gtk_main_quit();
                return TRUE;
@@ -9295,7 +9295,7 @@ static gboolean attach_key_pressed(GtkWidget *widget, GdkEventKey *event,
        if (!event) return FALSE;
 
        switch (event->keyval) {
-       case GDK_Delete:
+       case GDK_KEY_Delete:
                compose_attach_remove_selected(NULL, compose);
                break;
        }
@@ -10793,7 +10793,7 @@ static gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
        if ((g_slist_length(headerentry->compose->header_list) > 0) &&
            ((headerentry->headernum + 1) != headerentry->compose->header_nextrow) &&
            !(event->state & GDK_MODIFIER_MASK) &&
-           (event->keyval == GDK_BackSpace) &&
+           (event->keyval == GDK_KEY_BackSpace) &&
            (strlen(gtk_entry_get_text(GTK_ENTRY(entry))) == 0)) {
                gtk_container_remove
                        (GTK_CONTAINER(headerentry->compose->header_table),
@@ -10805,7 +10805,7 @@ static gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
                        g_slist_remove(headerentry->compose->header_list,
                                       headerentry);
                g_free(headerentry);
-       } else  if (event->keyval == GDK_Tab) {
+       } else  if (event->keyval == GDK_KEY_Tab) {
                if (headerentry->compose->header_last == headerentry) {
                        /* Override default next focus, and give it to subject_entry
                         * instead of notebook tabs
index 2322406..57caa18 100644 (file)
@@ -200,7 +200,7 @@ static gint edit_person_delete_event(GtkWidget *widget, GdkEventAny *event, gboo
 
 static gboolean edit_person_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
        if (prefs_common.addressbook_use_editaddress_dialog) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                *cancelled = TRUE;
                gtk_main_quit();
        }
@@ -1021,7 +1021,7 @@ static void edit_person_entry_email_changed (GtkWidget *entry, gpointer data)
 
 static gboolean edit_person_entry_email_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Return) {
+       if (event && event->keyval == GDK_KEY_Return) {
                if (email_saving)
                        edit_person_email_modify(NULL);         
                else if (email_adding)
@@ -1236,7 +1236,7 @@ static void edit_person_entry_att_changed (GtkWidget *entry, gpointer data)
 
 static gboolean edit_person_entry_att_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Return) {
+       if (event && event->keyval == GDK_KEY_Return) {
                if (attrib_saving)
                        edit_person_attrib_modify(NULL);
                else if (attrib_adding)
index ce0a13a..45870f9 100644 (file)
@@ -266,7 +266,7 @@ static void edit_person_entry_att_changed (GtkWidget *entry, gpointer data)
 
 static gboolean edit_person_entry_att_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) {
+       if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)) {
                if (attrib_saving)
                        edit_person_attrib_modify(NULL);
                else if (attrib_adding)
index acf7fec..2c730a0 100644 (file)
@@ -91,7 +91,7 @@ static gint edit_book_delete_event( GtkWidget *widget, GdkEventAny *event, gbool
 }
 
 static gboolean edit_book_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                *cancelled = TRUE;
                gtk_main_quit();
        }
index 4edfa29..50cf851 100644 (file)
@@ -114,7 +114,7 @@ static gint edit_group_delete_event(GtkWidget *widget, GdkEventAny *event, gbool
 }
 
 static gboolean edit_group_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                *cancelled = TRUE;
                gtk_main_quit();
        }
index b406791..3f33b7f 100644 (file)
@@ -78,7 +78,7 @@ static gint edit_jpilot_delete_event( GtkWidget *widget, GdkEventAny *event, gbo
 }
 
 static gboolean edit_jpilot_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                *cancelled = TRUE;
                gtk_main_quit();
        }
index 4505bac..0da8c95 100644 (file)
@@ -206,7 +206,7 @@ static gint edit_ldap_delete_event( GtkWidget *widget, GdkEventAny *event, gbool
 }
 
 static gboolean edit_ldap_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                *cancelled = TRUE;
                gtk_main_quit();
        }
index 093553b..025937a 100644 (file)
@@ -74,7 +74,7 @@ static gint edit_ldap_bdn_delete_event( GtkWidget *widget, GdkEventAny *event, g
 }
 
 static gboolean edit_ldap_bdn_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                ldapedit_basedn_cancelled = TRUE;
                gtk_main_quit();
        }
index 754ad4a..9e78cba 100644 (file)
@@ -488,9 +488,9 @@ static gboolean apply_window_key_pressed(GtkWidget *widget, GdkEventKey *event,
 {
        if (applywindow.busy)
                return FALSE;
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                apply_window_close();
-       else if (event && event->keyval == GDK_Delete)
+       else if (event && event->keyval == GDK_KEY_Delete)
                apply_popup_delete(NULL, NULL);
        return FALSE;
 }
@@ -500,7 +500,7 @@ static gboolean apply_window_add_key_pressed(GtkWidget *widget, GdkEventKey *eve
        if (applywindow.busy)
                return FALSE;
 
-       if (event && (event->keyval == GDK_KP_Enter || event->keyval == GDK_Return)) {
+       if (event && (event->keyval == GDK_KEY_KP_Enter || event->keyval == GDK_KEY_Return)) {
                apply_window_add_tag();
                gtk_entry_set_text(GTK_ENTRY(applywindow.add_entry), "");
                gtk_widget_grab_focus(applywindow.taglist);
index 821cdd3..5e3aac2 100644 (file)
@@ -121,7 +121,7 @@ static gint edit_vcard_delete_event( GtkWidget *widget, GdkEventAny *event, gboo
 }
 
 static gboolean edit_vcard_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                *cancelled = TRUE;
                gtk_main_quit();
        }
index f678c25..e2b97d8 100644 (file)
@@ -146,7 +146,7 @@ static gint export_html_delete_event( GtkWidget *widget, GdkEventAny *event, gpo
  * \param data   User data.
  */
 static gboolean export_html_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                export_html_cancel( widget, data );
        }
        return FALSE;
index 0091181..40880a0 100644 (file)
@@ -148,7 +148,7 @@ static gint export_ldif_delete_event( GtkWidget *widget, GdkEventAny *event, gpo
  * \param data   User data.
  */
 static gboolean export_ldif_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                export_ldif_cancel( widget, data );
        }
        return FALSE;
index 5616f99..bc687cb 100644 (file)
@@ -276,7 +276,7 @@ static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                export_cancel_cb(NULL, NULL);
        return FALSE;
 }
index 5492f39..da43e33 100644 (file)
@@ -619,7 +619,7 @@ static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                foldersel_cancel(NULL, NULL);
        return FALSE;
 }
index c4c703a..96ccd93 100644 (file)
@@ -2019,10 +2019,10 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                return FALSE;
 
        switch (event->keyval) {
-       case GDK_Right:
+       case GDK_KEY_Right:
 #ifndef GENERIC_UMPC
-       case GDK_Return:
-       case GDK_KP_Enter:
+       case GDK_KEY_Return:
+       case GDK_KEY_KP_Enter:
 #endif
                if (folderview->selected) {
                        folderview_select_node(folderview,
@@ -2030,7 +2030,7 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                }
                break;
 #ifdef GENERIC_UMPC
-       case GDK_Return:
+       case GDK_KEY_Return:
                if (folderview->selected && GTK_CMCTREE_ROW(folderview->selected)->children) {
                        gtk_cmctree_toggle_expansion(
                                GTK_CMCTREE(folderview->ctree),
@@ -2038,7 +2038,7 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                }
                break;  
 #endif
-       case GDK_space:
+       case GDK_KEY_space:
                BREAK_ON_MODIFIER_KEY();
                if (folderview->selected) {
                        if (folderview->opened == folderview->selected &&
index 2c243e3..de0f383 100644 (file)
@@ -551,7 +551,7 @@ static void refresh_clicked(GtkWidget *widget, gpointer data)
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                cancel_clicked(NULL, NULL);
        return FALSE;
 }
index 8d7c991..e02a771 100644 (file)
@@ -768,7 +768,7 @@ static void about_create(void)
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                gtk_widget_hide(window);
        return FALSE;
 }
index 83fe60c..3df31ca 100644 (file)
@@ -40,11 +40,11 @@ static gboolean quote_colors_set_dialog_key_pressed(GtkWidget *widget,
                                                GdkEventKey *event,
                                                gpointer data)
 {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                *((gint *) data) = 1;
                gtk_main_quit();
                return TRUE;
-       } else if (event && event->keyval == GDK_Return) {
+       } else if (event && event->keyval == GDK_KEY_Return) {
                *((gint *) data) = 0;
                gtk_main_quit();
                return FALSE;
index 2306b98..0695e35 100644 (file)
@@ -203,14 +203,14 @@ gboolean combobox_set_value_from_arrow_key(GtkComboBox *combobox,
        if (gtk_combo_box_get_active_iter(combobox, &iter)) {
                /* if current text is in list, get prev or next one */
 
-               if (keyval == GDK_Up) {
+               if (keyval == GDK_KEY_Up) {
                        gchar *text = gtk_combo_box_get_active_text(combobox);
                        if (!text)
                                text = gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(combobox))),0,-1);
                        valid = gtkut_tree_model_text_iter_prev(model, &iter, text);
                        g_free(text);
                } else
-               if (keyval == GDK_Down)
+               if (keyval == GDK_KEY_Down)
                        valid = gtk_tree_model_iter_next(model, &iter);
 
                if (valid)
@@ -219,10 +219,10 @@ gboolean combobox_set_value_from_arrow_key(GtkComboBox *combobox,
        } else {
                /* current text is not in list, get first or next one */
 
-               if (keyval == GDK_Up)
+               if (keyval == GDK_KEY_Up)
                        valid = gtkut_tree_model_get_iter_last(model, &iter);
                else
-               if (keyval == GDK_Down)
+               if (keyval == GDK_KEY_Down)
                        valid = gtk_tree_model_get_iter_first(model, &iter);
 
                if (valid)
index f5e7f78..a1a2ce3 100644 (file)
@@ -192,7 +192,7 @@ static gboolean description_window_key_pressed(GtkWidget *widget,
                                               GdkEventKey *event,
                                               gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                description_window_destroy(widget, data);
        return FALSE;
 }
index ab2e4b1..2793145 100644 (file)
@@ -123,7 +123,7 @@ static gint delete_event(GtkWidget *widget, GdkEventAny *event, FolderSortDialog
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, FolderSortDialog *dialog)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                destroy_dialog(dialog);
        return FALSE;
 }
index 69b4a65..818a3b1 100644 (file)
@@ -1349,10 +1349,10 @@ static gboolean replace_key_pressed(GtkWidget *widget,
                                   GdkEventKey *event,
                                   GtkAspell *gtkaspell)
 {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                gtk_widget_destroy(widget);
                return TRUE;
-       } else if (event && event->keyval == GDK_Return) {
+       } else if (event && event->keyval == GDK_KEY_Return) {
                replace_with_supplied_word_cb(widget, gtkaspell);
                return TRUE;
        }
@@ -1719,11 +1719,11 @@ static gboolean aspell_key_pressed(GtkWidget *widget,
                                   GdkEventKey *event,
                                   GtkAspell *gtkaspell)
 {
-       if (event && (isascii(event->keyval) || event->keyval == GDK_Return)) {
+       if (event && (isascii(event->keyval) || event->keyval == GDK_KEY_Return)) {
                gtk_accel_groups_activate(
                                G_OBJECT(gtkaspell->parent_window),
                                event->keyval, event->state);
-       } else if (event && event->keyval == GDK_Escape) {
+       } else if (event && event->keyval == GDK_KEY_Escape) {
                destroy_menu(NULL, gtkaspell);
        }
        return FALSE;
@@ -1775,7 +1775,7 @@ static GSList *make_sug_menu(GtkAspell *gtkaspell)
         g_signal_connect(G_OBJECT(item), "activate",
                         G_CALLBACK(add_word_to_session_cb), 
                         gtkaspell);
-       gtk_widget_add_accelerator(item, "activate", accel, GDK_space,
+       gtk_widget_add_accelerator(item, "activate", accel, GDK_KEY_space,
                                   GDK_CONTROL_MASK,
                                   GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
 
@@ -1785,7 +1785,7 @@ static GSList *make_sug_menu(GtkAspell *gtkaspell)
         g_signal_connect(G_OBJECT(item), "activate",
                         G_CALLBACK(add_word_to_personal_cb), 
                         gtkaspell);
-       gtk_widget_add_accelerator(item, "activate", accel, GDK_Return,
+       gtk_widget_add_accelerator(item, "activate", accel, GDK_KEY_Return,
                                   GDK_CONTROL_MASK,
                                   GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
 
@@ -1795,9 +1795,9 @@ static GSList *make_sug_menu(GtkAspell *gtkaspell)
         g_signal_connect(G_OBJECT(item), "activate",
                         G_CALLBACK(replace_with_create_dialog_cb), 
                         gtkaspell);
-       gtk_widget_add_accelerator(item, "activate", accel, GDK_R, 0,
+       gtk_widget_add_accelerator(item, "activate", accel, GDK_KEY_R, 0,
                                   GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
-       gtk_widget_add_accelerator(item, "activate", accel, GDK_R, 
+       gtk_widget_add_accelerator(item, "activate", accel, GDK_KEY_R, 
                                   GDK_CONTROL_MASK,
                                   GTK_ACCEL_LOCKED);
 
@@ -1811,9 +1811,9 @@ static GSList *make_sug_menu(GtkAspell *gtkaspell)
                g_signal_connect(G_OBJECT(item), "activate",
                                 G_CALLBACK(check_with_alternate_cb),
                                 gtkaspell);
-               gtk_widget_add_accelerator(item, "activate", accel, GDK_X, 0,
+               gtk_widget_add_accelerator(item, "activate", accel, GDK_KEY_X, 0,
                                           GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
-               gtk_widget_add_accelerator(item, "activate", accel, GDK_X, 
+               gtk_widget_add_accelerator(item, "activate", accel, GDK_KEY_X, 
                                           GDK_CONTROL_MASK,
                                           GTK_ACCEL_LOCKED);
        }
@@ -1864,12 +1864,12 @@ static GSList *make_sug_menu(GtkAspell *gtkaspell)
                        if (curmenu == NULL && count < MENUCOUNT) {
                                gtk_widget_add_accelerator(item, "activate",
                                                           accel,
-                                                          GDK_A + count, 0,
+                                                          GDK_KEY_A + count, 0,
                                                           GTK_ACCEL_LOCKED | 
                                                           GTK_ACCEL_VISIBLE);
                                gtk_widget_add_accelerator(item, "activate", 
                                                           accel,
-                                                          GDK_A + count, 
+                                                          GDK_KEY_A + count, 
                                                           GDK_CONTROL_MASK,
                                                           GTK_ACCEL_LOCKED);
                                }
index 22d9a87..bda09ea 100644 (file)
@@ -780,157 +780,157 @@ gtk_cmclist_class_init (GtkCMCListClass *klass)
                              G_TYPE_NONE, 0);
 
   binding_set = gtk_binding_set_by_class (klass);
-  gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, 0,
                                "scroll_vertical", 2,
                                G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
                                G_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Up, 0,
                                "scroll_vertical", 2,
                                G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
                                G_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_Down, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, 0,
                                "scroll_vertical", 2,
                                G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
                                G_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Down, 0,
                                "scroll_vertical", 2,
                                G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
                                G_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0,
                                "scroll_vertical", 2,
                                G_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
                                G_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Up, 0,
                                "scroll_vertical", 2,
                                G_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
                                G_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0,
                                "scroll_vertical", 2,
                                G_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
                                G_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Down, 0,
                                "scroll_vertical", 2,
                                G_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
                                G_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_Home, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Home, GDK_CONTROL_MASK,
                                "scroll_vertical", 2,
                                G_TYPE_ENUM, GTK_SCROLL_JUMP,
                                G_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Home, GDK_CONTROL_MASK,
                                "scroll_vertical", 2,
                                G_TYPE_ENUM, GTK_SCROLL_JUMP,
                                G_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_End, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_End, GDK_CONTROL_MASK,
                                "scroll_vertical", 2,
                                G_TYPE_ENUM, GTK_SCROLL_JUMP,
                                G_TYPE_FLOAT, 1.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_End, GDK_CONTROL_MASK,
                                "scroll_vertical", 2,
                                G_TYPE_ENUM, GTK_SCROLL_JUMP,
                                G_TYPE_FLOAT, 1.0);
   
-  gtk_binding_entry_add_signal (binding_set, GDK_Up, GDK_SHIFT_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, GDK_SHIFT_MASK,
                                "extend_selection", 3,
                                G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
                                G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, GDK_SHIFT_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Up, GDK_SHIFT_MASK,
                                "extend_selection", 3,
                                G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
                                G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
-  gtk_binding_entry_add_signal (binding_set, GDK_Down, GDK_SHIFT_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, GDK_SHIFT_MASK,
                                "extend_selection", 3,
                                G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
                                G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, GDK_SHIFT_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Down, GDK_SHIFT_MASK,
                                "extend_selection", 3,
                                G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
                                G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
-  gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, GDK_SHIFT_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, GDK_SHIFT_MASK,
                                "extend_selection", 3,
                                G_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
                                G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, GDK_SHIFT_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Up, GDK_SHIFT_MASK,
                                "extend_selection", 3,
                                G_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
                                G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
-  gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, GDK_SHIFT_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, GDK_SHIFT_MASK,
                                "extend_selection", 3,
                                G_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
                                G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, GDK_SHIFT_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Down, GDK_SHIFT_MASK,
                                "extend_selection", 3,
                                G_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
                                G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
-  gtk_binding_entry_add_signal (binding_set, GDK_Home,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Home,
                                GDK_SHIFT_MASK | GDK_CONTROL_MASK,
                                "extend_selection", 3,
                                G_TYPE_ENUM, GTK_SCROLL_JUMP,
                                G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Home,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Home,
                                 GDK_SHIFT_MASK | GDK_CONTROL_MASK,
                                "extend_selection", 3,
                                G_TYPE_ENUM, GTK_SCROLL_JUMP,
                                G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
-  gtk_binding_entry_add_signal (binding_set, GDK_End,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_End,
                                GDK_SHIFT_MASK | GDK_CONTROL_MASK,
                                "extend_selection", 3,
                                G_TYPE_ENUM, GTK_SCROLL_JUMP,
                                G_TYPE_FLOAT, 1.0, G_TYPE_BOOLEAN, TRUE);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_End,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_End,
                                GDK_SHIFT_MASK | GDK_CONTROL_MASK,
                                "extend_selection", 3,
                                G_TYPE_ENUM, GTK_SCROLL_JUMP,
                                G_TYPE_FLOAT, 1.0, G_TYPE_BOOLEAN, TRUE);
 
   
-  gtk_binding_entry_add_signal (binding_set, GDK_Left, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0,
                                "scroll_horizontal", 2,
                                G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
                                G_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, 0,
                                "scroll_horizontal", 2,
                                G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
                                G_TYPE_FLOAT, 0.0);
   
-  gtk_binding_entry_add_signal (binding_set, GDK_Right, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0,
                                "scroll_horizontal", 2,
                                G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
                                G_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, 0,
                                "scroll_horizontal", 2,
                                G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
                                G_TYPE_FLOAT, 0.0);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_Home, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Home, 0,
                                "scroll_horizontal", 2,
                                G_TYPE_ENUM, GTK_SCROLL_JUMP,
                                G_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Home, 0,
                                "scroll_horizontal", 2,
                                G_TYPE_ENUM, GTK_SCROLL_JUMP,
                                G_TYPE_FLOAT, 0.0);
   
-  gtk_binding_entry_add_signal (binding_set, GDK_End, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_End, 0,
                                "scroll_horizontal", 2,
                                G_TYPE_ENUM, GTK_SCROLL_JUMP,
                                G_TYPE_FLOAT, 1.0);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_End, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_End, 0,
                                "scroll_horizontal", 2,
                                G_TYPE_ENUM, GTK_SCROLL_JUMP,
                                G_TYPE_FLOAT, 1.0);
   
-  gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
                                "undo_selection", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
                                "abort_column_resize", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0,
                                "toggle_focus_row", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, 0,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, 0,
                                "toggle_focus_row", 0);  
-  gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_CONTROL_MASK,
                                "toggle_add_mode", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_CONTROL_MASK,
                                "toggle_add_mode", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
                                "select_all", 0);
@@ -938,17 +938,17 @@ gtk_cmclist_class_init (GtkCMCListClass *klass)
                                "select_all", 0);
   gtk_binding_entry_add_signal (binding_set, '\\', GDK_CONTROL_MASK,
                                "unselect_all", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_Shift_L,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Shift_L,
                                GDK_RELEASE_MASK | GDK_SHIFT_MASK,
                                "end_selection", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_Shift_R,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Shift_R,
                                GDK_RELEASE_MASK | GDK_SHIFT_MASK,
                                "end_selection", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_Shift_L,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Shift_L,
                                GDK_RELEASE_MASK | GDK_SHIFT_MASK |
                                GDK_CONTROL_MASK,
                                "end_selection", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_Shift_R,
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Shift_R,
                                GDK_RELEASE_MASK | GDK_SHIFT_MASK |
                                GDK_CONTROL_MASK,
                                "end_selection", 0);
index eb5fc96..f3bd8c6 100644 (file)
@@ -602,64 +602,64 @@ gtk_cmctree_class_init (GtkCMCTreeClass *klass)
 
   binding_set = gtk_binding_set_by_class (klass);
   gtk_binding_entry_add_signal (binding_set,
-                               GDK_plus, 0,
+                               GDK_KEY_plus, 0,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_EXPAND);
   gtk_binding_entry_add_signal (binding_set,
-                               GDK_plus, GDK_CONTROL_MASK,
+                               GDK_KEY_plus, GDK_CONTROL_MASK,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_EXPAND_RECURSIVE);
 
   gtk_binding_entry_add_signal (binding_set,
-                               GDK_KP_Add, 0,
+                               GDK_KEY_KP_Add, 0,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_EXPAND);
   gtk_binding_entry_add_signal (binding_set,
-                               GDK_KP_Add, GDK_CONTROL_MASK,
+                               GDK_KEY_KP_Add, GDK_CONTROL_MASK,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_EXPAND_RECURSIVE);
   
   gtk_binding_entry_add_signal (binding_set,
-                               GDK_minus, 0,
+                               GDK_KEY_minus, 0,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_COLLAPSE);
   gtk_binding_entry_add_signal (binding_set,
-                                GDK_minus, GDK_CONTROL_MASK,
+                                GDK_KEY_minus, GDK_CONTROL_MASK,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM,
                                GTK_CMCTREE_EXPANSION_COLLAPSE_RECURSIVE);
   gtk_binding_entry_add_signal (binding_set,
-                               GDK_KP_Subtract, 0,
+                               GDK_KEY_KP_Subtract, 0,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_COLLAPSE);
   gtk_binding_entry_add_signal (binding_set,
-                               GDK_KP_Subtract, GDK_CONTROL_MASK,
+                               GDK_KEY_KP_Subtract, GDK_CONTROL_MASK,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM,
                                GTK_CMCTREE_EXPANSION_COLLAPSE_RECURSIVE);
   gtk_binding_entry_add_signal (binding_set,
-                               GDK_equal, 0,
+                               GDK_KEY_equal, 0,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_TOGGLE);
   gtk_binding_entry_add_signal (binding_set,
-                               GDK_KP_Equal, 0,
+                               GDK_KEY_KP_Equal, 0,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_TOGGLE);
   gtk_binding_entry_add_signal (binding_set,
-                               GDK_KP_Multiply, 0,
+                               GDK_KEY_KP_Multiply, 0,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_TOGGLE);
   gtk_binding_entry_add_signal (binding_set,
-                               GDK_asterisk, 0,
+                               GDK_KEY_asterisk, 0,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_TOGGLE);
   gtk_binding_entry_add_signal (binding_set,
-                               GDK_KP_Multiply, GDK_CONTROL_MASK,
+                               GDK_KEY_KP_Multiply, GDK_CONTROL_MASK,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM,
                                GTK_CMCTREE_EXPANSION_TOGGLE_RECURSIVE);
   gtk_binding_entry_add_signal (binding_set,
-                               GDK_asterisk, GDK_CONTROL_MASK,
+                               GDK_KEY_asterisk, GDK_CONTROL_MASK,
                                "change_focus_row_expansion", 1,
                                G_TYPE_ENUM,
                                GTK_CMCTREE_EXPANSION_TOGGLE_RECURSIVE);  
index 44409f3..8c28bc1 100644 (file)
@@ -696,8 +696,8 @@ gtk_cmoption_menu_key_press (GtkWidget   *widget,
 
   switch (event->keyval)
     {
-    case GDK_KP_Space:
-    case GDK_space:
+    case GDK_KEY_KP_Space:
+    case GDK_KEY_space:
       gtk_cmoption_menu_remove_contents (option_menu);
       gtk_menu_popup (GTK_MENU (option_menu->menu), NULL, NULL,
                      gtk_cmoption_menu_position, option_menu,
index ff5c62d..49cd05f 100644 (file)
@@ -662,7 +662,7 @@ static void gtkut_clist_bindings_add(GtkWidget *clist)
        binding_set = gtk_binding_set_by_class
                (GTK_CMCLIST_GET_CLASS(clist));
 
-       gtk_binding_entry_add_signal(binding_set, GDK_n, GDK_CONTROL_MASK,
+       gtk_binding_entry_add_signal(binding_set, GDK_KEY_n, GDK_CONTROL_MASK,
                                     "scroll_vertical", 2,
                                     G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
                                     G_TYPE_FLOAT, 0.0);
index 22b0dd0..b563a27 100644 (file)
@@ -184,7 +184,7 @@ static void legend_create(void)
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event)
 {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                legend_close();
        }
        return FALSE;
index 344d9db..a5c8d69 100644 (file)
@@ -526,10 +526,10 @@ static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                ack = FALSE;
                fin = TRUE;
-       } else if (event && event->keyval == GDK_Return) {
+       } else if (event && event->keyval == GDK_KEY_Return) {
                ack = TRUE;
                fin = TRUE;
                return TRUE; /* do not let Return pass - it
index adb0b9f..cb3d11d 100644 (file)
@@ -384,9 +384,9 @@ static void hide_cb(GtkWidget *widget, LogWindow *logwin)
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                        LogWindow *logwin)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                gtk_widget_hide(logwin->window);
-       else if (event && event->keyval == GDK_Delete) 
+       else if (event && event->keyval == GDK_KEY_Delete) 
                log_window_clear(NULL, logwin);
 
        return FALSE;
index 3366990..e21d062 100644 (file)
@@ -232,21 +232,21 @@ static gboolean pluginwindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
 {
        if (event) {
                switch (event->keyval) {
-                       case GDK_Escape : 
-                       case GDK_Return : 
-                       case GDK_KP_Enter :
+                       case GDK_KEY_Escape : 
+                       case GDK_KEY_Return : 
+                       case GDK_KEY_KP_Enter :
                                close_cb(NULL, pluginwindow);
                                break;
-                       case GDK_Insert : 
-                       case GDK_KP_Insert :
-                       case GDK_KP_Add : 
-                       case GDK_plus :
+                       case GDK_KEY_Insert : 
+                       case GDK_KEY_KP_Insert :
+                       case GDK_KEY_KP_Add : 
+                       case GDK_KEY_plus :
                                load_cb(NULL, pluginwindow);
                                break;
-                       case GDK_Delete : 
-                       case GDK_KP_Delete :
-                       case GDK_KP_Subtract : 
-                       case GDK_minus :
+                       case GDK_KEY_Delete : 
+                       case GDK_KEY_KP_Delete :
+                       case GDK_KEY_KP_Subtract : 
+                       case GDK_KEY_minus :
                                unload_cb(NULL, pluginwindow);
                                break;
                        default :
index 034a3a6..2061512 100644 (file)
@@ -222,11 +222,11 @@ static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
        if (event) {
                switch (event->keyval) {
-                       case GDK_Escape :
+                       case GDK_KEY_Escape :
                                cancel_button_clicked(NULL, data);
                                break;
-                       case GDK_Return : 
-                       case GDK_KP_Enter :
+                       case GDK_KEY_Return : 
+                       case GDK_KEY_KP_Enter :
                                focused_child = gtkut_get_focused_child
                                        (GTK_CONTAINER(data->notebook));
                                /* Press ok, if the focused child is not a text view
index 62dd493..b32db51 100644 (file)
@@ -331,7 +331,7 @@ static void searchbar_changed_cb(GtkWidget *widget, QuickSearch *qs)
 static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
                                  QuickSearch *quicksearch)
 {
-       if (event && (event->keyval == GDK_Escape)) {
+       if (event && (event->keyval == GDK_KEY_Escape)) {
                gchar *str;
 
                quicksearch->in_typing = FALSE;
@@ -353,7 +353,7 @@ static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
                return TRUE;
        }
 
-       if (event != NULL && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) {
+       if (event != NULL && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)) {
                if (quicksearch->press_timeout_id != -1) {
                        g_source_remove(quicksearch->press_timeout_id);
                        quicksearch->press_timeout_id = -1;
@@ -366,7 +366,7 @@ static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
                return TRUE;
        }
 
-       if (event && (event->keyval == GDK_Down || event->keyval == GDK_Up)) {
+       if (event && (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_Up)) {
                combobox_set_value_from_arrow_key(
                                GTK_COMBO_BOX(quicksearch->search_string_entry),
                                event->keyval);
index a1f0487..03b544e 100644 (file)
@@ -283,7 +283,7 @@ static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                import_cancel_cb(NULL, NULL);
        return FALSE;
 }
index c5a20e4..8b1dbb9 100644 (file)
@@ -613,7 +613,7 @@ static gint imp_ldif_delete_event( GtkWidget *widget, GdkEventAny *event, gpoint
  * \param data   User data.
  */
 static gboolean imp_ldif_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                imp_ldif_cancel( widget, data );
        }
        return FALSE;
index 2e6d7a3..a2c8b22 100644 (file)
@@ -175,7 +175,7 @@ static gint imp_mutt_delete_event( GtkWidget *widget, GdkEventAny *event, gboole
 }
 
 static gboolean imp_mutt_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                *cancelled = TRUE;
                gtk_main_quit();
        }
index 86a4df1..b9913e3 100644 (file)
@@ -174,7 +174,7 @@ static gint imp_pine_delete_event( GtkWidget *widget, GdkEventAny *event, gboole
 }
 
 static gboolean imp_pine_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                *cancelled = TRUE;
                gtk_main_quit();
        }
index 1ee266b..d226f82 100644 (file)
@@ -1091,7 +1091,7 @@ void mainwin_accel_changed_cb (GtkAccelGroup *accelgroup, guint keyval, GdkModif
                        GtkLabel *label = g_object_get_data(G_OBJECT(item), "accel_label");
                        gchar *new_accel;
                        
-                       if (keyval == GDK_BackSpace) {
+                       if (keyval == GDK_KEY_BackSpace) {
                                const gchar *accel_path;
 #if GTK_CHECK_VERSION(2,14,0)
                                accel_path = gtk_menu_item_get_accel_path(item);
@@ -1338,7 +1338,7 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
        }
 
        switch (event->keyval) {
-       case GDK_Q:             /* Quit */
+       case GDK_KEY_Q:             /* Quit */
 #ifndef MAEMO
                BREAK_ON_MODIFIER_KEY();
 
@@ -1347,7 +1347,7 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
                }
 #endif
                return FALSE;
-       case GDK_space:
+       case GDK_KEY_space:
                BREAK_ON_MODIFIER_KEY();
                if (gtk_window_is_active(GTK_WINDOW(mainwin->window))) {
                        if (mainwin->folderview != NULL && mainwin->summaryview != NULL
@@ -1363,14 +1363,14 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
                break;
 
 #ifdef MAEMO
-       case GDK_F6:
+       case GDK_KEY_F6:
                if (maemo_mainwindow_is_fullscreen(widget)) {
                        gtk_window_unfullscreen(GTK_WINDOW(widget));
                 } else {
                        gtk_window_fullscreen(GTK_WINDOW(widget));
                 }
                break;
-       case GDK_F7:
+       case GDK_KEY_F7:
                {
                        PangoFontDescription *font_desc;
                        int size;
@@ -1394,7 +1394,7 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
                        pango_font_description_free(font_desc);
                }
                break;
-       case GDK_F8:
+       case GDK_KEY_F8:
                {
                        PangoFontDescription *font_desc;
                        int size;
@@ -1418,7 +1418,7 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
                        pango_font_description_free(font_desc);
                }
                break;
-       case GDK_Escape:
+       case GDK_KEY_Escape:
                if (mainwin->summaryview && 
                    mainwin->summaryview->ext_messageview && 
                    mainwin->summaryview->ext_messageview->window && 
index 855dec0..4dbf1af 100644 (file)
@@ -391,15 +391,15 @@ static void message_search_next_clicked(GtkButton *button, gpointer data)
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                            gpointer data)
 {
-       if (event && (event->keyval == GDK_Escape)) {
+       if (event && (event->keyval == GDK_KEY_Escape)) {
                gtk_widget_hide(search_window.window);
        }
 
-       if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) {
+       if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)) {
                message_search_execute(FALSE);
        }
 
-       if (event && (event->keyval == GDK_Down || event->keyval == GDK_Up)) {
+       if (event && (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_Up)) {
                if (search_window.body_entry_has_focus) {
                        combobox_set_value_from_arrow_key(
                                        GTK_COMBO_BOX(search_window.body_entry),
index 470d625..fcc4dc6 100644 (file)
@@ -1717,14 +1717,14 @@ static void messageview_size_allocate_cb(GtkWidget *widget,
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                        MessageView *messageview)
 {
-       if (event && event->keyval == GDK_Escape && messageview->window) {
+       if (event && event->keyval == GDK_KEY_Escape && messageview->window) {
                messageview_destroy(messageview);
                return TRUE;
        }
 
        if (event && (event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0)
                return FALSE;
-       if (event && (event->state & GDK_SHIFT_MASK) && event->keyval != GDK_space) 
+       if (event && (event->state & GDK_SHIFT_MASK) && event->keyval != GDK_KEY_space) 
                return FALSE;
 
        g_signal_stop_emission_by_name(G_OBJECT(widget),
index 8948e1b..7a3f519 100644 (file)
@@ -1443,8 +1443,8 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                return FALSE;
                
        switch (event->keyval) {
-       case GDK_Page_Down:
-       case GDK_space:
+       case GDK_KEY_Page_Down:
+       case GDK_KEY_space:
                if (mimeview_scroll_page(mimeview,
                                         (event->state & GDK_SHIFT_MASK) != 0))
                        return TRUE;
@@ -1452,59 +1452,59 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                if (!(event->state & GDK_SHIFT_MASK))
                        mimeview_select_next_part(mimeview);
                return TRUE;
-       case GDK_Page_Up:
-       case GDK_BackSpace:
+       case GDK_KEY_Page_Up:
+       case GDK_KEY_BackSpace:
                mimeview_scroll_page(mimeview, TRUE);
                return TRUE;
-       case GDK_Return:
-       case GDK_KP_Enter:
+       case GDK_KEY_Return:
+       case GDK_KEY_KP_Enter:
                mimeview_scroll_one_line(mimeview,
                                         (event->state & GDK_MOD1_MASK) != 0);
                return TRUE;
-       case GDK_Up:
-       case GDK_Down:
-               mimeview_scroll_one_line(mimeview, (event->keyval == GDK_Up));
+       case GDK_KEY_Up:
+       case GDK_KEY_Down:
+               mimeview_scroll_one_line(mimeview, (event->keyval == GDK_KEY_Up));
                return TRUE;
-       case GDK_n:
-       case GDK_N:
+       case GDK_KEY_n:
+       case GDK_KEY_N:
                BREAK_ON_MODIFIER_KEY();
                mimeview_select_next_part(mimeview);
                return TRUE;
 
-       case GDK_p:
-       case GDK_P:
+       case GDK_KEY_p:
+       case GDK_KEY_P:
                BREAK_ON_MODIFIER_KEY();
                mimeview_select_prev_part(mimeview);
                return TRUE;
 
-       case GDK_y:
+       case GDK_KEY_y:
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
                mimeview_save_as(mimeview);
                return TRUE;
-       case GDK_t:
+       case GDK_KEY_t:
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
                mimeview_display_as_text(mimeview);
                return TRUE;    
-       case GDK_l:
+       case GDK_KEY_l:
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
                mimeview_launch(mimeview, NULL);
                return TRUE;
-       case GDK_o:
+       case GDK_KEY_o:
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
 #ifndef G_OS_WIN32
                mimeview_open_with(mimeview);
 #endif
                return TRUE;
-       case GDK_c:
+       case GDK_KEY_c:
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
                mimeview_check_signature(mimeview);
                return TRUE;
-       case GDK_a:
+       case GDK_KEY_a:
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
                mimeview_select_next_part(mimeview);
@@ -2159,7 +2159,7 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
        textview = mimeview->textview;
 
        switch (event->keyval) {
-       case GDK_space:
+       case GDK_KEY_space:
                if (mimeview_scroll_page(mimeview, FALSE))
                        return TRUE;
 
@@ -2167,50 +2167,50 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
                return TRUE;
 
                break;
-       case GDK_BackSpace:
+       case GDK_KEY_BackSpace:
                mimeview_scroll_page(mimeview, TRUE);
                return TRUE;
-       case GDK_Return:
-       case GDK_KP_Enter:
+       case GDK_KEY_Return:
+       case GDK_KEY_KP_Enter:
                mimeview_scroll_one_line(mimeview,
                                         (event->state & GDK_MOD1_MASK) != 0);
                return TRUE;
 
-       case GDK_n:
-       case GDK_N:
+       case GDK_KEY_n:
+       case GDK_KEY_N:
                BREAK_ON_MODIFIER_KEY();
                mimeview_select_next_part(mimeview);
                return TRUE;
                
-       case GDK_p:
-       case GDK_P:
+       case GDK_KEY_p:
+       case GDK_KEY_P:
                BREAK_ON_MODIFIER_KEY();
                mimeview_select_prev_part(mimeview);
                break;
 
-       case GDK_y:
+       case GDK_KEY_y:
                BREAK_ON_MODIFIER_KEY();
                mimeview_save_as(mimeview);
                return TRUE;
-       case GDK_t:
+       case GDK_KEY_t:
                BREAK_ON_MODIFIER_KEY();
                mimeview_display_as_text(mimeview);
                return TRUE;    
-       case GDK_l:
+       case GDK_KEY_l:
                BREAK_ON_MODIFIER_KEY();
                mimeview_launch(mimeview, NULL);
                return TRUE;
 #ifndef G_OS_WIN32
-       case GDK_o:
+       case GDK_KEY_o:
                BREAK_ON_MODIFIER_KEY();
                mimeview_open_with(mimeview);
                return TRUE;
 #endif
-       case GDK_c:
+       case GDK_KEY_c:
                BREAK_ON_MODIFIER_KEY();
                mimeview_check_signature(mimeview);
                return TRUE;
-       case GDK_a:
+       case GDK_KEY_a:
                BREAK_ON_MODIFIER_KEY();
                mimeview_select_next_part(mimeview);
                return TRUE;
index d789585..8849716 100644 (file)
@@ -227,7 +227,7 @@ passphrase_deleted(GtkWidget *widget, GdkEventAny *event, gpointer data)
 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 87f46ca..c996559 100644 (file)
@@ -487,7 +487,7 @@ key_pressed_cb (GtkWidget *widget, GdkEventKey *event, gpointer data)
     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 ();
     }
index b712c73..d95e38d 100644 (file)
@@ -848,7 +848,7 @@ static gint prefs_actions_deleted(GtkWidget *widget, GdkEventAny *event,
 static gboolean prefs_actions_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                          gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                prefs_actions_cancel(widget, data);
        else {
                GtkWidget *focused = gtkut_get_focused_child(
index cdb1d74..7937074 100644 (file)
@@ -778,7 +778,7 @@ static gboolean prefs_custom_header_key_pressed(GtkWidget *widget,
                                                GdkEventKey *event,
                                                gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                prefs_custom_header_cancel();
        return FALSE;
 }
index 383118b..1dea82c 100644 (file)
@@ -703,7 +703,7 @@ static gboolean prefs_display_header_key_pressed(GtkWidget *widget,
                                             GdkEventKey *event,
                                             gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                prefs_display_header_cancel();
        return FALSE;
 }
index 0bef14f..ccff282 100644 (file)
@@ -1532,7 +1532,7 @@ static gint prefs_filtering_deleted(GtkWidget *widget, GdkEventAny *event,
 static gboolean prefs_filtering_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                     gpointer data)
 {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                prefs_filtering_cancel(NULL, NULL);
                return TRUE;                    
        }
index e1944d2..8f28788 100644 (file)
@@ -1129,7 +1129,7 @@ static void prefs_filtering_action_down(void)
 static gboolean prefs_filtering_action_key_pressed(GtkWidget *widget,
     GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                prefs_filtering_action_cancel();
                return TRUE;            
        }
index 0d31c94..277b22e 100644 (file)
@@ -656,7 +656,7 @@ static gboolean prefs_folder_column_key_pressed(GtkWidget *widget,
                                                 GdkEventKey *event,
                                                 gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                folder_col.finished = TRUE;
        return FALSE;
 }
index dedd70c..5f81798 100644 (file)
@@ -1980,7 +1980,7 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
 static gboolean prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                     gpointer data)
 {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                prefs_matcher_cancel();
                return TRUE;            
        }
index 864b06c..a081cf0 100644 (file)
@@ -745,11 +745,11 @@ static gboolean quote_colors_set_dialog_key_pressed(GtkWidget *widget,
 
        if (event) {
                switch (event->keyval) {
-                       case GDK_Escape:
+                       case GDK_KEY_Escape:
                                gtk_button_clicked(GTK_BUTTON(&button_cancel));
                                return TRUE;
-                       case GDK_Return: 
-                       case GDK_KP_Enter:
+                       case GDK_KEY_Return: 
+                       case GDK_KEY_KP_Enter:
                                /* NOTE: changing focus makes widget accept all currently 
                                 * changed settings! */
                                gtk_widget_grab_focus(&button_ok);
index aee7ef2..6f375fc 100644 (file)
@@ -159,7 +159,7 @@ static void prefs_keybind_select(void)
 static gboolean prefs_keybind_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                          gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                prefs_keybind_cancel();
        return FALSE;
 }
index f1e8a81..8802f87 100644 (file)
@@ -733,7 +733,7 @@ static void date_format_cancel_btn_clicked(GtkButton *button,
 static gboolean date_format_key_pressed(GtkWidget *keywidget, GdkEventKey *event,
                                        GtkWidget **widget)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                date_format_cancel_btn_clicked(NULL, widget);
        return FALSE;
 }
index 01fce6c..4781ed8 100644 (file)
@@ -671,7 +671,7 @@ static gboolean prefs_summary_column_key_pressed(GtkWidget *widget,
                                                 GdkEventKey *event,
                                                 gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                summary_col.finished = TRUE;
        return FALSE;
 }
index e420c14..57654b7 100644 (file)
@@ -526,7 +526,7 @@ static gboolean prefs_summary_open_key_pressed(GtkWidget *widget,
                                             GdkEventKey *event,
                                             gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                prefs_summary_open_cancel();
        return FALSE;
 }
index 65b2242..9e71a8d 100644 (file)
@@ -510,7 +510,7 @@ static gint prefs_template_deleted_cb(GtkWidget *widget, GdkEventAny *event,
 static gboolean prefs_template_key_pressed_cb(GtkWidget *widget,
                                              GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                prefs_template_cancel_cb(NULL, NULL);
        else {
                GtkWidget *focused = gtkut_get_focused_child(
index 57a34f2..22982d2 100644 (file)
@@ -1536,7 +1536,7 @@ static void icon_chooser_cancel_clicked(GtkButton *button,
 static gboolean icon_chooser_key_pressed(GtkWidget *widget, GdkEventKey *event,
                        ToolbarPage *prefs_toolbar)
 {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                icon_chooser_cancel_clicked(NULL, prefs_toolbar);
                return TRUE;
        }
@@ -1548,9 +1548,9 @@ static gboolean icon_list_key_pressed(GtkWidget *widget, GdkEventKey *event,
                        ToolbarPage *prefs_toolbar)
 {
        if (event) {
-               if (event->keyval == GDK_KP_Enter ||
-                   event->keyval == GDK_Return ||
-                   event->keyval == GDK_space) {
+               if (event->keyval == GDK_KEY_KP_Enter ||
+                   event->keyval == GDK_KEY_Return ||
+                   event->keyval == GDK_KEY_space) {
                        icon_chooser_ok_clicked(NULL, prefs_toolbar);
                        return TRUE;
                }
index 8fe1b89..e7b93ef 100644 (file)
@@ -581,7 +581,7 @@ static gboolean cb_preview_close(GtkWidget *widget, GdkEventAny *event,
 {
        PreviewData *preview_data = (PreviewData *)data;
        if (event->type == GDK_KEY_PRESS)
-                if (((GdkEventKey *)event)->keyval != GDK_Escape)
+                if (((GdkEventKey *)event)->keyval != GDK_KEY_Escape)
                        return FALSE;
        if (preview_data->rendering)
                return FALSE; 
index 2b620a7..05c88f3 100644 (file)
@@ -206,17 +206,17 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
        if (!event || !sourcewin) return FALSE;
        
        switch (event->keyval) {
-       case GDK_A:
-       case GDK_a:
+       case GDK_KEY_A:
+       case GDK_KEY_a:
                if ((event->state & GDK_CONTROL_MASK) != 0)
                        gtk_editable_select_region(GTK_EDITABLE(sourcewin->text), 0, -1);
                break;
-       case GDK_W:
-       case GDK_w:
+       case GDK_KEY_W:
+       case GDK_KEY_w:
                if ((event->state & GDK_CONTROL_MASK) != 0)
                        gtk_widget_destroy(sourcewin->window);
                break;
-       case GDK_Escape:
+       case GDK_KEY_Escape:
                source_window_destroy(sourcewin);
                return TRUE;
                break;
index 9943d13..5a21653 100644 (file)
@@ -375,7 +375,7 @@ static void ssl_manager_close_cb(GtkWidget *widget,
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                ssl_manager_close();
        return FALSE;
 }
index f3c17af..bec71ea 100644 (file)
@@ -934,7 +934,7 @@ static gboolean adv_condition_entry_focus_evt_out(GtkWidget *widget, GdkEventFoc
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                            gpointer data)
 {
-       if (event && (event->keyval == GDK_Escape)) {
+       if (event && (event->keyval == GDK_KEY_Escape)) {
                /* ESC key will:
                        - stop a running search
                        - close the search window if no search is running
@@ -946,13 +946,13 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                }
        }
 
-       if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) {
+       if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)) {
                if (!search_window.is_searching) {
                        summary_search_execute(FALSE, FALSE);
                }
        }
 
-       if (event && (event->keyval == GDK_Down || event->keyval == GDK_Up)) {
+       if (event && (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_Up)) {
                if (search_window.from_entry_has_focus) {
                        combobox_set_value_from_arrow_key(
                                        GTK_COMBO_BOX(search_window.from_entry),
index eb55cc5..7ebdedb 100644 (file)
@@ -6581,7 +6581,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        if (summaryview->selected) {
                gboolean handled = FALSE;
                switch (event->keyval) {
-               case GDK_space:         /* Page down or go to the next */
+               case GDK_KEY_space:             /* Page down or go to the next */
                        handled = TRUE;
                        if (event->state & GDK_CONTROL_MASK) {
                                handled = FALSE;
@@ -6604,12 +6604,12 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                }                               
                        }
                        break;
-               case GDK_BackSpace:     /* Page up */
+               case GDK_KEY_BackSpace: /* Page up */
                        handled = TRUE;
                        mimeview_scroll_page(messageview->mimeview, TRUE);
                        break;
-               case GDK_Return:        /* Scroll up/down one line */
-               case GDK_KP_Enter:
+               case GDK_KEY_Return:    /* Scroll up/down one line */
+               case GDK_KEY_KP_Enter:
                        handled = TRUE;
                        if (summaryview->displayed != summaryview->selected) {
 #ifndef GENERIC_UMPC
@@ -6631,21 +6631,21 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                return TRUE;
 
        switch (event->keyval) {
-       case GDK_Left:          /* Move focus */
+       case GDK_KEY_Left:              /* Move focus */
                adj = gtk_scrolled_window_get_hadjustment
                        (GTK_SCROLLED_WINDOW(summaryview->scrolledwin));
                if (gtk_adjustment_get_lower(adj) != gtk_adjustment_get_value(adj))
                        break;
                /* FALLTHROUGH */       
-       case GDK_Escape:
+       case GDK_KEY_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                mainwindow_exit_folder(summaryview->mainwin);
                return TRUE;
-       case GDK_Home:
-       case GDK_End:
+       case GDK_KEY_Home:
+       case GDK_KEY_End:
                if ((node = summaryview->selected) != NULL) {
                        GtkCMCTreeNode *next = NULL;
-                       next = (event->keyval == GDK_Home)
+                       next = (event->keyval == GDK_KEY_Home)
                                        ? gtk_cmctree_node_nth(ctree, 0)
                                        : gtk_cmctree_node_nth(ctree, 
                                                g_list_length(GTK_CMCLIST(ctree)->row_list)-1);
@@ -6673,16 +6673,16 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        }
 
        switch (event->keyval) {
-       case GDK_Delete:
+       case GDK_KEY_Delete:
                BREAK_ON_MODIFIER_KEY();
                summary_delete_trash(summaryview);
                break;
-       case GDK_y:
-       case GDK_t:
-       case GDK_l:
-       case GDK_o:
-       case GDK_c:
-       case GDK_a:
+       case GDK_KEY_y:
+       case GDK_KEY_t:
+       case GDK_KEY_l:
+       case GDK_KEY_o:
+       case GDK_KEY_c:
+       case GDK_KEY_a:
                if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
                        g_signal_stop_emission_by_name(G_OBJECT(widget), 
                                        "key_press_event");
index 97d44ec..ad60f40 100644 (file)
@@ -2271,19 +2271,19 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                summaryview = messageview->mainwin->summaryview;
 
        switch (event->keyval) {
-       case GDK_Tab:
-       case GDK_Home:
-       case GDK_Left:
-       case GDK_Up:
-       case GDK_Right:
-       case GDK_Down:
-       case GDK_Page_Up:
-       case GDK_Page_Down:
-       case GDK_End:
-       case GDK_Control_L:
-       case GDK_Control_R:
+       case GDK_KEY_Tab:
+       case GDK_KEY_Home:
+       case GDK_KEY_Left:
+       case GDK_KEY_Up:
+       case GDK_KEY_Right:
+       case GDK_KEY_Down:
+       case GDK_KEY_Page_Up:
+       case GDK_KEY_Page_Down:
+       case GDK_KEY_End:
+       case GDK_KEY_Control_L:
+       case GDK_KEY_Control_R:
                return FALSE;
-       case GDK_space:
+       case GDK_KEY_space:
                if (summaryview)
                        summary_pass_key_press_event(summaryview, event);
                else
@@ -2292,25 +2292,25 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                 (event->state &
                                  (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
                break;
-       case GDK_BackSpace:
+       case GDK_KEY_BackSpace:
                mimeview_scroll_page(messageview->mimeview, TRUE);
                break;
-       case GDK_Return:
-       case GDK_KP_Enter:
+       case GDK_KEY_Return:
+       case GDK_KEY_KP_Enter:
                mimeview_scroll_one_line
                        (messageview->mimeview, (event->state &
                                    (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
                break;
-       case GDK_Delete:
+       case GDK_KEY_Delete:
                if (summaryview)
                        summary_pass_key_press_event(summaryview, event);
                break;
-       case GDK_y:
-       case GDK_t:
-       case GDK_l:
-       case GDK_o:
-       case GDK_c:
-       case GDK_a:
+       case GDK_KEY_y:
+       case GDK_KEY_t:
+       case GDK_KEY_l:
+       case GDK_KEY_o:
+       case GDK_KEY_c:
+       case GDK_KEY_a:
                if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
                        KEY_PRESS_EVENT_STOP();
                        mimeview_pass_key_press_event(messageview->mimeview,
index f2d92a7..892f6ac 100644 (file)
@@ -322,7 +322,7 @@ static void uri_opener_close_cb(GtkWidget *widget,
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                uri_opener_close();
        return FALSE;
 }