rpms/gcompris/devel gcompris-8.3.2-anim-missing-icon.patch, NONE, 1.1 gcompris-8.3.2-tuxpaint-fullscreen.patch, NONE, 1.1 gcompris.spec, 1.22, 1.23

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25549

Modified Files:
	gcompris.spec 
Added Files:
	gcompris-8.3.2-anim-missing-icon.patch 
	gcompris-8.3.2-tuxpaint-fullscreen.patch 
Log Message:
gcompris wip

gcompris-8.3.2-anim-missing-icon.patch:

--- NEW FILE gcompris-8.3.2-anim-missing-icon.patch ---
diff -up gcompris-8.3.2/src/boards/python/anim.py~ gcompris-8.3.2/src/boards/python/anim.py
--- gcompris-8.3.2/src/boards/python/anim.py~	2007-07-12 09:52:10.000000000 +0200
+++ gcompris-8.3.2/src/boards/python/anim.py	2007-07-12 09:52:10.000000000 +0200
@@ -823,7 +823,7 @@ class Gcompris_anim:
     # And finaly a STOP icon
     run = self.root_playingitem.add(
       gnomecanvas.CanvasPixbuf,
-      pixbuf = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("boardicons/draw.svg")),
+      pixbuf = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("boardicons/draw.png")),
       x = 16,
       y = 110,
       )

gcompris-8.3.2-tuxpaint-fullscreen.patch:

--- NEW FILE gcompris-8.3.2-tuxpaint-fullscreen.patch ---
diff -up gcompris-8.3.2/src/boards/python/tuxpaint.py~ gcompris-8.3.2/src/boards/python/tuxpaint.py
--- gcompris-8.3.2/src/boards/python/tuxpaint.py~	2007-07-12 10:27:46.000000000 +0200
+++ gcompris-8.3.2/src/boards/python/tuxpaint.py	2007-07-12 10:27:46.000000000 +0200
@@ -120,9 +120,10 @@ class Gcompris_tuxpaint:
     gcompris.sound.close()
 
     # release pointergrab if running fullscreen, tuxpaint wants to grab the
-    # pointer itself
+    # pointer itself, no need to leave fullscreen on focus out
     if (Prop.fullscreen and not Prop.noxf86vm):
       gtk.gdk.pointer_ungrab()
+      gcompris.ignore_next_focus_out()
 
     #self.window.set_property("accept-focus", 0)
     #self.window.set_keep_below(False)
diff -up gcompris-8.3.2/src/boards/py-mod-gcompris.c~ gcompris-8.3.2/src/boards/py-mod-gcompris.c
--- gcompris-8.3.2/src/boards/py-mod-gcompris.c~	2007-07-12 10:26:03.000000000 +0200
+++ gcompris-8.3.2/src/boards/py-mod-gcompris.c	2007-07-12 10:26:03.000000000 +0200
@@ -271,6 +271,23 @@ py_gc_get_window(PyObject* self, PyObjec
 }
 
 
+/* void gc_ignore_next_focus_out(void); */
+static PyObject*
+py_gc_ignore_next_focus_out(PyObject* self, PyObject* args)
+{
+  /* Parse arguments */
+  if(!PyArg_ParseTuple(args, ":gc_ignore_next_focus_out"))
+    return NULL;
+
+  /* Call the corresponding C function */
+  gc_ignore_next_focus_out();
+
+  /* Create and return the result */
+  Py_INCREF(Py_None);
+  return Py_None;
+}
+
+
 /* gchar *gc_locale_get(void); */
 static PyObject*
 py_gc_locale_get(PyObject* self, PyObject* args)
@@ -1504,6 +1521,8 @@ static PyMethodDef PythonGcomprisModule[
   { "bar_hide",  py_gc_bar_hide, METH_VARARGS, "gc_bar_hide" },
   { "get_canvas",  py_gc_get_canvas, METH_VARARGS, "gc_get_canvas" },
   { "get_window",  py_gc_get_window, METH_VARARGS, "gc_get_window" },
+  { "ignore_next_focus_out",  py_gc_ignore_next_focus_out, METH_VARARGS,
+    "gc_ignore_next_focus_out" },
   { "get_locale",  py_gc_locale_get, METH_VARARGS, "gc_locale_get" },
   { "get_user_default_locale",  py_gc_locale_get_user_default, METH_VARARGS, "gc_locale_get_user_default" },
   { "set_locale",  py_gc_locale_set, METH_VARARGS, "gc_locale_set" },


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gcompris.spec	19 Jun 2007 11:33:25 -0000	1.22
+++ gcompris.spec	13 Jul 2007 12:01:52 -0000	1.23
@@ -1,12 +1,14 @@
 Name:           gcompris
 Version:        8.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gcompris.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         gcompris-8.1-icon.patch
+Patch1:         gcompris-8.3.2-anim-missing-icon.patch
+Patch2:         gcompris-8.3.2-tuxpaint-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
@@ -250,6 +252,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
 mv tmp docs/C/gcompris.info