ooo-build r11402 - in trunk: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Jan 24 13:18:11 2008
New Revision: 11402
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11402&view=rev

Log:
+	  patches/src680/webdav-locking-m3.diff,
+	  patches/src680/webdav-locking.diff: ooh680-m4


Added:
   trunk/patches/src680/webdav-locking-m3.diff
      - copied unchanged from r11400, /trunk/patches/src680/webdav-locking.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/webdav-locking.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Jan 24 13:18:11 2008
@@ -539,10 +539,15 @@
 # Move gnome-vfs out of the startup sequence, load it only when needed
 gnome-vfs-late-init.diff, i#84137, jholesov
 
+[ GnomeVFS >= ooh680-m4 ]
 # WebDAV locking
 # It is in this section because it needs part of the gvfs-related patches
 webdav-locking.diff, n#346711, i#29152, jholesov
 
+[ GnomeVFS < ooh680-m4 ]
+# WebDAV locking
+# It is in this section because it needs part of the gvfs-related patches
+webdav-locking-m3.diff, n#346711, i#29152, jholesov
 
 [ QuickStarter < ooh680-m2 ]
 # External splash screen implementation / 2nd time accelerator

Modified: trunk/patches/src680/webdav-locking.diff
==============================================================================
--- trunk/patches/src680/webdav-locking.diff	(original)
+++ trunk/patches/src680/webdav-locking.diff	Thu Jan 24 13:18:11 2008
@@ -1435,39 +1435,42 @@
                  // PULL: wait for client read
                  try
                  {
-@@ -2192,39 +2271,58 @@ uno::Any Content::open(
+@@ -2226,43 +2226,61 @@
                      // fill inputsream sync; return if all data present
                      DAVResource aResource;
                      std::vector< rtl::OUString > aHeaders;
 -//                        // Obtain list containing all HTTP headers that can
 -//                        // be mapped to UCB properties.
 -//                        ContentProperties::getMappableHTTPHeaders( aHeaders );
--                    uno::Reference< io::XInputStream > xIn
 +                    //                        // Obtain list containing all HTTP headers that can
 +                    //                        // be mapped to UCB properties.
 +                    //                        ContentProperties::getMappableHTTPHeaders( aHeaders );
-+
+ 
+-                    uno::Reference< io::XInputStream > xIn
 +                    // if the locking or the creation of the stream below
-+                    // fails, we are read only at the next try
-+                    m_bForceReadOnly = sal_True;
-+
-+                    m_xResAccess->LOCK( aLock, xEnv );
++		    // fails, we are read only at the next try
++		    m_bForceReadOnly = sal_True;
 +
-+                    uno::Reference< io::XStream > xStream
-                         = m_xResAccess->GET( aHeaders, aResource, xEnv );
++		    m_xResAccess->LOCK( aLock, xEnv );
 +
++		    uno::Reference< io::XStream > xStream
+                         = xResAccess->GET( aHeaders, aResource, xEnv );
+ 
 +                    // pass the lock to the stream
-+                    static_cast< NeonInputStream* >( xStream.get() )->SetLock( aLock, m_xResAccess->getURL() );
++		    static_cast< NeonInputStream* >( xStream.get() )->SetLock( aLock, m_xResAccess->getURL() );
 +
-+                    // everything went well wrt. locking
-+                    m_bForceReadOnly = sal_False;
-                     
++		    // everything went well wrt. locking
++		    m_bForceReadOnly = sal_False;
                      {
++
                          osl::MutexGuard aGuard( m_aMutex );
- 
                          m_xCachedProps.reset(
 -                            new ContentProperties( aResource ) );
-+                                new ContentProperties( aResource ) );
++                            	new ContentProperties( aResource ) );
+ 
+                         m_xResAccess.reset( 
+                             new DAVResourceAccess( *xResAccess.get() ) );
+ 
                      }
  
 -                    xDataSink->setInputStream( xIn );
@@ -1475,8 +1478,8 @@
                  }
                  catch ( DAVException const & e )
                  {
-+                    m_xResAccess->UNLOCK( aLock, xEnv );
-+                    m_bForceReadOnly = sal_False;
++		    m_xResAccess->UNLOCK( aLock, xEnv );
++		    m_bForceReadOnly = sal_False;
 +
                      cancelCommandExecution( e, xEnv );
                      // Unreachable