[maemo-commits] [maemo-commits] r17072 - in projects/haf/trunk/sapwood: . tests

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-01-09 15:46:06 +0200 (Fri, 09 Jan 2009)
New Revision: 17072

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/tests/double-free.c
Log:
2009-01-08  Sven Herzberg  <sven at imendio.com>

	Compile against a vanilla GTK+

	* tests/double-free.c: GTK+ 2.14 doesn't allow including
	<gtk/gtktestutils.h>; Maemo-GTK doesn't include it in <gtk/gtk.h>; so
	we need this version check here


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2009-01-09 13:46:01 UTC (rev 17071)
+++ projects/haf/trunk/sapwood/ChangeLog	2009-01-09 13:46:06 UTC (rev 17072)
@@ -1,5 +1,13 @@
 2009-01-08  Sven Herzberg  <sven at imendio.com>
 
+	Compile against a vanilla GTK+
+
+	* tests/double-free.c: GTK+ 2.14 doesn't allow including
+	<gtk/gtktestutils.h>; Maemo-GTK doesn't include it in <gtk/gtk.h>; so
+	we need this version check here
+
+2009-01-08  Sven Herzberg  <sven at imendio.com>
+
 	Updated to the refactored paths.
 
 	* demos/run-demo: replaced src by engine, as this is where the engine

Modified: projects/haf/trunk/sapwood/tests/double-free.c
===================================================================
--- projects/haf/trunk/sapwood/tests/double-free.c	2009-01-09 13:46:01 UTC (rev 17071)
+++ projects/haf/trunk/sapwood/tests/double-free.c	2009-01-09 13:46:06 UTC (rev 17072)
@@ -31,7 +31,10 @@
 #include <sys/un.h>
 #include <unistd.h>
 #include <gio/gio.h>
+#include <gtk/gtk.h>
+#if ! GTK_CHECK_VERSION (2,14,0)
 #include <gtk/gtktestutils.h>
+#endif
 #include "sapwood-pixmap-priv.h"
 #include "sapwood-proto.h"