From afe6f502c326350cc31d34646d5000a964321525 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 17 Sep 2010 18:39:59 -0400 Subject: 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. --- addressbook/gui/contact-list-editor/e-contact-list-editor.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'addressbook/gui/contact-list-editor') diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index edd8f003b9..2ffee04b91 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -26,7 +26,6 @@ #include #include #include -#include #include "shell/e-shell.h" #include @@ -48,6 +47,9 @@ #include "e-contact-list-model.h" #include "eab-contact-merging.h" +/* backward-compatibility cruft */ +#include + #define E_CONTACT_LIST_EDITOR_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_CONTACT_LIST_EDITOR, EContactListEditorPrivate)) @@ -572,7 +574,7 @@ contact_list_editor_email_entry_key_press_event_cb (GtkWidget *widget, editor = contact_list_editor_extract (widget); - if (event->keyval == GDK_comma) { + if (event->keyval == GDK_KEY_comma) { GtkEntry *entry; gint cpos = -1; @@ -596,7 +598,7 @@ contact_list_editor_email_entry_key_press_event_cb (GtkWidget *widget, } } - if (can_comma || event->keyval == GDK_Return) { + if (can_comma || event->keyval == GDK_KEY_Return) { g_signal_emit_by_name (widget, "activate", 0); contact_list_editor_add_email (editor); @@ -827,7 +829,7 @@ contact_list_editor_tree_view_key_press_event_cb (GtkWidget *widget, editor = contact_list_editor_extract (widget); - if (event->keyval == GDK_Delete) { + if (event->keyval == GDK_KEY_Delete) { g_signal_emit_by_name (WIDGET (REMOVE_BUTTON), "clicked"); return TRUE; } -- cgit v1.2.3