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/addressbook | |
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 'modules/addressbook')
-rw-r--r-- | modules/addressbook/e-book-shell-view-private.c | 2 | ||||
-rw-r--r-- | modules/addressbook/e-book-shell-view-private.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/modules/addressbook/e-book-shell-view-private.c b/modules/addressbook/e-book-shell-view-private.c index 4639d18682..542c4e1178 100644 --- a/modules/addressbook/e-book-shell-view-private.c +++ b/modules/addressbook/e-book-shell-view-private.c @@ -373,7 +373,7 @@ book_shell_view_selector_key_press_event_cb (EShellView *shell_view, /* Needed for the ACTION() macro. */ shell_window = e_shell_view_get_shell_window (shell_view); - if (event->keyval == GDK_Delete) { + if (event->keyval == GDK_KEY_Delete) { gtk_action_activate (ACTION (ADDRESS_BOOK_DELETE)); return TRUE; } diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h index b719509b09..28ccae1359 100644 --- a/modules/addressbook/e-book-shell-view-private.h +++ b/modules/addressbook/e-book-shell-view-private.h @@ -56,6 +56,9 @@ #include "e-book-shell-sidebar.h" #include "e-book-shell-view-actions.h" +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + #define E_BOOK_SHELL_VIEW_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_BOOK_SHELL_VIEW, EBookShellViewPrivate)) |