rpms/openoffice.org/devel openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch, NONE, 1.1 openoffice.org.spec, 1.594, 1.595

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23829

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch 
Log Message:
workaround animation problem

openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch:
 unx/gtk/gdi/salnativewidgets-gtk.cxx     |    0 
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |    6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch ---
Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.18
diff -u -r1.18 salnativewidgets-gtk.cxx
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	1 Nov 2005 10:35:31 -0000	1.18
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	21 Dec 2005 15:31:52 -0000
@@ -1138,8 +1138,8 @@
 	// GTK enforces radio groups, so that if we don't have 2 buttons in the group,
 	// the single button will always be active.  So we have to have 2 buttons.
 	if (!isChecked)
-		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(gRadioWidgetSibling), TRUE );
-	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(gRadioWidget), isChecked );
+		GTK_TOGGLE_BUTTON(gRadioWidgetSibling)->active = TRUE;
+	GTK_TOGGLE_BUTTON(gRadioWidget)->active = isChecked;
 
     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
     {
@@ -1185,7 +1185,7 @@
 	// Set the shadow based on if checked or not so we get a checkmark.
 	shadowType = isChecked ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
 	NWSetWidgetState( gCheckWidget, nState, stateType );
-	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(gCheckWidget), isChecked );
+	GTK_TOGGLE_BUTTON(gCheckWidget)->active = isChecked;
 
     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
     {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.594
retrieving revision 1.595
diff -u -r1.594 -r1.595
--- openoffice.org.spec	16 Dec 2005 08:17:11 -0000	1.594
+++ openoffice.org.spec	21 Dec 2005 15:21:34 -0000	1.595
@@ -1,6 +1,6 @@
 %define oootag OOA680
 %define ooomilestone 1
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 %define build_fc5 1
 %define build_fc4 0
@@ -212,6 +212,7 @@
 Patch46: workspace.systemagg.patch
 Patch47: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
 Patch48: openoffice.org-2.0.1.oooXXXXX.config_office.nss.patch
+Patch49: openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -876,6 +877,7 @@
 %patch47 -p1 -b .gcc25199.bitfieldaccess.patch
 %endif
 %patch48 -p1 -b .oooXXXXX.config_office.nss.patch
+%patch49 -p1 -b .oooXXXXX.vcl.animatedtheme.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3334,6 +3336,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Dec 21 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-2
+- add openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch for animated
+  theme problem
+
 * Thu Dec 15 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-1
 - gcc#25199# fixed, drop bitfield patch
 - gcc#25389# fixed, drop jurt.nullpointer.patch