[maemo-commits] [maemo-commits] r19502 - in projects/haf/trunk/libsdl1.2/debian: . patches

[From: subversion at stage.maemo.org]

Author: aendrodi
Date: 2009-11-16 17:51:45 +0200 (Mon, 16 Nov 2009)
New Revision: 19502

Modified:
   projects/haf/trunk/libsdl1.2/debian/changelog
   projects/haf/trunk/libsdl1.2/debian/patches/350_nc_friendship.diff
Log:
350_nc_friendship.diff updated to not regress notifications


Modified: projects/haf/trunk/libsdl1.2/debian/changelog
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/changelog	2009-11-16 12:07:00 UTC (rev 19501)
+++ projects/haf/trunk/libsdl1.2/debian/changelog	2009-11-16 15:51:45 UTC (rev 19502)
@@ -1,3 +1,12 @@
+libsdl1.2 (1:1.2.13-2maemo8) unstable; urgency=low
+
+  * debian/patches/350_nc_friendship.diff
+    + Updated
+    + Practically ignore all LeaveNotify:es we may get because of
+      cmp<->nc mode switching.  We don't have a pointer anyway.
+
+ -- Adam Endrodi <adam.endrodi at blumsoft.eu>  Mon, 16 Nov 2009 17:42:24 +0200
+
 libsdl1.2 (1:1.2.13-2maemo7) unstable; urgency=low
 
   * debian/patches/350_nc_friendship.diff

Modified: projects/haf/trunk/libsdl1.2/debian/patches/350_nc_friendship.diff
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/patches/350_nc_friendship.diff	2009-11-16 12:07:00 UTC (rev 19501)
+++ projects/haf/trunk/libsdl1.2/debian/patches/350_nc_friendship.diff	2009-11-16 15:51:45 UTC (rev 19502)
@@ -2,13 +2,14 @@
 changes when we're switched to non-composited mode by the window manager.
 
 diff --exclude .svn -ru sdl.faszom/src/events/x11/SDL_x11events.c sdl/src/events/x11/SDL_x11events.c
---- sdl.faszom/src/video/x11/SDL_x11events.c.orig	2009-11-16 10:47:35.000000000 +0200
-+++ sdl/src/video/x11/SDL_x11events.c	2009-11-16 10:48:06.000000000 +0200
-@@ -446,6 +446,7 @@
- #endif
- 		if ( (xevent.xcrossing.mode != NotifyGrab) &&
+--- sdl.faszom/src/events/x11/SDL_x11events.c.orig	2009-11-16 10:47:35.000000000 +0200
++++ sdl/src/events/x11/SDL_x11events.c	2009-11-16 17:39:24.000000000 +0200
+@@ -448,7 +448,7 @@
  		     (xevent.xcrossing.mode != NotifyUngrab) &&
-+		     (xevent.xcrossing.detail != NotifyNonlinear) &&
  		     (xevent.xcrossing.detail != NotifyInferior) ) {
  			if ( this->input_grab == SDL_GRAB_OFF ) {
- 				posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
+-				posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
++				/* don't tell the application */;
+ 			} else {
+ 				posted = SDL_PrivateMouseMotion(0, 0,
+ 						xevent.xcrossing.x,