rpms/compiz-fusion/devel workaround-openoffice-fix.patch, NONE, 1.1 compiz-fusion.spec, 1.13, 1.14

[Adel Gadllah (drago01)]

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9194

Modified Files:
	compiz-fusion.spec 
Added Files:
	workaround-openoffice-fix.patch 
Log Message:
add oo.org menu fix

workaround-openoffice-fix.patch:

--- NEW FILE workaround-openoffice-fix.patch ---
diff -upNr compiz-fusion-plugins-main-0.6.0.orign/metadata/workarounds.xml.in compiz-fusion-plugins-main-0.6.0/metadata/workarounds.xml.in
--- compiz-fusion-plugins-main-0.6.0.orign/metadata/workarounds.xml.in	2007-10-15 19:43:43.000000000 +0200
+++ compiz-fusion-plugins-main-0.6.0/metadata/workarounds.xml.in	2007-12-01 17:09:19.000000000 +0100
@@ -18,6 +18,11 @@
                 <_long>Fix window type of Firefox and Thunderbird menus.</_long>
                 <default>true</default>
             </option>
+            <option type="bool" name="ooo_menu_fix">
+                <_short>OpenOffice.org Menu Fix</_short>
+                <_long>Fix window type of OpenOffice.org menus.</_long>
+                <default>true</default>
+            </option>
             <option type="bool" name="notification_daemon_fix">
                 <_short>Notification Daemon Fix</_short>
                 <_long>Fix window type of notification daemon windows.</_long>
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-12-01 17:09:51.000000000 +0100
+++ compiz-fusion-plugins-main-0.6.0/src/workarounds/workarounds.c	2007-12-01 17:07:49.000000000 +0100
@@ -249,6 +249,19 @@ workaroundsDoFixes (CompWindow *w)
 	}
     }
 
+    if (workaroundsGetOooMenuFix (d))
+    {
+        if (w->wmType == CompWindowTypeNormalMask &&
+            w->attrib.override_redirect && w->resName)
+	{
+	    if (strcasecmp (w->resName, "VCLSalFrame") == 0)
+	    {
+		newWmType = CompWindowTypeDropdownMenuMask;
+		goto AppliedFix;
+	    }
+	}
+    }
+
     /* FIXME: Basic hack to get Java windows working correctly. */
     if (workaroundsGetJavaFix (d) && w->resName)
     {


Index: compiz-fusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/compiz-fusion.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- compiz-fusion.spec	28 Oct 2007 09:43:01 -0000	1.13
+++ compiz-fusion.spec	1 Dec 2007 16:16:35 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name: compiz-fusion
 Version: 0.6.0       
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Collection of Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -10,6 +10,7 @@
 URL: http://compiz-fusion.org            
 Source0: http://releases.compiz-fusion.org/0.6.0/%{name}-plugins-main-%{version}.tar.bz2  
 Patch0: workarounds-windowtype-fix.patch
+Patch1: workaround-openoffice-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # libdrm is not available on these arches
@@ -127,6 +128,9 @@
 
 
 %changelog
+* Sat Dec 01 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.0-6
+- Backport upstream openoffice menu fix
+
 * Sun Oct 28 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.0-5
 - Rediff patch