[xchat-gnome] Remove deprecated GTK+ symbols, courtesy of Pedro Fragoso <ember ubuntu com>

[Baptiste Mille-Mathias <baptistem src gnome org>]

commit acd952e2b99be4e100eb9bdd0e6463728135b69c
Author: Baptiste Mille-Mathias <baptiste millemathias gmail com>
Date:   Sun May 31 14:03:55 2009 +0200

    Remove deprecated GTK+ symbols, courtesy of Pedro Fragoso <ember ubuntu com>
---
 src/fe-gnome/main-window.c |    6 +++++-
 src/fe-gnome/xtext.c       |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/fe-gnome/main-window.c b/src/fe-gnome/main-window.c
index e0ee691..1f9303a 100644
--- a/src/fe-gnome/main-window.c
+++ b/src/fe-gnome/main-window.c
@@ -175,7 +175,11 @@ initialize_main_window (void)
 
 	close = glade_xml_get_widget (gui.xml, "close discussion");
 	action = gtk_action_group_get_action (gui.action_group, "DiscussionClose");
-	gtk_action_connect_proxy (action, close);
+#if GTK_CHECK_VERSION (2, 16, 0)
+    gtk_activatable_set_related_action (GTK_ACTIVATABLE (close), action);
+#else
+    gtk_action_connect_proxy (action, close);
+#endif
 
 #define GW(name) ((gui.name) = glade_xml_get_widget (gui.xml, #name))
 	GW(conversation_panel);
diff --git a/src/fe-gnome/xtext.c b/src/fe-gnome/xtext.c
index 2695785..d9b3576 100644
--- a/src/fe-gnome/xtext.c
+++ b/src/fe-gnome/xtext.c
@@ -3737,8 +3737,8 @@ gtk_xtext_load_trans (GtkXText * xtext)
 	PaintDesktop (hdc);
 	ReleaseDC (hwnd, hdc);
 
-	gdk_window_get_size (GTK_WIDGET (xtext)->window, &width, &height);
-	img = gdk_image_get (GTK_WIDGET (xtext)->window, 0, 0, width+128, height);
+	gdk_drawable_get_size (GTK_WIDGET (xtext)->window, &width, &height);
+	img = gdk_drawable_image_get (GTK_WIDGET (xtext)->window, 0, 0, width+128, height);
 	xtext->pixmap = win32_tint (xtext, img, img->width, img->height);
 
 #else