GDK keys are now GDK_KEY_*

5 files changed, 14 insertions, 14 deletions

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index ce586420e..f7a946a71 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -856,7 +856,7 @@ contact_list_view_key_press_event_cb (EmpathyContactListView *view,
 				      GdkEventKey	     *event,
 				      gpointer		      user_data)
 {
-	if (event->keyval == GDK_Menu) {
+	if (event->keyval == GDK_KEY_Menu) {
 		MenuPopupData *data;
 
 		data = g_slice_new (MenuPopupData);
@@ -1282,7 +1282,7 @@ contact_list_view_search_key_navigation_cb (GtkWidget *search,
 	GdkEventKey *eventkey = ((GdkEventKey *) event);
 	gboolean ret = FALSE;
 
-	if (eventkey->keyval == GDK_Up || eventkey->keyval == GDK_Down) {
+	if (eventkey->keyval == GDK_KEY_Up || eventkey->keyval == GDK_KEY_Down) {
 		GdkEvent *new_event;
 
 		new_event = gdk_event_copy (event);
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 907930311..ee0e06c65 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -882,7 +882,7 @@ individual_view_key_press_event_cb (EmpathyIndividualView *view,
     GdkEventKey *event,
     gpointer user_data)
 {
-  if (event->keyval == GDK_Menu)
+  if (event->keyval == GDK_KEY_Menu)
     {
       MenuPopupData *data;
 
@@ -1314,7 +1314,7 @@ individual_view_search_key_navigation_cb (GtkWidget *search,
   GdkEventKey *eventkey = ((GdkEventKey *) event);
   gboolean ret = FALSE;
 
-  if (eventkey->keyval == GDK_Up || eventkey->keyval == GDK_Down)
+  if (eventkey->keyval == GDK_KEY_Up || eventkey->keyval == GDK_KEY_Down)
     {
       GdkEvent *new_event;
 
diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
index d058b5751..a607939f3 100644
--- a/libempathy-gtk/empathy-live-search.c
+++ b/libempathy-gtk/empathy-live-search.c
@@ -255,15 +255,15 @@ live_search_entry_key_pressed_cb (GtkEntry *entry,
   gboolean ret;
 
   /* if esc key pressed, hide the search */
-  if (event->keyval == GDK_Escape)
+  if (event->keyval == GDK_KEY_Escape)
     {
       gtk_widget_hide (GTK_WIDGET (self));
       return TRUE;
     }
 
   /* emit key navigation signal, so other widgets can respond to it properly */
-  if (event->keyval == GDK_Up || event->keyval == GDK_Down
-      || event->keyval == GDK_Left || event->keyval == GDK_Right)
+  if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down
+      || event->keyval == GDK_KEY_Left || event->keyval == GDK_KEY_Right)
      {
        g_signal_emit (self, signals[KEYNAV], 0, event, &ret);
        return ret;
@@ -319,20 +319,20 @@ live_search_key_press_event_cb (GtkWidget *widget,
   /* dont forward this event to the entry, else the event is consumed by the
    * entry and does not close the window */
   if (!gtk_widget_get_visible (GTK_WIDGET (self)) &&
-      event->keyval == GDK_Escape)
+      event->keyval == GDK_KEY_Escape)
     return FALSE;
 
   /* do not show the search if CTRL and/or ALT are pressed with a key
    * this is needed, because otherwise the CTRL + F accel would not work,
    * because the entry consumes it */
   if (event->state & (GDK_MOD1_MASK | GDK_CONTROL_MASK) ||
-      event->keyval == GDK_Control_L ||
-      event->keyval == GDK_Control_R)
+      event->keyval == GDK_KEY_Control_L ||
+      event->keyval == GDK_KEY_Control_R)
     return FALSE;
 
   /* dont forward the up and down arrow keys to the entry, they are needed for
    * navigation in the treeview and are not needed in the search entry */
-   if (event->keyval == GDK_Up || event->keyval == GDK_Down)
+   if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down)
      return FALSE;
 
   /* realize the widget if it is not realized yet */
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index cd9b4559c..8258688e2 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -525,12 +525,12 @@ presence_chooser_entry_key_press_event_cb (EmpathyPresenceChooser *self,
 {
 	EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
 
-	if (priv->editing_status && event->keyval == GDK_Escape) {
+	if (priv->editing_status && event->keyval == GDK_KEY_Escape) {
 		/* the user pressed Escape, undo the editing */
 		presence_chooser_reset_status (self);
 		return TRUE;
 	}
-	else if (event->keyval == GDK_Up || event->keyval == GDK_Down) {
+	else if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down) {
 		/* ignore */
 		return TRUE;
 	}
diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c
index 2116d598a..bd97c2dac 100644
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -230,7 +230,7 @@ empathy_search_bar_key_pressed (GtkWidget   *widget,
     GdkEventKey *event,
     gpointer user_data)
 {
-  if (event->keyval == GDK_Escape)
+  if (event->keyval == GDK_KEY_Escape)
     {
       empathy_search_bar_hide (EMPATHY_SEARCH_BAR (widget));
       return TRUE;