[maemo-commits] [maemo-commits] r17073 - in projects/haf/trunk/sapwood: . demos

[From: subversion at stage.maemo.org]

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

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/demos/Makefile.am
   projects/haf/trunk/sapwood/demos/buttonbox.c
Log:
2009-01-08  Sven Herzberg  <sven at imendio.com>

	Test if the server can run the buttonbox demo

	* demos/Makefile.am: added the buttonbox to the tests
	* demos/buttonbox.c (main): return after showing the window if a
	proper environment variable was set


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2009-01-09 13:46:06 UTC (rev 17072)
+++ projects/haf/trunk/sapwood/ChangeLog	2009-01-09 13:46:11 UTC (rev 17073)
@@ -1,5 +1,13 @@
 2009-01-08  Sven Herzberg  <sven at imendio.com>
 
+	Test if the server can run the buttonbox demo
+
+	* demos/Makefile.am: added the buttonbox to the tests
+	* demos/buttonbox.c (main): return after showing the window if a
+	proper environment variable was set
+
+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

Modified: projects/haf/trunk/sapwood/demos/Makefile.am
===================================================================
--- projects/haf/trunk/sapwood/demos/Makefile.am	2009-01-09 13:46:06 UTC (rev 17072)
+++ projects/haf/trunk/sapwood/demos/Makefile.am	2009-01-09 13:46:11 UTC (rev 17073)
@@ -3,8 +3,10 @@
 INCLUDES = $(GTK_CFLAGS)
 LDADD = $(GTK_LIBS)
 
+TEST_PROGS+=buttonbox
+TESTS_ENVIRONMENT=SAPWOOD_TESTING=true $(top_srcdir)/tests/sapwood-wrapper
 noinst_PROGRAMS = \
-	buttonbox \
+	$(TEST_PROGS) \
 	gradient \
 	treeview
 

Modified: projects/haf/trunk/sapwood/demos/buttonbox.c
===================================================================
--- projects/haf/trunk/sapwood/demos/buttonbox.c	2009-01-09 13:46:06 UTC (rev 17072)
+++ projects/haf/trunk/sapwood/demos/buttonbox.c	2009-01-09 13:46:11 UTC (rev 17073)
@@ -20,8 +20,11 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
 #include <gtk/gtk.h>
 
+#include <string.h>
+
 #define PACK_START FALSE
 #define PACK_END   TRUE
 #define PRIMARY    FALSE
@@ -85,6 +88,12 @@
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   vbox = gtk_vbox_new (FALSE, 0);
 
+  if (g_getenv ("SAPWOOD_TESTING") && !strcmp (g_getenv ("SAPWOOD_TESTING"), "true")) {
+          gtk_widget_set_app_paintable (window, TRUE);
+          g_signal_connect_after (window, "expose-event",
+                                  G_CALLBACK (gtk_widget_destroy), NULL);
+  }
+
   for (row = 0; row < G_N_ELEMENTS(boxes); row++)
     {
       button_t *buttons = boxes[row];