From ddb3bf05d86a69b9370949c00f551bc15f39b54b Mon Sep 17 00:00:00 2001
From: TingPing <tingping@tingping.se>
Date: Sun, 15 Sep 2013 03:21:56 -0400
Subject: [PATCH] use GDK_KEY

---
 src/fe-gtk/fkeys.c       | 6 +++---
 src/fe-gtk/gtkutil.c     | 2 +-
 src/fe-gtk/rawlog.c      | 2 +-
 src/fe-gtk/servlistgui.c | 8 ++++----
 src/fe-gtk/userlistgui.c | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c
index ba9599e1..4be2082e 100644
--- a/src/fe-gtk/fkeys.c
+++ b/src/fe-gtk/fkeys.c
@@ -297,14 +297,14 @@ key_handle_key_press (GtkWidget *wid, GdkEventKey *evt, session *sess)
 
 	switch (keyval)
 	{
-	case GDK_space:
+	case GDK_KEY_space:
 		key_action_tab_clean ();
 		break;
 
 #if defined(USE_GTKSPELL)/* && !defined(WIN32) */
 	/* gtktextview has no 'activate' event, so we trap ENTER here */
-	case GDK_Return:
-	case GDK_KP_Enter:
+	case GDK_KEY_Return:
+	case GDK_KEY_KP_Enter:
 		if (!(evt->state & STATE_CTRL))
 		{
 			g_signal_stop_emission_by_name (G_OBJECT (wid), "key_press_event");
diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c
index 985a2f78..f6b9ad53 100644
--- a/src/fe-gtk/gtkutil.c
+++ b/src/fe-gtk/gtkutil.c
@@ -264,7 +264,7 @@ gtkutil_esc_destroy (GtkWidget * win, GdkEventKey * key, gpointer userdata)
 	else
 		wid = win;
 
-	if (key->keyval == GDK_Escape)
+	if (key->keyval == GDK_KEY_Escape)
 		gtk_widget_destroy (wid);
 			
 	return FALSE;
diff --git a/src/fe-gtk/rawlog.c b/src/fe-gtk/rawlog.c
index 736013c9..7dfb38ba 100644
--- a/src/fe-gtk/rawlog.c
+++ b/src/fe-gtk/rawlog.c
@@ -88,7 +88,7 @@ rawlog_key_cb (GtkWidget * wid, GdkEventKey * key, gpointer userdata)
 	 * but make sure not to copy twice, i.e. when auto-copy is enabled.
 	 */
 	if (!prefs.hex_text_autocopy_text &&
-		(key->keyval == GDK_c || key->keyval == GDK_C) &&
+		(key->keyval == GDK_KEY_c || key->keyval == GDK_KEY_C) &&
 		key->state & STATE_SHIFT &&
 		key->state & STATE_CTRL)
 	{
diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c
index ef5b57cd..e1292259 100644
--- a/src/fe-gtk/servlistgui.c
+++ b/src/fe-gtk/servlistgui.c
@@ -587,12 +587,12 @@ servlist_net_keypress_cb (GtkWidget *wid, GdkEventKey *evt, gpointer tree)
 
 	if (evt->state & STATE_SHIFT)
 	{
-		if (evt->keyval == GDK_Up)
+		if (evt->keyval == GDK_KEY_Up)
 		{
 			handled = TRUE;
 			network_list = servlist_move_item (GTK_TREE_VIEW (tree), network_list, selected_net, -1);
 		}
-		else if (evt->keyval == GDK_Down)
+		else if (evt->keyval == GDK_KEY_Down)
 		{
 			handled = TRUE;
 			network_list = servlist_move_item (GTK_TREE_VIEW (tree), network_list, selected_net, +1);
@@ -1030,12 +1030,12 @@ servlist_keypress_cb (GtkWidget *wid, GdkEventKey *evt, GtkNotebook *notebook)
 
 	if (evt->state & STATE_SHIFT)
 	{
-		if (evt->keyval == GDK_Up)
+		if (evt->keyval == GDK_KEY_Up)
 		{
 			handled = TRUE;
 			delta = -1;
 		}
-		else if (evt->keyval == GDK_Down)
+		else if (evt->keyval == GDK_KEY_Down)
 		{
 			handled = TRUE;
 			delta = +1;
diff --git a/src/fe-gtk/userlistgui.c b/src/fe-gtk/userlistgui.c
index 530d213f..eca97e6b 100644
--- a/src/fe-gtk/userlistgui.c
+++ b/src/fe-gtk/userlistgui.c
@@ -579,7 +579,7 @@ userlist_click_cb (GtkWidget *widget, GdkEventButton *event, gpointer userdata)
 static gboolean
 userlist_key_cb (GtkWidget *wid, GdkEventKey *evt, gpointer userdata)
 {
-	if (evt->keyval >= GDK_asterisk && evt->keyval <= GDK_z)
+	if (evt->keyval >= GDK_KEY_asterisk && evt->keyval <= GDK_KEY_z)
 	{
 		/* dirty trick to avoid auto-selection */
 		SPELL_ENTRY_SET_EDITABLE (current_sess->gui->input_box, FALSE);