# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1291417438 0
# Node ID 26ed3696476973c1ef685e8d372a3d9c6654b5a1
# Parent  eb08747bfffdca0f192988d569d974ce69125f29
updates to work with the latest GTK+

diff -r eb08747bfffd -r 26ed36964769 configure.ac
--- a/configure.ac	Thu Dec 02 12:11:26 2010 +0000
+++ b/configure.ac	Fri Dec 03 23:03:58 2010 +0000
@@ -416,7 +416,7 @@
 fi
 
 if test "x$enable_gtkui" = "xyes" ; then
-	PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 2.91.5], , [
+	PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 2.91.6], , [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR([
 
diff -r eb08747bfffd -r 26ed36964769 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Thu Dec 02 12:11:26 2010 +0000
+++ b/pidgin/gtkblist.c	Fri Dec 03 23:03:58 2010 +0000
@@ -6149,7 +6149,7 @@
 
 	gtk_widget_show(gtkblist->treeview);
 	gtk_widget_set_name(gtkblist->treeview, "pidgin_blist_treeview");
-
+	
 	g_signal_connect(gtkblist->treeview,
 			 "style-set",
 			 G_CALLBACK(treeview_style_set), list);
diff -r eb08747bfffd -r 26ed36964769 pidgin/gtkmedia.c
--- a/pidgin/gtkmedia.c	Thu Dec 02 12:11:26 2010 +0000
+++ b/pidgin/gtkmedia.c	Fri Dec 03 23:03:58 2010 +0000
@@ -442,9 +442,9 @@
 		window_id = GDK_WINDOW_HWND(priv->remote_video->window);
 #elif defined(HAVE_X11)
 	if (data->participant == NULL)
-		window_id = GDK_WINDOW_XWINDOW(gtk_widget_get_window(priv->local_video));
+		window_id = gdk_x11_window_get_xid(gtk_widget_get_window(priv->local_video));
 	else
-		window_id = GDK_WINDOW_XWINDOW(gtk_widget_get_window(priv->remote_video));
+		window_id = gdk_x11_window_get_xid(gtk_widget_get_window(priv->remote_video));
 #else
 #	error "Unsupported windowing system"
 #endif
diff -r eb08747bfffd -r 26ed36964769 pidgin/plugins/disco/gtkdisco.c
--- a/pidgin/plugins/disco/gtkdisco.c	Thu Dec 02 12:11:26 2010 +0000
+++ b/pidgin/plugins/disco/gtkdisco.c	Fri Dec 03 23:03:58 2010 +0000
@@ -429,7 +429,7 @@
 static gboolean
 disco_paint_tooltip(GtkWidget *tipwindow, gpointer data)
 {
-  cairo_t *cr = gdk_cairo_create(GDK_DRAWABLE(tipwindow));
+	cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(tipwindow));
 	PangoLayout *layout = g_object_get_data(G_OBJECT(tipwindow), "tooltip-plugin");
 	gtk_paint_layout(gtk_widget_get_style(tipwindow),
 			cr,
diff -r eb08747bfffd -r 26ed36964769 pidgin/plugins/gestures/stroke-draw.c
--- a/pidgin/plugins/gestures/stroke-draw.c	Thu Dec 02 12:11:26 2010 +0000
+++ b/pidgin/plugins/gestures/stroke-draw.c	Fri Dec 03 23:03:58 2010 +0000
@@ -339,7 +339,7 @@
   unsigned int border_width;
   XSizeHints hints;
   Display *disp = GDK_WINDOW_XDISPLAY(gtk_widget_get_window(widget));
-  Window wind = GDK_WINDOW_XWINDOW (gtk_widget_get_window(widget));
+  Window wind = gdk_x11_window_get_xid(gtk_widget_get_window(widget));
   int screen = DefaultScreen (disp);
 
 	if (!gstroke_draw_strokes())