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 /capplet | |
| 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 'capplet')
| -rw-r--r-- | capplet/settings/mail-capplet-shell.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 8038f413ed..63f8625caa 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -42,6 +42,9 @@ #include <mail/mail-mt.h> #include <mail/e-mail-store.h> +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + enum { CTRL_W_PRESSED, CTRL_Q_PRESSED, @@ -141,10 +144,10 @@ mail_capplet_shell_class_init (MailCappletShellClass *klass) G_TYPE_NONE, 0); binding_set = gtk_binding_set_by_class (klass); - gtk_binding_entry_add_signal (binding_set, GDK_W, GDK_CONTROL_MASK, "ctrl_w_pressed", 0); - gtk_binding_entry_add_signal (binding_set, GDK_w, GDK_CONTROL_MASK, "ctrl_w_pressed", 0); - gtk_binding_entry_add_signal (binding_set, GDK_Q, GDK_CONTROL_MASK, "ctrl_q_pressed", 0); - gtk_binding_entry_add_signal (binding_set, GDK_Q, GDK_CONTROL_MASK, "ctrl_q_pressed", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_W, GDK_CONTROL_MASK, "ctrl_w_pressed", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_w, GDK_CONTROL_MASK, "ctrl_w_pressed", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Q, GDK_CONTROL_MASK, "ctrl_q_pressed", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Q, GDK_CONTROL_MASK, "ctrl_q_pressed", 0); }; |