[banshee/gtk3] libbanshee: Port to GTK+ 3.0

[Bertrand Lorentz <blorentz src gnome org>]

commit 327a57d186abe7fc2f0ea41791c382ca54a72925
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Sun Dec 4 15:50:25 2011 +0100

    libbanshee: Port to GTK+ 3.0
    
    Use the new macro to get the X window, and port all the build stuff
    
    GTK+ 3.0 can be built with several backends, so we need to handle that
    during configure. Also, there's only one .pc file now, instead of one
    for each backend, so things are a bit simpler.

 build/m4/banshee/libbanshee.m4               |   29 +++++++++++--------------
 libbanshee/banshee-player-missing-elements.c |    2 +-
 2 files changed, 14 insertions(+), 17 deletions(-)
---
diff --git a/build/m4/banshee/libbanshee.m4 b/build/m4/banshee/libbanshee.m4
index 9c9da10..a644362 100644
--- a/build/m4/banshee/libbanshee.m4
+++ b/build/m4/banshee/libbanshee.m4
@@ -10,20 +10,17 @@ AC_DEFUN([BANSHEE_CHECK_LIBBANSHEE],
 	LIBBANSHEE_LIBS=""
 	LIBBANSHEE_CFLAGS=""
 
-	GRAPHICS_SUBSYSTEM="Unknown"
-	GTK_TARGET=$(pkg-config --variable=target gtk+-2.0)
-
-	if test x$GTK_TARGET = xx11; then
-		PKG_CHECK_MODULES(GDK_X11, gdk-x11-2.0 >= 2.8)
-		SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GDK_X11)
-		GRAPHICS_SUBSYSTEM="X11"
-	elif test x$GTK_TARGET = xquartz; then
-		PKG_CHECK_MODULES(GDK_QUARTZ, gdk-quartz-2.0 >= 2.14)
-		SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GDK_QUARTZ)
-		GRAPHICS_SUBSYSTEM="Quartz"
-	else
-		PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8)
-	fi
+	PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
+	SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GTK)
+
+	GTK_TARGETS=$(pkg-config --variable=targets gtk+-3.0)
+	for GTK_TARGET in $GTK_TARGETS; do
+		if test x$GTK_TARGET = xx11; then
+			GRAPHICS_SUBSYSTEM_X11="yes"
+		elif test x$GTK_TARGET = xquartz; then
+			GRAPHICS_SUBSYSTEM_QUARTZ="yes"
+		fi
+	done
 
 	AC_ARG_ENABLE(clutter, AS_HELP_STRING([--enable-clutter],
 		[Enable support for clutter video sink]), , enable_clutter="no")
@@ -37,8 +34,8 @@ AC_DEFUN([BANSHEE_CHECK_LIBBANSHEE],
 			[Define if the video sink should be Clutter])
 	fi
 
-	AM_CONDITIONAL(HAVE_X11, test "x$GRAPHICS_SUBSYSTEM" = "xX11")
-	AM_CONDITIONAL(HAVE_QUARTZ, test "x$GRAPHICS_SUBSYSTEM" = "xQuartz")
+	AM_CONDITIONAL(HAVE_X11, test "x$GRAPHICS_SUBSYSTEM_X11" = "xyes")
+	AM_CONDITIONAL(HAVE_QUARTZ, test "x$GRAPHICS_SUBSYSTEM_QUARTZ" = "xyes")
 	AM_CONDITIONAL(HAVE_CLUTTER, test "x$enable_clutter" = "xyes")
 
 	AC_SUBST(GRAPHICS_SUBSYSTEM)
diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c
index 20804c4..825c8ef 100644
--- a/libbanshee/banshee-player-missing-elements.c
+++ b/libbanshee/banshee-player-missing-elements.c
@@ -166,7 +166,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old,
     #ifdef GDK_WINDOWING_X11
     if (player->window != NULL) {
         gst_install_plugins_context_set_xid (player->install_plugins_context, 
-            GDK_WINDOW_XWINDOW (player->window));
+            GDK_WINDOW_XID (player->window));
     }
     #endif