rpms/openoffice.org/devel workspace.vcl112.patch, NONE, 1.1 openoffice.org.spec, 1.2231, 1.2232

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23978/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl112.patch 
Log Message:
Resolves: rhbz#596980 workspace.vcl112.patch

workspace.vcl112.patch:
 sm.cxx |   45 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 10 deletions(-)

--- NEW FILE workspace.vcl112.patch ---
diff -r 0b1cfa88a648 vcl/unx/source/app/sm.cxx
--- a/vcl/unx/source/app/sm.cxx	Mon May 31 20:37:41 2010 +0100
+++ b/vcl/unx/source/app/sm.cxx	Mon May 31 20:56:43 2010 +0100
@@ -159,6 +159,10 @@
     static int nWakeupFiles[2];
     static oslMutex ICEMutex;
     static oslThread ICEThread;
+#ifdef USE_SM_EXTENSION
+    static IceIOErrorHandler origIOErrorHandler;
+    static IceErrorHandler origErrorHandler;
+#endif
 public:
 
 	static void activate();
@@ -179,6 +183,19 @@
 oslThread			ICEConnectionObserver::ICEThread				= NULL;
 int					ICEConnectionObserver::nWakeupFiles[2]			= { 0, 0 };
 
+#ifdef USE_SM_EXTENSION
+IceIOErrorHandler ICEConnectionObserver::origIOErrorHandler = NULL;
+IceErrorHandler ICEConnectionObserver::origErrorHandler = NULL;
+
+static void IgnoreIceErrors(IceConn, Bool, int, unsigned long, int, int, IcePointer)
+{
+}
+
+static void IgnoreIceIOErrors(IceConn)
+{
+}
+#endif
+
 // HACK
 bool SessionManagerClient::bDocSaveDone = false;
 
@@ -585,25 +602,33 @@
 
 void ICEConnectionObserver::activate()
 {
-	if( ! bIsWatching )
-	{
+    if( ! bIsWatching )
+    {
         nWakeupFiles[0] = nWakeupFiles[1] = 0;
         ICEMutex = osl_createMutex();
-		bIsWatching = TRUE;
+        bIsWatching = TRUE;
 #ifdef USE_SM_EXTENSION
-		IceAddConnectionWatch( ICEWatchProc, NULL );
+        /*
+         * Default handlers call exit, we don't care that strongly if something
+         * happens to fail
+         */
+        origIOErrorHandler = IceSetIOErrorHandler( IgnoreIceIOErrors );
+        origErrorHandler = IceSetErrorHandler( IgnoreIceErrors );
+        IceAddConnectionWatch( ICEWatchProc, NULL );
 #endif
-	}
+    }
 }
 
 void ICEConnectionObserver::deactivate()
 {
-	if( bIsWatching )
-	{
+    if( bIsWatching )
+    {
         lock();
-		bIsWatching = FALSE;
+        bIsWatching = FALSE;
 #ifdef USE_SM_EXTENSION
-		IceRemoveConnectionWatch( ICEWatchProc, NULL );
+        IceRemoveConnectionWatch( ICEWatchProc, NULL );
+        IceSetErrorHandler( origErrorHandler );
+        IceSetIOErrorHandler( origIOErrorHandler );
 #endif
         nConnections = 0;
         if( ICEThread )
@@ -622,7 +647,7 @@
         }
         osl_destroyMutex( ICEMutex );
         ICEMutex = NULL;
-	}
+    }
 }
 
 void ICEConnectionObserver::wakeup()


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2231
retrieving revision 1.2232
diff -u -p -r1.2231 -r1.2232
--- openoffice.org.spec	4 Jun 2010 05:28:47 -0000	1.2231
+++ openoffice.org.spec	4 Jun 2010 09:05:32 -0000	1.2232
@@ -145,6 +145,7 @@ Patch74: workspace.cmcfixes75.patch
 Patch75: openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch
 Patch76: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
 Patch77: workspace.os140.patch
+Patch78: workspace.vcl112.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1703,6 +1704,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch75 -p0 -b .ooo112027.writerfilter.avoid.recursetodeath.patch
 %patch76 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
 %patch77 -p1 -b .workspace.os140.patch
+%patch78 -p1 -b .workspace.vcl112.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4195,6 +4197,7 @@ fi
 %changelog
 * Fri Jun 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.7
 - Resolves: rhbz#599585 workspace.os140.patch (dtardon)
+- Resolves: rhbz#596980 workspace.vcl112.patch (caolanm)
 
 * Thu Jun 03 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.6
 - Resolves: rhbz#599287 openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch (dtardon)