- Removed Ofset Logo. GCompris is no more an Ofset project.

	- Removed Ofset Logo. GCompris is no more an Ofset project.

	* boards/skins/gartoon/ofsetlogo.png:
	* src/gcompris/about.c: (gc_about_start):


	* src/gcompris/gameutil.c: Fixed to add G_STDIO_NO_WRAP_ON_UNIX
	* src/gcompris/gcompris.c: (gc_fullscreen_set): Applied a patch from Karl Tomlinson

5 files changed, 31 insertions, 68 deletions

diff --git a/ChangeLog b/ChangeLog
index c1ad1f9..0dcf523 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-10  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	- Removed Ofset Logo. GCompris is no more an Ofset project.
+
+	* boards/skins/gartoon/ofsetlogo.png:
+	* src/gcompris/about.c: (gc_about_start):
+
+
+	* src/gcompris/gameutil.c: Fixed to add G_STDIO_NO_WRAP_ON_UNIX
+	* src/gcompris/gcompris.c: (gc_fullscreen_set): Applied a patch from Karl Tomlinson
+
+
 2006-11-10  Yves Combe  <yves@ycombe.net>
 
 	Add python binding for sound policy (gcompris.sound).
diff --git a/boards/skins/gartoon/ofsetlogo.png b/boards/skins/gartoon/ofsetlogo.png
deleted file mode 100644
index 28c2a37..0000000
--- a/boards/skins/gartoon/ofsetlogo.png
+++ /dev/null
diff --git a/src/gcompris/about.c b/src/gcompris/about.c
index 6162f57..0510767 100644
--- a/src/gcompris/about.c
+++ b/src/gcompris/about.c
@@ -116,15 +116,6 @@ void gc_about_start ()
 			 gnome_canvas_text_get_type (),
 			 "text", _("Translators:"),
 			 "font", gc_skin_font_subtitle,
-			 "x", (double) BOARDWIDTH/2-320 + 1.0,
-			 "y", (double) y_start + 90 + 1.0,
-			 "anchor", GTK_ANCHOR_NORTH_WEST,
-			 "fill_color_rgba", gc_skin_color_shadow,
-			 NULL);
-  gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
-			 gnome_canvas_text_get_type (),
-			 "text", _("Translators:"),
-			 "font", gc_skin_font_subtitle,
 			 "x", (double) BOARDWIDTH/2-320,
 			 "y", (double) y_start + 90,
 			 "anchor", GTK_ANCHOR_NORTH_WEST,
@@ -135,15 +126,6 @@ void gc_about_start ()
 			 gnome_canvas_text_get_type (),
 			 "text", translators,
 			 "font", gc_skin_font_content,
-			 "x", (double)  BOARDWIDTH/2-320 + 1.0,
-			 "y", (double)  y_start + 120 + 1.0,
-			 "anchor", GTK_ANCHOR_NORTH_WEST,
-			 "fill_color_rgba", gc_skin_color_shadow,
-			 NULL);
-  gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
-			 gnome_canvas_text_get_type (),
-			 "text", translators,
-			 "font", gc_skin_font_content,
 			 "x", (double)  BOARDWIDTH/2-320,
 			 "y", (double)  y_start + 120,
 			 "anchor", GTK_ANCHOR_NORTH_WEST,
@@ -156,62 +138,24 @@ void gc_about_start ()
 			 gnome_canvas_text_get_type (),
 			 "text", "GCompris V" VERSION,
 			 "font", gc_skin_font_title,
-			 "x", (double)  BOARDWIDTH/2 + 1.0,
-			 "y", (double)  y_start + 1.0,
-			 "anchor", GTK_ANCHOR_CENTER,
-			 "fill_color_rgba", gc_skin_color_shadow,
-			 NULL);
-  gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
-			 gnome_canvas_text_get_type (),
-			 "text", "GCompris V" VERSION,
-			 "font", gc_skin_font_title,
 			 "x", (double)  BOARDWIDTH/2,
 			 "y", (double)  y_start,
 			 "anchor", GTK_ANCHOR_CENTER,
 			 "fill_color_rgba", gc_skin_color_subtitle,
 			 NULL);
 
-  y_start += 180;
+  y_start += 140;
   gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
 			 gnome_canvas_text_get_type (),
 			 "text", gettext(content),
 			 "font", gc_skin_font_content,
-			 "x", (double)  BOARDWIDTH*0.45 + 1.0,
-			 "y", (double)  y_start + 1.0,
-			 "anchor", GTK_ANCHOR_CENTER,
-			 "fill_color_rgba", gc_skin_color_shadow,
-			 NULL);
-  gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
-			 gnome_canvas_text_get_type (),
-			 "text", gettext(content),
-			 "font", gc_skin_font_content,
-			 "x", (double)  BOARDWIDTH*0.45,
+			 "x", (double) BOARDWIDTH/2-320,
 			 "y", (double)  y_start,
-			 "anchor", GTK_ANCHOR_CENTER,
+			 "anchor", GTK_ANCHOR_NORTH_WEST,
 			 "fill_color_rgba", gc_skin_color_content,
 			 NULL);
 
-  // Ofset Reference
-  pixmap = gc_skin_pixmap_load("ofsetlogo.png");
-  item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
-				gnome_canvas_pixbuf_get_type (),
-				"pixbuf", pixmap,
-				"x", (double) (BOARDWIDTH*0.15) - gdk_pixbuf_get_width(pixmap)/2,
-				"y", (double) y_start - gdk_pixbuf_get_height(pixmap)/2,
-				NULL);
-
-  gdk_pixbuf_unref(pixmap);
-
-  item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
-				gnome_canvas_text_get_type (),
-				"text", "OFSET\nhttp://ofset.org",
-				"font", gc_skin_font_content,
-				"x", (double)  (BOARDWIDTH*0.15),
-				"y", (double)  y_start + 80,
-				"anchor", GTK_ANCHOR_CENTER,
-				"fill_color_rgba",gc_skin_color_subtitle,
-				NULL);
-
+  y_start += 40;
   // FSF Reference
   pixmap = gc_skin_pixmap_load("fsflogo.png");
   item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
@@ -233,12 +177,12 @@ void gc_about_start ()
 				NULL);
 
   // GCompris Reference
-  y_start += 70;
+  y_start += 80;
   pixmap = gc_skin_pixmap_load("gcomprislogo.png");
   item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
 				gnome_canvas_pixbuf_get_type (),
 				"pixbuf", pixmap,
-				"x", (double) (BOARDWIDTH*0.5) - gdk_pixbuf_get_width(pixmap)/2 -50,
+				"x", (double) (BOARDWIDTH*0.3) - gdk_pixbuf_get_width(pixmap)/2 -50,
 				"y", (double) y_start - gdk_pixbuf_get_height(pixmap)/2,
 				NULL);
 
@@ -248,9 +192,9 @@ void gc_about_start ()
 				gnome_canvas_text_get_type (),
 				"text", _("GCompris Home Page\nhttp://gcompris.net"),
 				"font", gc_skin_font_content,
-				"x", (double)  (BOARDWIDTH*0.5) - 50,
-				"y", (double)  y_start + 30,
-				"anchor", GTK_ANCHOR_CENTER,
+				"x", (double) BOARDWIDTH/2-320,
+				"y", (double)  y_start + 5,
+				"anchor", GTK_ANCHOR_NORTH_WEST,
 				"fill_color_rgba", gc_skin_color_subtitle,
 				NULL);
 
diff --git a/src/gcompris/gameutil.c b/src/gcompris/gameutil.c
index ae11461..8123d68 100644
--- a/src/gcompris/gameutil.c
+++ b/src/gcompris/gameutil.c
@@ -19,13 +19,14 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define G_STDIO_NO_WRAP_ON_UNIX
+
 
 #include <math.h>
 #include <string.h>
 #include <time.h>
 
 /* g_mkdir */
+#define G_STDIO_NO_WRAP_ON_UNIX
 #include <glib/gstdio.h>
 
 /* libxml includes */
diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c
index 83e223e..54a9904 100644
--- a/src/gcompris/gcompris.c
+++ b/src/gcompris/gcompris.c
@@ -956,7 +956,10 @@ void gc_fullscreen_set(gboolean state)
     {
       gdk_window_set_decorations (window->window, 0);
       gdk_window_set_functions (window->window, 0);
-      gtk_window_fullscreen (GTK_WINDOW(window));
+#ifdef XF86_VIDMODE
+      if(properties->noxf86vm)
+#endif
+	gtk_window_fullscreen (GTK_WINDOW(window));
       gtk_widget_set_uposition (window, 0, 0);
     }
   else
@@ -968,7 +971,10 @@ void gc_fullscreen_set(gboolean state)
       if (is_mapped)
         gtk_widget_show (window);
       gdk_window_set_functions (window->window, GDK_FUNC_ALL);
-      gtk_window_unfullscreen (GTK_WINDOW(window));
+#ifdef XF86_VIDMODE
+      if(properties->noxf86vm)
+#endif
+	gtk_window_unfullscreen (GTK_WINDOW(window));
       gtk_widget_set_uposition (window, 0, 0);
     }