GDK keys are now GDK_KEY_*

7 files changed, 13 insertions, 13 deletions

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index c2dbebba9..bdf2a6b68 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -3218,7 +3218,7 @@ empathy_call_window_key_press_cb (GtkWidget *video_output,
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (window);
 
-  if (priv->is_fullscreen && event->keyval == GDK_Escape)
+  if (priv->is_fullscreen && event->keyval == GDK_KEY_Escape)
     {
       /* Since we are in fullscreen mode, toggling will bring us back to
          normal mode. */
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 66c4e965f..70b5c3162 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -116,8 +116,8 @@ typedef struct {
 static GList *chat_windows = NULL;
 
 static const guint tab_accel_keys[] = {
-	GDK_1, GDK_2, GDK_3, GDK_4, GDK_5,
-	GDK_6, GDK_7, GDK_8, GDK_9, GDK_0
+	GDK_KEY_1, GDK_KEY_2, GDK_KEY_3, GDK_KEY_4, GDK_KEY_5,
+	GDK_KEY_6, GDK_KEY_7, GDK_KEY_8, GDK_KEY_9, GDK_KEY_0
 };
 
 typedef enum {
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index affb25974..ddebf233b 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -1328,8 +1328,8 @@ debug_window_key_press_event_cb (GtkWidget *widget,
     GdkEventKey *event,
     gpointer user_data)
 {
-  if ((event->state & GDK_CONTROL_MASK && event->keyval == GDK_w)
-      || event->keyval == GDK_Escape)
+  if ((event->state & GDK_CONTROL_MASK && event->keyval == GDK_KEY_w)
+      || event->keyval == GDK_KEY_Escape)
     {
       gtk_widget_destroy (widget);
       return TRUE;
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 6b9e5372c..126ad8795 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -927,8 +927,8 @@ ft_manager_key_press_event_cb (GtkWidget *widget,
                                GdkEventKey *event,
                                gpointer user_data)
 {
-  if ((event->state & GDK_CONTROL_MASK && event->keyval == GDK_w)
-      || event->keyval == GDK_Escape)
+  if ((event->state & GDK_CONTROL_MASK && event->keyval == GDK_KEY_w)
+      || event->keyval == GDK_KEY_Escape)
     {
       gtk_widget_destroy (widget);
       return TRUE;
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 9a336a3aa..976ce09c5 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -725,7 +725,7 @@ main_window_key_press_event_cb  (GtkWidget   *window,
 {
 	EmpathyChatManager *chat_manager;
 
-	if (event->keyval == GDK_T
+	if (event->keyval == GDK_KEY_T
 	    && event->state & GDK_SHIFT_MASK
 	    && event->state & GDK_CONTROL_MASK) {
 		chat_manager = empathy_chat_manager_dup_singleton ();
diff --git a/src/empathy-sidebar.c b/src/empathy-sidebar.c
index de6878055..776e0a81f 100644
--- a/src/empathy-sidebar.c
+++ b/src/empathy-sidebar.c
@@ -294,10 +294,10 @@ empathy_sidebar_select_button_key_press_cb (GtkWidget *widget,
 {
   EmpathySidebar *sidebar = EMPATHY_SIDEBAR (user_data);
 
-  if (event->keyval == GDK_space ||
-      event->keyval == GDK_KP_Space ||
-      event->keyval == GDK_Return ||
-      event->keyval == GDK_KP_Enter)
+  if (event->keyval == GDK_KEY_space ||
+      event->keyval == GDK_KEY_KP_Space ||
+      event->keyval == GDK_KEY_Return ||
+      event->keyval == GDK_KEY_KP_Enter)
     {
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
 
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 97ab255e6..a062f5169 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -466,7 +466,7 @@ status_icon_key_press_event_cb  (GtkWidget *window,
 				 GdkEventKey *event,
 				 EmpathyStatusIcon *icon)
 {
-	if (event->keyval == GDK_Escape) {
+	if (event->keyval == GDK_KEY_Escape) {
 		status_icon_set_visibility (icon, FALSE, TRUE);
 	}
 	return FALSE;