From 9a6d848d09a80075fb878718a0e6a462ddaaf6fb Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 27 Oct 2014 14:51:39 +0100
Subject: [PATCH] better handling of gdkx dependency

---
 gtk/videowindow.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/gtk/videowindow.c b/gtk/videowindow.c
index 8d404adc5..24dc584f7 100644
--- a/gtk/videowindow.c
+++ b/gtk/videowindow.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "linphone.h"
 
-#ifdef __linux
+#ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #elif defined(WIN32)
 #include <gdk/gdkwin32.h>
@@ -95,16 +95,12 @@ static gboolean drag_drop(GtkWidget *widget, GdkDragContext *drag_context, gint
 }
 
 unsigned long get_native_handle(GdkWindow *gdkw){
-#ifdef __linux
+#ifdef GDK_WINDOWING_X11
 	return (unsigned long)GDK_WINDOW_XID(gdkw);
 #elif defined(WIN32)
 	return (unsigned long)GDK_WINDOW_HWND(gdkw);
 #elif defined(__APPLE__)
-#	ifdef HAVE_GTK_OSX /*let's assume the use of gtk-osx implies the use of gtk-quartz.*/
-		return (unsigned long)gdk_quartz_window_get_nsview(gdkw);
-#	else
-		return (unsigned long)GDK_WINDOW_XID(gdkw);
-#	endif
+	return (unsigned long)gdk_quartz_window_get_nsview(gdkw);
 #endif
 	g_warning("No way to get the native handle from gdk window");
 	return 0;