diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-09-18 06:39:59 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-18 06:39:59 +0800 |
| commit | afe6f502c326350cc31d34646d5000a964321525 (patch) | |
| tree | 9d9469a0ce33428e24e602fdbf87bc496864bc57 /modules/mail | |
| parent | b79bf3d187cabd11df74d2e6e414e41ae637f307 (diff) | |
| download | gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.gz gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.bz2 gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.lz gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.xz gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.zst gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.zip | |
Use new GDK keysym names if available.
In GTK+ 2.21.8, the keysym names were renamed from GDK_* to GDK_KEY_*.
I've added backward-compatibility macors to gtk-compat.h, which can be
dumped as soon as we require GTK+ >= 2.22.0.
Diffstat (limited to 'modules/mail')
| -rw-r--r-- | modules/mail/e-mail-shell-view-private.c | 16 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-private.h | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index 58ef47a1a8..8d4fa9922e 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -73,10 +73,10 @@ mail_shell_view_folder_tree_key_press_event_cb (EMailShellView *mail_shell_view, /* <keyval> alone */ switch (event->keyval) { - case GDK_period: - case GDK_comma: - case GDK_bracketleft: - case GDK_bracketright: + case GDK_KEY_period: + case GDK_KEY_comma: + case GDK_KEY_bracketleft: + case GDK_KEY_bracketright: goto emit; default: @@ -86,8 +86,8 @@ mail_shell_view_folder_tree_key_press_event_cb (EMailShellView *mail_shell_view, ctrl: /* Ctrl + <keyval> */ switch (event->keyval) { - case GDK_period: - case GDK_comma: + case GDK_KEY_period: + case GDK_KEY_comma: goto emit; default: @@ -178,11 +178,11 @@ mail_shell_view_key_press_event_cb (EMailShellView *mail_shell_view, return FALSE; switch (event->keyval) { - case GDK_space: + case GDK_KEY_space: action = ACTION (MAIL_SMART_FORWARD); break; - case GDK_BackSpace: + case GDK_KEY_BackSpace: action = ACTION (MAIL_SMART_BACKWARD); break; diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h index a8a86c5054..f023e1b263 100644 --- a/modules/mail/e-mail-shell-view-private.h +++ b/modules/mail/e-mail-shell-view-private.h @@ -66,6 +66,9 @@ #include "e-mail-shell-sidebar.h" #include "e-mail-shell-view-actions.h" +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + #define E_MAIL_SHELL_VIEW_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_SHELL_VIEW, EMailShellViewPrivate)) |