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 /calendar/gui/dialogs | |
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 'calendar/gui/dialogs')
-rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 5 | ||||
-rw-r--r-- | calendar/gui/dialogs/event-page.c | 7 | ||||
-rw-r--r-- | calendar/gui/dialogs/task-page.c | 7 |
3 files changed, 14 insertions, 5 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 69cb2f2479..6c3179cf2c 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -59,6 +59,9 @@ #include "e-util/e-alert-dialog.h" #include "e-util/e-ui-manager.h" +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + #define COMP_EDITOR_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), TYPE_COMP_EDITOR, CompEditorPrivate)) @@ -1456,7 +1459,7 @@ comp_editor_key_press_event (GtkWidget *widget, editor = COMP_EDITOR (widget); - if (event->keyval == GDK_Escape) { + if (event->keyval == GDK_KEY_Escape) { commit_all_fields (editor); if (prompt_and_save_changes (editor, TRUE)) diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index e4e034fd16..bcbaf7cc3a 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -59,6 +59,9 @@ #include "event-page.h" #include "e-send-options-utils.h" +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + #define EVENT_PAGE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), TYPE_EVENT_PAGE, EventPagePrivate)) @@ -1996,12 +1999,12 @@ list_view_event (EMeetingListView *list_view, GdkEvent *event, EventPage *epage) static gboolean list_key_press (EMeetingListView *list_view, GdkEventKey *event, EventPage *epage) { - if (event->keyval == GDK_Delete) { + if (event->keyval == GDK_KEY_Delete) { remove_clicked_cb (NULL, epage); return TRUE; - } else if (event->keyval == GDK_Insert) { + } else if (event->keyval == GDK_KEY_Insert) { add_clicked_cb (NULL, epage); return TRUE; diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 7777f23dd0..0596d0d12c 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -55,6 +55,9 @@ #include "../e-meeting-store.h" #include "../e-meeting-list-view.h" +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + #define TASK_PAGE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), TYPE_TASK_PAGE, TaskPagePrivate)) @@ -1288,12 +1291,12 @@ list_view_event (EMeetingListView *list_view, GdkEvent *event, TaskPage *page) { static gboolean list_key_press (EMeetingListView *list_view, GdkEventKey *event, TaskPage *page) { - if (event->keyval == GDK_Delete) { + if (event->keyval == GDK_KEY_Delete) { remove_clicked_cb (NULL, page); return TRUE; - } else if (event->keyval == GDK_Insert) { + } else if (event->keyval == GDK_KEY_Insert) { add_clicked_cb (NULL, page); return TRUE; |