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 /composer | |
| parent | b79bf3d187cabd11df74d2e6e414e41ae637f307 (diff) | |
| download | gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.gz 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 'composer')
| -rw-r--r-- | composer/e-msg-composer.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 480bfbe3bd..9f9aac9e19 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -67,6 +67,9 @@ #include <X11/XF86keysym.h> #endif +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + #define d(x) #define E_MSG_COMPOSER_GET_PRIVATE(obj) \ @@ -2008,17 +2011,17 @@ msg_composer_key_press_event (GtkWidget *widget, } #endif /* HAVE_XFREE */ - if (event->keyval == GDK_Escape) { + if (event->keyval == GDK_KEY_Escape) { gtk_action_activate (ACTION (CLOSE)); return TRUE; } - if (event->keyval == GDK_Tab && gtk_widget_is_focus (input_widget)) { + if (event->keyval == GDK_KEY_Tab && gtk_widget_is_focus (input_widget)) { gtkhtml_editor_run_command (editor, "grab-focus"); return TRUE; } - if (event->keyval == GDK_ISO_Left_Tab && + if (event->keyval == GDK_KEY_ISO_Left_Tab && gtk_widget_is_focus (GTK_WIDGET (html))) { gtk_widget_grab_focus (input_widget); return TRUE; |