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 /addressbook/gui/widgets/e-minicard.c | |
| 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 'addressbook/gui/widgets/e-minicard.c')
| -rw-r--r-- | addressbook/gui/widgets/e-minicard.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index e5b5fa8310..5c2da9de01 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -40,6 +40,9 @@ #include <libebook/e-destination.h> #include "ea-addressbook.h" +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + static void e_minicard_init (EMinicard *card); static void e_minicard_class_init (EMinicardClass *class); static void e_minicard_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); @@ -637,9 +640,9 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) } break; case GDK_KEY_PRESS: - if (event->key.keyval == GDK_Tab || - event->key.keyval == GDK_KP_Tab || - event->key.keyval == GDK_ISO_Left_Tab) { + if (event->key.keyval == GDK_KEY_Tab || + event->key.keyval == GDK_KEY_KP_Tab || + event->key.keyval == GDK_KEY_ISO_Left_Tab) { EMinicardView *view = E_MINICARD_VIEW (item->parent); EReflow *reflow = E_REFLOW (view); @@ -701,8 +704,8 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) } } } - else if (event->key.keyval == GDK_Return || - event->key.keyval == GDK_KP_Enter) { + else if (event->key.keyval == GDK_KEY_Return || + event->key.keyval == GDK_KEY_KP_Enter) { e_minicard_activate_editor (e_minicard); return TRUE; } |