gcompris r3612 - branches/gcomprixogoo/src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Tue Nov 11 21:14:23 2008
New Revision: 3612
URL: http://svn.gnome.org/viewvc/gcompris?rev=3612&view=rev

Log:
Fixed missing NULL in goo canvas call


Modified:
   branches/gcomprixogoo/src/gcompris/gcompris.h
   branches/gcomprixogoo/src/gcompris/help.c

Modified: branches/gcomprixogoo/src/gcompris/gcompris.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris.h	(original)
+++ branches/gcomprixogoo/src/gcompris/gcompris.h	Tue Nov 11 21:14:23 2008
@@ -186,23 +186,23 @@
 #define COLOR_SUBTITLE		0xB00400FF
 #define COLOR_SHADOW		0x000000FF
 
-#define FONT_TITLE		"Sans 20"
-#define FONT_TITLE_FALLBACK	"Sans 12"
-#define FONT_SUBTITLE		"Sans 16"
-#define FONT_SUBTITLE_FALLBACK	"Sans 12"
-#define FONT_CONTENT		"Sans 12"
-#define FONT_CONTENT_FALLBACK	"Sans 12"
+#define FONT_TITLE		"sans 20"
+#define FONT_TITLE_FALLBACK	"sans 12"
+#define FONT_SUBTITLE		"sans 16"
+#define FONT_SUBTITLE_FALLBACK	"sans 12"
+#define FONT_CONTENT		"sans 12"
+#define FONT_CONTENT_FALLBACK	"sans 12"
 
-#define FONT_BOARD_TINY		"Sans 10"
-#define FONT_BOARD_SMALL	"Sans 12"
-#define FONT_BOARD_MEDIUM	"Sans 14"
-#define FONT_BOARD_BIG		"Sans 16"
-#define FONT_BOARD_BIG_BOLD	"Sans bold 16"
-#define FONT_BOARD_FIXED	"Fixed 12"
-#define FONT_BOARD_TITLE	"Sans 20"
-#define FONT_BOARD_TITLE_BOLD	"Sans bold 20"
-#define FONT_BOARD_HUGE		"Sans 28"
-#define FONT_BOARD_HUGE_BOLD	"Sans bold 28"
+#define FONT_BOARD_TINY		"sans 10"
+#define FONT_BOARD_SMALL	"sans 12"
+#define FONT_BOARD_MEDIUM	"sans 14"
+#define FONT_BOARD_BIG		"sans 16"
+#define FONT_BOARD_BIG_BOLD	"sans bold 16"
+#define FONT_BOARD_FIXED	"fixed 12"
+#define FONT_BOARD_TITLE	"sans 20"
+#define FONT_BOARD_TITLE_BOLD	"sans bold 20"
+#define FONT_BOARD_HUGE		"sans 28"
+#define FONT_BOARD_HUGE_BOLD	"sans bold 28"
 
 /*=========================================================*/
 // These are gcompris defined cursors

Modified: branches/gcomprixogoo/src/gcompris/help.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/help.c	(original)
+++ branches/gcomprixogoo/src/gcompris/help.c	Tue Nov 11 21:14:23 2008
@@ -332,7 +332,8 @@
 			 x_start + 40,
 			 y_start,
 			 618.0,
-			 280.0);
+			 280.0,
+			 NULL);
   gtk_widget_show_all (sw);
 
   set_content(text_to_display);