[empathy] fix gtk build issues
Matthias Clasen
mclasen at fedoraproject.org
Thu Sep 23 01:32:08 UTC 2010
commit f651a710dbfbaf35f2c9e6e42acc7af3f46eb168
Author: Matthias Clasen <mclasen at redhat.com>
Date: Wed Sep 22 21:30:03 2010 -0400
fix gtk build issues
Dont-use-deprecated-gtkdialogsethasseparator.patch | 208 ++++++++++++++++++++
...y-avatar-image-dont-use-gdkdisplay-global.patch | 32 +++
empathy-chat-update-GDK-defines-to-GDKKEY.patch | 75 +++++++
empathy.spec | 10 +
more-keyname-fixes.patch | 203 +++++++++++++++++++
5 files changed, 528 insertions(+), 0 deletions(-)
---
diff --git a/Dont-use-deprecated-gtkdialogsethasseparator.patch b/Dont-use-deprecated-gtkdialogsethasseparator.patch
new file mode 100644
index 0000000..4eaf27f
--- /dev/null
+++ b/Dont-use-deprecated-gtkdialogsethasseparator.patch
@@ -0,0 +1,208 @@
+From e3b0caf863c1214e4d6a477a42f30ea1edccdb02 Mon Sep 17 00:00:00 2001
+From: Diego Escalante Urrelo <descalante at igalia.com>
+Date: Sun, 19 Sep 2010 18:08:00 -0500
+Subject: [PATCH] Don't use deprecated gtk_dialog_set_has_separator
+
+This is deprecated in GTK+ 2.22
+
+Bug #630107
+---
+ libempathy-gtk/empathy-contact-dialogs.c | 4 ----
+ libempathy-gtk/empathy-contact-selector-dialog.c | 2 --
+ libempathy-gtk/empathy-individual-dialogs.c | 1 -
+ libempathy-gtk/empathy-individual-edit-dialog.c | 1 -
+ .../empathy-individual-information-dialog.c | 1 -
+ libempathy-gtk/empathy-linking-dialog.c | 1 -
+ libempathy-gtk/empathy-status-preset-dialog.c | 1 -
+ libempathy-gtk/empathy-ui-utils.h | 16 ----------------
+ src/empathy-accounts-dialog.c | 5 -----
+ src/empathy-import-dialog.c | 5 -----
+ src/empathy-preferences.c | 5 -----
+ 11 files changed, 0 insertions(+), 42 deletions(-)
+
+diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
+index 6da1810..9189d41 100644
+--- a/libempathy-gtk/empathy-contact-dialogs.c
++++ b/libempathy-gtk/empathy-contact-dialogs.c
+@@ -178,7 +178,6 @@ empathy_contact_information_dialog_show (EmpathyContact *contact,
+
+ /* Create dialog */
+ dialog = gtk_dialog_new ();
+- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+ gtk_window_set_title (GTK_WINDOW (dialog),
+ empathy_contact_get_alias (contact));
+@@ -238,7 +237,6 @@ empathy_contact_edit_dialog_show (EmpathyContact *contact,
+
+ /* Create dialog */
+ dialog = gtk_dialog_new ();
+- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Contact Information"));
+
+@@ -290,7 +288,6 @@ empathy_contact_personal_dialog_show (GtkWindow *parent)
+
+ /* Create dialog */
+ personal_dialog = gtk_dialog_new ();
+- empathy_dialog_remove_separator (GTK_DIALOG (personal_dialog));
+ gtk_window_set_resizable (GTK_WINDOW (personal_dialog), FALSE);
+ gtk_window_set_title (GTK_WINDOW (personal_dialog), _("Personal Information"));
+
+@@ -396,7 +393,6 @@ empathy_new_contact_dialog_show_with_contact (GtkWindow *parent,
+
+ /* Create dialog */
+ dialog = gtk_dialog_new ();
+- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+ gtk_window_set_title (GTK_WINDOW (dialog), _("New Contact"));
+
+diff --git a/libempathy-gtk/empathy-contact-selector-dialog.c b/libempathy-gtk/empathy-contact-selector-dialog.c
+index 7989e9c..62b9027 100644
+--- a/libempathy-gtk/empathy-contact-selector-dialog.c
++++ b/libempathy-gtk/empathy-contact-selector-dialog.c
+@@ -316,8 +316,6 @@ empathy_contact_selector_dialog_init (EmpathyContactSelectorDialog *dialog)
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+
+ /* Tweak the dialog */
+- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
+-
+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT);
+ gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
+diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
+index 5568281..edfb3fd 100644
+--- a/libempathy-gtk/empathy-individual-dialogs.c
++++ b/libempathy-gtk/empathy-individual-dialogs.c
+@@ -107,7 +107,6 @@ empathy_new_individual_dialog_show_with_individual (GtkWindow *parent,
+
+ /* Create dialog */
+ dialog = gtk_dialog_new ();
+- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+ gtk_window_set_title (GTK_WINDOW (dialog), _("New Contact"));
+
+diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c
+index 30ca1cc..b49e29f 100644
+--- a/libempathy-gtk/empathy-individual-edit-dialog.c
++++ b/libempathy-gtk/empathy-individual-edit-dialog.c
+@@ -243,7 +243,6 @@ empathy_individual_edit_dialog_init (
+ dialog->priv = priv;
+ priv->individual = NULL;
+
+- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Contact Information"));
+
+diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c
+index e6d4a90..bb52e7d 100644
+--- a/libempathy-gtk/empathy-individual-information-dialog.c
++++ b/libempathy-gtk/empathy-individual-information-dialog.c
+@@ -273,7 +273,6 @@ empathy_individual_information_dialog_init (
+ dialog->priv = priv;
+ priv->individual = NULL;
+
+- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
+ gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
+
+ content_area = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
+diff --git a/libempathy-gtk/empathy-linking-dialog.c b/libempathy-gtk/empathy-linking-dialog.c
+index 2e62e5d..d0a0910 100644
+--- a/libempathy-gtk/empathy-linking-dialog.c
++++ b/libempathy-gtk/empathy-linking-dialog.c
+@@ -108,7 +108,6 @@ empathy_linking_dialog_init (EmpathyLinkingDialog *self)
+ dialog = GTK_DIALOG (self);
+
+ /* Set up dialog */
+- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
+ gtk_window_set_resizable (GTK_WINDOW (self), TRUE);
+ /* Translators: this is the title of the linking dialogue (reached by
+ * right-clicking on a contact and selecting "Link…"). "Link" in this title
+diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c
+index 2a5904b..2d7ecfe 100644
+--- a/libempathy-gtk/empathy-status-preset-dialog.c
++++ b/libempathy-gtk/empathy-status-preset-dialog.c
+@@ -521,7 +521,6 @@ empathy_status_preset_dialog_init (EmpathyStatusPresetDialog *self)
+
+ gtk_window_set_title (GTK_WINDOW (self),
+ _("Edit Custom Messages"));
+- empathy_dialog_remove_separator (GTK_DIALOG (self));
+ gtk_dialog_add_button (GTK_DIALOG (self),
+ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+
+diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
+index 43da188..0b76d09 100644
+--- a/libempathy-gtk/empathy-ui-utils.h
++++ b/libempathy-gtk/empathy-ui-utils.h
+@@ -129,22 +129,6 @@ void empathy_window_iconify (GtkWindow *windo
+ GtkStatusIcon *status_icon);
+ GtkWindow * empathy_get_toplevel_window (GtkWidget *widget);
+
+-/**
+- * empathy_dialog_remove_separator:
+- * @d: a #GtkDialog
+- *
+- * Replacement for gtk_dialog_set_has_separator(), which was removed for GTK+ 3.
+- * This is a no-op for GTK+ 3, and expands to a call to
+- * gtk_dialog_set_has_separator() with %FALSE for GTK+ 2.
+- *
+- * FIXME: Once we depend on GTK+ 3 unconditionally, this macro can be removed.
+- */
+-#ifndef HAVE_GTK3
+-#define empathy_dialog_remove_separator(d) gtk_dialog_set_has_separator(d, FALSE);
+-#else
+-#define empathy_dialog_remove_separator(d)
+-#endif
+-
+ /* URL */
+ gchar * empathy_make_absolute_url (const gchar *url);
+
+diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
+index 98301a4..35bea08 100644
+--- a/src/empathy-accounts-dialog.c
++++ b/src/empathy-accounts-dialog.c
+@@ -2161,11 +2161,6 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
+
+ gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
+
+- /* FIXME: Remove this once we unconditionally depend on GTK+ 3 */
+-#ifndef HAVE_GTK3
+- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+-#endif
+-
+ /* add dialog buttons */
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_END);
+
+diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
+index 1fc00c0..da0c9d3 100644
+--- a/src/empathy-import-dialog.c
++++ b/src/empathy-import-dialog.c
+@@ -198,11 +198,6 @@ empathy_import_dialog_init (EmpathyImportDialog *self)
+ gtk_container_set_border_width (GTK_CONTAINER (self), 5);
+ gtk_window_set_title (GTK_WINDOW (self), _("Import Accounts"));
+ gtk_window_set_modal (GTK_WINDOW (self), TRUE);
+-
+- /* FIXME: Remove this once we unconditionally depend on GTK+ 3 */
+-#ifndef HAVE_GTK3
+- gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
+-#endif
+ }
+
+ static void
+diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
+index edc4059..89133ed 100644
+--- a/src/empathy-preferences.c
++++ b/src/empathy-preferences.c
+@@ -885,11 +885,6 @@ empathy_preferences_init (EmpathyPreferences *preferences)
+ GTK_WIN_POS_CENTER_ON_PARENT);
+ gtk_window_set_icon_name (GTK_WINDOW (preferences), "gtk-preferences");
+
+- /* FIXME: Remove this once we unconditionally depend on GTK+ 3 */
+-#ifndef HAVE_GTK3
+- gtk_dialog_set_has_separator (GTK_DIALOG (preferences), FALSE);
+-#endif
+-
+ filename = empathy_file_lookup ("empathy-preferences.ui", "src");
+ gui = empathy_builder_get_file (filename,
+ "notebook", &priv->notebook,
+--
+1.7.1
\ No newline at end of file
diff --git a/empathy-avatar-image-dont-use-gdkdisplay-global.patch b/empathy-avatar-image-dont-use-gdkdisplay-global.patch
new file mode 100644
index 0000000..50b0120
--- /dev/null
+++ b/empathy-avatar-image-dont-use-gdkdisplay-global.patch
@@ -0,0 +1,32 @@
+From 1b45e098798485cadba9c943cb2e64587564b374 Mon Sep 17 00:00:00 2001
+From: Diego Escalante Urrelo <descalante at igalia.com>
+Date: Sun, 19 Sep 2010 18:06:27 -0500
+Subject: [PATCH] empathy-avatar-image: don't use gdk_display global
+
+This is deprecated for GTK+ 2.22.
+
+Bug #630107
+---
+ libempathy-gtk/empathy-avatar-image.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
+index cfc73b7..c74557f 100644
+--- a/libempathy-gtk/empathy-avatar-image.c
++++ b/libempathy-gtk/empathy-avatar-image.c
+@@ -160,11 +160,11 @@ avatar_image_add_filter (EmpathyAvatarImage *avatar_image)
+ gdk_error_trap_push ();
+ if (gdkwindow) {
+ XWindowAttributes attrs;
+- XGetWindowAttributes (gdk_display, window, &attrs);
++ XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), window, &attrs);
+ mask |= attrs.your_event_mask;
+ }
+
+- XSelectInput (gdk_display, window, mask);
++ XSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), window, mask);
+
+ gdk_error_trap_pop ();
+
+--
+1.7.1
\ No newline at end of file
diff --git a/empathy-chat-update-GDK-defines-to-GDKKEY.patch b/empathy-chat-update-GDK-defines-to-GDKKEY.patch
new file mode 100644
index 0000000..5d306e3
--- /dev/null
+++ b/empathy-chat-update-GDK-defines-to-GDKKEY.patch
@@ -0,0 +1,75 @@
+From ad621e40f62b17afa69dc085d849653c4b34aeda Mon Sep 17 00:00:00 2001
+From: Diego Escalante Urrelo <descalante at igalia.com>
+Date: Sun, 19 Sep 2010 18:10:20 -0500
+Subject: [PATCH] empathy-chat: update GDK_ defines to GDK_KEY_
+
+This change works in both GTK+ 2.22 and GTK+ 3.0
+
+Bug #630107
+---
+ libempathy-gtk/empathy-chat.c | 16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
+index 1669448..c14e315 100644
+--- a/libempathy-gtk/empathy-chat.c
++++ b/libempathy-gtk/empathy-chat.c
+@@ -59,7 +59,7 @@
+
+ #define CHAT_DIR_CREATE_MODE (S_IRUSR | S_IWUSR | S_IXUSR)
+ #define CHAT_FILE_CREATE_MODE (S_IRUSR | S_IWUSR)
+-#define IS_ENTER(v) (v == GDK_Return || v == GDK_ISO_Enter || v == GDK_KP_Enter)
++#define IS_ENTER(v) (v == GDK_KEY_Return || v == GDK_KEY_ISO_Enter || v == GDK_KEY_KP_Enter)
+ #define MAX_INPUT_HEIGHT 150
+ #define COMPOSING_STOP_TIMEOUT 5
+
+@@ -1483,15 +1483,15 @@ chat_input_key_press_event_cb (GtkWidget *widget,
+
+ /* Catch ctrl+up/down so we can traverse messages we sent */
+ if ((event->state & GDK_CONTROL_MASK) &&
+- (event->keyval == GDK_Up ||
+- event->keyval == GDK_Down)) {
++ (event->keyval == GDK_KEY_Up ||
++ event->keyval == GDK_KEY_Down)) {
+ GtkTextBuffer *buffer;
+ const gchar *str;
+
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (chat->input_text_view));
+ chat_input_history_update (chat, buffer);
+
+- if (event->keyval == GDK_Up) {
++ if (event->keyval == GDK_KEY_Up) {
+ str = chat_input_history_get_next (chat);
+ } else {
+ str = chat_input_history_get_prev (chat);
+@@ -1537,24 +1537,24 @@ chat_input_key_press_event_cb (GtkWidget *widget,
+ return FALSE;
+ }
+ if (!(event->state & GDK_CONTROL_MASK) &&
+- event->keyval == GDK_Page_Up) {
++ event->keyval == GDK_KEY_Page_Up) {
+ adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (text_view_sw));
+ gtk_adjustment_set_value (adj, gtk_adjustment_get_value (adj) - gtk_adjustment_get_page_size (adj));
+ return TRUE;
+ }
+ if ((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK &&
+- event->keyval == GDK_Page_Down) {
++ event->keyval == GDK_KEY_Page_Down) {
+ adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (text_view_sw));
+ val = MIN (gtk_adjustment_get_value (adj) + gtk_adjustment_get_page_size (adj),
+ gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj));
+ gtk_adjustment_set_value (adj, val);
+ return TRUE;
+ }
+- if (event->keyval == GDK_Escape) {
++ if (event->keyval == GDK_KEY_Escape) {
+ empathy_search_bar_hide (EMPATHY_SEARCH_BAR (priv->search_bar));
+ }
+ if (!(event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) &&
+- event->keyval == GDK_Tab) {
++ event->keyval == GDK_KEY_Tab) {
+ GtkTextBuffer *buffer;
+ GtkTextIter start, current;
+ gchar *nick, *completed;
+--
+1.7.1
\ No newline at end of file
diff --git a/empathy.spec b/empathy.spec
index a081167..b72de83 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -70,6 +70,11 @@ Provides: %{name}-libs = %{version}-%{release}
Obsoletes: %{name}-python < 2.29.2-1
Provides: %{name}-python = %{version}-%{release}
+Patch0: empathy-avatar-image-dont-use-gdkdisplay-global.patch
+Patch1: Dont-use-deprecated-gtkdialogsethasseparator.patch
+Patch2: empathy-chat-update-GDK-defines-to-GDKKEY.patch
+Patch3: more-keyname-fixes.patch
+
%description
Empathy is powerful multi-protocol instant messaging client which
supports Jabber, GTalk, MSN, IRC, Salut, and other protocols.
@@ -78,6 +83,11 @@ It is built on top of the Telepathy framework.
%prep
%setup -q
+%patch0 -p1 -b .gdkdisplay
+%patch1 -p1 -b .separator
+%patch2 -p1 -b .gdkkey
+%patch3 -p1 -b .more-gdkkey
+
# force this to be regenerated
rm data/empathy.desktop
diff --git a/more-keyname-fixes.patch b/more-keyname-fixes.patch
new file mode 100644
index 0000000..8f80e7c
--- /dev/null
+++ b/more-keyname-fixes.patch
@@ -0,0 +1,203 @@
+--- empathy-2.31.92/libempathy-gtk/empathy-contact-list-view.c 2010-09-01 06:01:33.000000000 -0400
++++ hacked/libempathy-gtk/empathy-contact-list-view.c 2010-09-22 20:32:23.067998000 -0400
+@@ -856,7 +856,7 @@
+ 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 @@
+ 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);
+--- empathy-2.31.92/libempathy-gtk/empathy-individual-view.c 2010-09-06 03:08:37.000000000 -0400
++++ hacked/libempathy-gtk/empathy-individual-view.c 2010-09-22 20:34:12.573998001 -0400
+@@ -882,7 +882,7 @@
+ GdkEventKey *event,
+ gpointer user_data)
+ {
+- if (event->keyval == GDK_Menu)
++ if (event->keyval == GDK_KEY_Menu)
+ {
+ MenuPopupData *data;
+
+@@ -1314,7 +1314,7 @@
+ 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;
+
+--- empathy-2.31.92/libempathy-gtk/empathy-live-search.c 2010-09-01 06:01:33.000000000 -0400
++++ hacked/libempathy-gtk/empathy-live-search.c 2010-09-22 20:33:20.443998001 -0400
+@@ -255,15 +255,15 @@
+ 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 @@
+ /* 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 */
+--- empathy-2.31.92/libempathy-gtk/empathy-presence-chooser.c 2010-09-01 06:01:33.000000000 -0400
++++ hacked/libempathy-gtk/empathy-presence-chooser.c 2010-09-22 20:34:57.893998000 -0400
+@@ -525,12 +525,12 @@
+ {
+ 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;
+ }
+--- empathy-2.31.92/libempathy-gtk/empathy-search-bar.c 2010-09-14 05:17:19.000000000 -0400
++++ hacked/libempathy-gtk/empathy-search-bar.c 2010-09-22 20:35:11.094998004 -0400
+@@ -230,7 +230,7 @@
+ 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;
+--- empathy-2.31.92/src/empathy-call-window.c 2010-09-08 04:22:33.000000000 -0400
++++ hacked/src/empathy-call-window.c 2010-09-22 21:17:58.827998000 -0400
+@@ -3196,7 +3196,7 @@
+ {
+ 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. */
+--- empathy-2.31.92/src/empathy-chat-window.c 2010-09-01 06:01:33.000000000 -0400
++++ hacked/src/empathy-chat-window.c 2010-09-22 20:36:29.687998016 -0400
+@@ -116,8 +116,8 @@
+ 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 {
+--- empathy-2.31.92/src/empathy-debug-window.c 2010-09-01 06:01:33.000000000 -0400
++++ hacked/src/empathy-debug-window.c 2010-09-22 20:38:03.893998001 -0400
+@@ -1328,8 +1328,8 @@
+ 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;
+--- empathy-2.31.92/src/empathy-ft-manager.c 2010-09-01 06:01:33.000000000 -0400
++++ hacked/src/empathy-ft-manager.c 2010-09-22 20:36:55.767998000 -0400
+@@ -927,8 +927,8 @@
+ 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;
+--- empathy-2.31.92/src/empathy-main-window.c 2010-09-13 10:56:44.000000000 -0400
++++ hacked/src/empathy-main-window.c 2010-09-22 20:37:17.697998000 -0400
+@@ -725,7 +725,7 @@
+ {
+ 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 ();
+--- empathy-2.31.92/src/empathy-sidebar.c 2010-09-01 06:01:33.000000000 -0400
++++ hacked/src/empathy-sidebar.c 2010-09-22 21:18:24.442997998 -0400
+@@ -296,10 +296,10 @@
+ {
+ 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);
+
+--- empathy-2.31.92/src/empathy-status-icon.c 2010-09-01 06:01:33.000000000 -0400
++++ hacked/src/empathy-status-icon.c 2010-09-22 20:37:32.417998002 -0400
+@@ -466,7 +466,7 @@
+ GdkEventKey *event,
+ EmpathyStatusIcon *icon)
+ {
+- if (event->keyval == GDK_Escape) {
++ if (event->keyval == GDK_KEY_Escape) {
+ status_icon_set_visibility (icon, FALSE, TRUE);
+ }
+ return FALSE;
More information about the scm-commits
mailing list