rpms/compiz-fusion/F-8 compiz-fusion.spec, 1.18, 1.19 workarounds-fullscreenfix.patch, 1.3, 1.4

[Adel Gadllah (drago01)]

Author: drago01

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

Modified Files:
	compiz-fusion.spec workarounds-fullscreenfix.patch 
Log Message:
fix stupid typo and clean up the patch


Index: compiz-fusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/F-8/compiz-fusion.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- compiz-fusion.spec	27 Dec 2007 17:37:12 -0000	1.18
+++ compiz-fusion.spec	30 Dec 2007 13:11:29 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name: compiz-fusion
 Version: 0.6.0       
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Collection of Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Sun Dec 30 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.0-11
+- Fix stupid typo in the patch
+
 * Thu Dec 27 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.0-10
 - Plug small memory leak
 

workarounds-fullscreenfix.patch:

Index: workarounds-fullscreenfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/F-8/workarounds-fullscreenfix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workarounds-fullscreenfix.patch	27 Dec 2007 17:37:12 -0000	1.3
+++ workarounds-fullscreenfix.patch	30 Dec 2007 13:11:29 -0000	1.4
@@ -1,6 +1,6 @@
 diff -upNr compiz-fusion-plugins-main-0.6.0.orign/src/workarounds/workarounds.c compiz-fusion-plugins-main-0.6.0/src/workarounds/workarounds.c
 --- compiz-fusion-plugins-main-0.6.0.orign/src/workarounds/workarounds.c	2007-10-15 19:43:43.000000000 +0200
-+++ compiz-fusion-plugins-main-0.6.0/src/workarounds/workarounds.c	2007-12-27 18:32:55.000000000 +0100
++++ compiz-fusion-plugins-main-0.6.0/src/workarounds/workarounds.c	2007-12-30 13:56:18.000000000 +0100
 @@ -51,6 +51,16 @@ typedef struct _WorkaroundsWindow {
      Bool isFullscreen;
  } WorkaroundsWindow;
@@ -28,12 +28,12 @@
      {
  	unsigned int state = w->state & ~CompWindowStateFullscreenMask;
  
-@@ -211,8 +220,67 @@ workaroundsFixupFullscreen (CompWindow *
+@@ -211,8 +220,56 @@ workaroundsFixupFullscreen (CompWindow *
  	    recalcWindowType (w);
  	    recalcWindowActions (w);
  	    updateWindowAttributes (w, CompStackingUpdateModeNormal);
 +
-+	    /* keep track of windows that we interact with */
++	    /*keep track of windows that we interact with*/
 +
 +	    if(mfwList == NULL) 
 +	    {
@@ -44,24 +44,19 @@
 +	    else 
 +            {
 +                WorkaroundsManagedFsWindow *mfw;
-+		for(mfw = mfwList; mfw->next != NULL; mfw = mfw->next) 
-+		{
-+		    mfw->next = (WorkaroundsManagedFsWindow*)malloc(sizeof(WorkaroundsManagedFsWindow));
-+		    mfw = mfw->next;
-+		    mfw->id = w->id;
-+		    mfw->next = NULL;
-+		}
-+		
++		for(mfw = mfwList; mfw->next != NULL; mfw = mfw->next);
++		mfw->next = (WorkaroundsManagedFsWindow*)malloc(sizeof(WorkaroundsManagedFsWindow));
++		mfw = mfw->next;
++		mfw->id = w->id;
++		mfw->next = NULL;
 +	    }
 +		    
  	}
      }
 +    else if(!isFullSize && (w->state & CompWindowStateFullscreenMask) && mfwList) {
++	/*did we set the flag?*/
++	WorkaroundsManagedFsWindow *mfw;
 +
-+	/* did we set the flag? */
-+
-+	WorkaroundsManagedFsWindow *mfw,*mfwPrev;
-+	mfwPrev = mfwList;
 +	for(mfw = mfwList; mfw->next != NULL; mfw = mfw->next) 
 +	{
 +		if(mfw->id == w->id) 
@@ -80,14 +75,8 @@
 +	 		   recalcWindowActions (w);
 +	 		   updateWindowAttributes (w, CompStackingUpdateModeNormal);
 +			}
-+			
-+			mfwPrev->next=mfw->next;
-+	        	free(mfw);
-+			
 +			break;
 +		}
-+		
-+		mfwPrev = mfw;
 +	
 +    	}
 +   }
@@ -96,7 +85,7 @@
  }
  
  static void
-@@ -356,6 +424,27 @@ workaroundsHandleEvent (CompDisplay *d,
+@@ -356,6 +413,27 @@ workaroundsHandleEvent (CompDisplay *d,
  	if (w && w->attrib.override_redirect)
  	    workaroundsDoFixes (w);
  	break;