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

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Mon Feb 18 16:12:35 2008
New Revision: 11618
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11618&view=rev

Log:
2008-02-18  Jan Holesovsky  <kendy suse cz>

        * patches/src680/webdav-locking-neon24.diff,
          patches/src680/apply: Don't crash with neon 0.24.


Added:
   trunk/patches/src680/webdav-locking-neon24.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Feb 18 16:12:35 2008
@@ -570,6 +570,9 @@
 # Serve dav:// and webdav:// protocols in the WebDAV UCP
 webdav-locking-serve-dav-uri.diff, n#346713, i#29152, jholesov
 
+# Fix the runtime for neon 0.24
+webdav-locking-neon24.diff, n#357048, i#29152, jholesov
+
 [ GnomeVFS < ooh680-m4 ]
 # WebDAV locking
 # It is in this section because it needs part of the gvfs-related patches

Added: trunk/patches/src680/webdav-locking-neon24.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/webdav-locking-neon24.diff	Mon Feb 18 16:12:35 2008
@@ -0,0 +1,17 @@
+--- ucb/source/ucp/webdav/NeonSession.cxx	2008-02-18 16:16:56.000000000 +0100
++++ ucb/source/ucp/webdav/NeonSession.cxx	2008-02-18 16:25:33.000000000 +0100
+@@ -1551,6 +1551,14 @@ void NeonSession::Lockit( ucb::Lock & rL
+     ne_uri aUri;
+     ne_uri_parse( rtl::OUStringToOString( m_aEnv.m_aRequestURI, RTL_TEXTENCODING_UTF8 ).getStr(),
+             &aUri );
++    
++#if NEON_VERSION < 0260
++#define FILLIN( field, val ) aUri.field = aUri.field? aUri.field: strdup( rtl::OUStringToOString( val, RTL_TEXTENCODING_UTF8 ).getStr() )
++    FILLIN( scheme, m_aScheme );
++    FILLIN( host, m_aHostName );
++    aUri.port = aUri.port? aUri.port: m_nPort;
++#undef FILLIN
++#endif
+ 
+     // Create the neon lock
+     NeonLock * theLock = ne_lockstore_findbyuri( s_aNeonLockStore, &aUri );