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.

1 files changed, 9 insertions, 6 deletions

diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index c1f787d2f4..b55623a0ce 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -48,6 +48,9 @@
 
 #include <gconf/gconf-client.h>
 
+/* backward-compatibility cruft */
+#include "e-util/gtk-compat.h"
+
 #define d(x)
 
 #define EDITOR_GCONF_KEY_COMMAND "/apps/evolution/eplugin/external-editor/editor-command"
@@ -393,12 +396,12 @@ key_press_cb (GtkWidget * widget, GdkEventKey * event, EMsgComposer *composer)
 
 	/* we don't want to start the editor on any modifier keys */
 	switch (event->keyval) {
-	case GDK_Alt_L:
-	case GDK_Alt_R:
-	case GDK_Super_L:
-	case GDK_Super_R:
-	case GDK_Control_L:
-	case GDK_Control_R:
+	case GDK_KEY_Alt_L:
+	case GDK_KEY_Alt_R:
+	case GDK_KEY_Super_L:
+	case GDK_KEY_Super_R:
+	case GDK_KEY_Control_L:
+	case GDK_KEY_Control_R:
 		return FALSE;
 	default:
 		break;