rpms/compiz-fusion/F-8 compiz-fusion.spec, 1.11, 1.12 workarounds-windowtype-fix.patch, 1.1, 1.2

[Adel Gadllah (drago01)]

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20183

Modified Files:
	compiz-fusion.spec workarounds-windowtype-fix.patch 
Log Message:
fix workaround fix


Index: compiz-fusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/F-8/compiz-fusion.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- compiz-fusion.spec	27 Oct 2007 20:51:54 -0000	1.11
+++ compiz-fusion.spec	28 Oct 2007 09:29:29 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name: compiz-fusion
 Version: 0.6.0       
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Collection of Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Sun Oct 28 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.0-4
+- Fix previous patch
+
 * Sat Oct 27 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.0-3
 - Apply patch from upstream to fix RH #354601
 

workarounds-windowtype-fix.patch:

Index: workarounds-windowtype-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/F-8/workarounds-windowtype-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workarounds-windowtype-fix.patch	27 Oct 2007 20:51:54 -0000	1.1
+++ workarounds-windowtype-fix.patch	28 Oct 2007 09:29:29 -0000	1.2
@@ -1,8 +1,7 @@
-diff --git a/src/workarounds/workarounds.c b/src/workarounds/workarounds.c
-
---- a/src/workarounds/workarounds.c
-+++ b/src/workarounds/workarounds.c
-@@ -226,46 +226,64 @@ workaroundsDoFixes (CompWindow *w)
+diff -upNr /home/dragoran/Desktop/compiz-fusion-plugins-main-0.6.0/src/workarounds/workarounds.c ./compiz-fusion-plugins-main-0.6.0/src/workarounds/workarounds.c
+--- /home/dragoran/Desktop/compiz-fusion-plugins-main-0.6.0/src/workarounds/workarounds.c	2007-10-15 19:43:43.000000000 +0200
++++ ./compiz-fusion-plugins-main-0.6.0/src/workarounds/workarounds.c	2007-10-28 10:23:38.000000000 +0100
+@@ -226,46 +226,51 @@ workaroundsDoFixes (CompWindow *w)
      /* FIXME: Is this the best way to detect a notification type window? */
      if (workaroundsGetNotificationDaemonFix (d))
      {
@@ -28,19 +27,6 @@
  	    {
  		newWmType = CompWindowTypeDropdownMenuMask;
 +		goto AppliedFix;
-+	    }
-+	}
-+    }
-+
-+    if (workaroundsGetOooMenuFix (d))
-+    {
-+        if (newWmType == CompWindowTypeNormalMask &&
-+            w->attrib.override_redirect && w->resName)
-+	{
-+	    if (strcasecmp (w->resName, "VCLSalFrame") == 0)
-+	    {
-+		newWmType = CompWindowTypeDropdownMenuMask;
-+		goto AppliedFix;
  	    }
  	}
      }
@@ -72,7 +58,7 @@
      {
          char *windowRole;
  
-@@ -276,24 +294,27 @@ workaroundsDoFixes (CompWindow *w)
+@@ -276,24 +281,27 @@ workaroundsDoFixes (CompWindow *w)
              if ((strcmp (windowRole, "toolTipTip") == 0) ||
                  (strcmp (windowRole, "qtooltip_label") == 0))
              {
@@ -110,4 +96,3 @@
      if (newWmType != w->wmType)
      {
  	WORKAROUNDS_WINDOW (w);
-