rpms/compiz/devel compiz-0.7.6-multi-screen-fix.patch, NONE, 1.1 compiz-0.7.6-utility-windows.patch, NONE, 1.1 compiz.spec, 1.136, 1.137

[Adel Gadllah]

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14388

Modified Files:
	compiz.spec 
Added Files:
	compiz-0.7.6-multi-screen-fix.patch 
	compiz-0.7.6-utility-windows.patch 
Log Message:
Fix bug 466622 and backport another fix from upstream

compiz-0.7.6-multi-screen-fix.patch:

--- NEW FILE compiz-0.7.6-multi-screen-fix.patch ---
diff --git a/src/event.c b/src/event.c

--- a/src/event.c
+++ b/src/event.c
@@ -2279,12 +2279,16 @@ handleEvent (CompDisplay *d,
 	    w = NULL;
 
 	    for (s = d->screens; s; s = s->next)
+	    {
 		for (w = s->windows; w; w = w->next)
+		{
 		    if (w->syncAlarm == sa->alarm)
-			break;
-
-	    if (w)
-		handleSyncAlarm (w);
+		    {
+			handleSyncAlarm(w);
+			return;
+		    }
+		}
+	    }
 	}
 	break;
     }


compiz-0.7.6-utility-windows.patch:

--- NEW FILE compiz-0.7.6-utility-windows.patch ---
diff --git a/src/window.c b/src/window.c

--- a/src/window.c
+++ b/src/window.c
@@ -2920,7 +2920,10 @@ isGroupTransient (CompWindow *w,
 
     if (w->transientFor == None || w->transientFor == w->screen->root)
     {
-	if (w->type & (CompWindowTypeDialogMask |
+	if (w->type & (CompWindowTypeUtilMask    |
+		       CompWindowTypeToolbarMask |
+		       CompWindowTypeMenuMask    |
+		       CompWindowTypeDialogMask  |
 		       CompWindowTypeModalDialogMask))
 	{
 	    if (w->clientLeader == clientLeader)



Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- compiz.spec	22 Oct 2008 15:21:25 -0000	1.136
+++ compiz.spec	22 Oct 2008 16:47:35 -0000	1.137
@@ -14,7 +14,7 @@
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.7.6
-Release:        14%{?dist}
+Release:        15%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,6 +62,8 @@
 # upstream commit 45caca2220f75bfd20074c217ebee10825413547
 Patch111: compiz-0.7.6-decoration-size.patch
 Patch112: compiz-0.7.6-metacity-spacer.patch
+Patch113: compiz-0.7.6-utility-windows.patch
+Patch114: compiz-0.7.6-multi-screen-fix.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -136,6 +138,8 @@
 #%patch110 -p1 -b .scale-key
 %patch111 -p1 -b .decoration-size
 %patch112 -p1 -b .metacity-spacer
+%patch113 -p1 -b .utility-windows
+%patch114 -p1 -b .multi-screen
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -347,6 +351,10 @@
 
 
 %changelog
+* Wed Oct 22 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.6-15
+- Fix handling of utility windows (RH #466622)
+- Handle sync alarm events on all screens
+
 * Wed Oct 22 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.6-14
 - Add missing bits to the patch (RH #446457)