rpms/openoffice.org/FC-6 openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch, NONE, 1.1 openoffice.org.spec, 1.893, 1.894

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch 
Log Message:
openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch

openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch:
 fpicker/source/unx/gnome/SalGtkFilePicker.cxx |    4 +++-
 source/unx/gnome/SalGtkFilePicker.cxx         |    0 
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch ---
Index: source/unx/gnome/SalGtkFilePicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
retrieving revision 1.16
diff -u -r1.16 SalGtkFilePicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx	7 Aug 2006 13:59:36 -0000	1.16
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx	24 Oct 2006 11:10:32 -0000
@@ -1089,7 +1089,9 @@
                                 OUStringToOString(aResProvider.getResString(FILE_PICKER_TITLE_SAVE ),
                                 RTL_TEXTENCODING_UTF8 ).getStr() );
                                  
-							btn = gtk_dialog_run( GTK_DIALOG( dlg ) );
+                            RunDialog aAnotherRunInMain(dlg);
+                            btn = aAnotherRunInMain.runandwaitforresult();
+
 							gtk_widget_destroy( dlg );
 						}
 		


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.893
retrieving revision 1.894
diff -u -r1.893 -r1.894
--- openoffice.org.spec	23 Oct 2006 13:12:52 -0000	1.893
+++ openoffice.org.spec	24 Oct 2006 11:15:36 -0000	1.894
@@ -135,6 +135,7 @@
 Patch67: openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch
 Patch68: openoffice.org-2.0.4.ooo70601.sd.sal_uInt32_aslong.patch
 Patch69: openoffice.org-2.0.4.ooo69620.vcl.atkcombo.patch
+Patch70: openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1004,6 +1005,7 @@
 %patch67 -p1 -b .ooo70361.vcl.atkfilechooser.patch
 %patch68 -p1 -b .ooo70601.sd.sal_uInt32_aslong.patch
 %patch69 -p1 -b .ooo69620.vcl.atkcombo.patch
+%patch70 -p1 -b .ooo70782.secondaryfpicker.atk.patch
 
 tar xzf %{SOURCE1}
 
@@ -2532,6 +2534,7 @@
 * Mon Oct 23 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.1
 - add openoffice.org-2.0.4.ooo70601.sd.sal_uInt32_aslong.patch
 - Resolves: rhbz#210435 openoffice.org-2.0.4.ooo69620.vcl.atkcombo.patch
+- Resolves: rhbz#211969 add openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch
 
 * Thu Oct 12 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.4
 - add openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch for rh#210440#