GDK keys are now GDK_KEY_*

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index ce586420e0c1c917dc1f03614bc557bf480e396a..f7a946a7147b50f7e306c33ce723a35c5882a1f1 100644 (file)
--- 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 90793031141a9e69d9a6f6dd214028ffe3e17234..ee0e06c65bf23b3ebc282b9a009463ced15bdcbd 100644 (file)
--- 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 d058b5751cf4d83c0fdc234303a3536eb12441be..a607939f3224c1bfa0a35fd1f33c563af1aba4bc 100644 (file)
--- 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 cd9b4559c67d73cec0a2bbb9392c722c6325173e..8258688e247ade51c1d6075ab19a72f9697e6db1 100644 (file)
--- 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 2116d598ac4fe54fef5a5f046bd59043a58b7ecc..bd97c2dac627363ed3a25fa01278614d68f94487 100644 (file)
--- 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;

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index c2dbebba97a84bc27dca68dd4435f9545a544e1f..bdf2a6b68553113f7f45394d197bff27eee2b566 100644 (file)
--- 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 66c4e965f32d5d7bcd64429954036b5f2c5c5c4b..70b5c3162c28867a83112cd4d8e837d6764a486b 100644 (file)
--- 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 affb25974f4bf91615cabc77fe2a36e7c8c6a8fa..ddebf233bd2ffab44385d7eb80feeefc0ed4078b 100644 (file)
--- 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 6b9e5372c31b09056b1f7bcc97735be7740c4144..126ad879522c3ccbb2f46931a8ddd344a876c119 100644 (file)
--- 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 9a336a3aa45159062cb49d2dd4db77e3383097c6..976ce09c5e5d43393b7bed87ee44d81a44178e77 100644 (file)
--- 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 de68780552667f7eb44d74c3949e2b0efaf447d4..776e0a81ff97774912f733e6ebfe64c670fdbe50 100644 (file)
--- 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 97ab255e66b2f7267d0ae85345b4c2cef2dca038..a062f51692bfa0a87886150731c4a4418f75f74f 100644 (file)
--- 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;