rpms/gcompris/devel gcompris-8.4-fullscreen2.patch, NONE, 1.1 gcompris.spec, 1.29, 1.30

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	gcompris.spec 
Added Files:
	gcompris-8.4-fullscreen2.patch 
Log Message:
* Sat Sep 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-2
- Fix keyboard not working in fullscreen mode


gcompris-8.4-fullscreen2.patch:

--- NEW FILE gcompris-8.4-fullscreen2.patch ---
diff -up gcompris-8.4/src/gcompris/gcompris.c~ gcompris-8.4/src/gcompris/gcompris.c
--- gcompris-8.4/src/gcompris/gcompris.c~	2007-09-22 10:48:14.000000000 +0200
+++ gcompris-8.4/src/gcompris/gcompris.c	2007-09-22 10:48:14.000000000 +0200
@@ -977,6 +977,7 @@ void gc_fullscreen_set(gboolean state)
         gdk_window_set_override_redirect (window->window, 1);
         gdk_window_set_keep_above (window->window, 1);
         gdk_window_raise (window->window);
+        gdk_window_focus (window->window, GDK_CURRENT_TIME);
       }
       else
 #endif
@@ -1885,11 +1885,11 @@ main (int argc, char *argv[])
 
   setup_window ();
 
+  gtk_widget_show_all (window);
+
   if (properties->fullscreen)
     gc_fullscreen_set(properties->fullscreen);
 
-  gtk_widget_show_all (window);
-
   /* If a specific activity is selected, skeep the intro music */
   if(!popt_root_menu)
     {


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gcompris.spec	11 Sep 2007 22:10:16 -0000	1.29
+++ gcompris.spec	22 Sep 2007 10:09:41 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           gcompris
 Version:        8.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
@@ -10,6 +10,7 @@
 Patch1:         gcompris-8.3.2-tuxpaint-fullscreen.patch
 Patch2:         gcompris-8.4-configure-bugfix.patch
 Patch3:         gcompris-8.4-fullscreen.patch
+Patch4:         gcompris-8.4-fullscreen2.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
@@ -260,6 +261,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/%{name}.info > tmp
 mv tmp docs/C/%{name}.info
 
@@ -505,6 +507,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-2
+- Fix keyboard not working in fullscreen mode
+
 * Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-1
 - New upstream release 8.4
 - Drop -flags sub-package, the idea was that by putting the flags in a