cpw.qulogic.gtk3: 89b331fa: updates to work with the latest GTK+

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 89b331fa42d8694169587cf926d72901f89abb5a
Parent:   f75245c79e2fa2fe7e32ccd1c0e9cf01564e2ff2
Author:   malu at pidgin.im
Date:     12/03/10 18:03:58
Branch:   im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/89b331fa42d8694169587cf926d72901f89abb5a

Changelog: 

updates to work with the latest GTK+

Changes against parent f75245c79e2fa2fe7e32ccd1c0e9cf01564e2ff2

  patched  configure.ac
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkmedia.c
  patched  pidgin/plugins/disco/gtkdisco.c
  patched  pidgin/plugins/gestures/stroke-draw.c

-------------- next part --------------
============================================================
--- configure.ac	6f6537fdf10083fcf068163706ed68f7eb34af0e
+++ configure.ac	ef08f78256937fce6bc44ff204163ac4f6ce86f2
@@ -416,7 +416,7 @@ if test "x$enable_gtkui" = "xyes" ; then
 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([
 
============================================================
--- pidgin/plugins/gestures/stroke-draw.c	b3160a797469a2ff940f2f77461a4da36e1f84c1
+++ pidgin/plugins/gestures/stroke-draw.c	a404768dfb30417eb2a142adcac719aec31b5d3e
@@ -339,7 +339,7 @@ gstroke_invisible_window_init (GtkWidget
   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())
============================================================
--- pidgin/gtkblist.c	7b45185295dccd5a97f3038d4aff260b85bf106b
+++ pidgin/gtkblist.c	2e0520f0cc9086b36c8125223e1f0c02a3d29eda
@@ -6149,7 +6149,7 @@ static void pidgin_blist_show(PurpleBudd
 
 	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);
============================================================
--- pidgin/gtkmedia.c	2039ddd4fa12a741eedfcd0c7938bf9bfec94d75
+++ pidgin/gtkmedia.c	5ff9aafa0748f564e798d34e635f702ceba705a3
@@ -442,9 +442,9 @@ realize_cb_cb(PidginMediaRealizeData *da
 		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
============================================================
--- pidgin/plugins/disco/gtkdisco.c	df50e1b26af0e5425f5253755406cc9f84f03e39
+++ pidgin/plugins/disco/gtkdisco.c	7b255ecc7cc96214ac9459975befb9faabb71c78
@@ -429,7 +429,7 @@ disco_paint_tooltip(GtkWidget *tipwindow
 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,