ooo-build r12081 - in trunk: . patches/dev300 patches/src680

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Tue Apr  1 17:40:59 2008
New Revision: 12081
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12081&view=rev

Log:
2008-04-01  Jan Holesovsky  <kendy suse cz>

        * patches/src680/unxsplash-new-osl-pipe-slot.diff,
          patches/src680/apply,
          patches/dev300/apply: Fix slot:5050 handling again (after the change
          of the OSL pipe protocol).


Added:
   trunk/patches/src680/unxsplash-new-osl-pipe-slot.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/src680/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Apr  1 17:40:59 2008
@@ -473,9 +473,6 @@
 # Map ETXTBSY errno to locking violation, necessary for CIFS
 gnome-vfs-cifs-locking.diff, n#333001, jholesov
 
-# Move gnome-vfs out of the startup sequence, load it only when needed
-gnome-vfs-late-init.diff, i#84137, jholesov
-
 # Keep the file read/write after reload
 gnome-vfs-reload.diff, n#264140, jholesov
 
@@ -513,6 +510,10 @@
 # unlock the stream on crash/terminate/...
 webdav-locking-unlock-on-crash.diff, i#29152, jholesov
 
+# NOT LOCKING RELATED!
+# Move gnome-vfs out of the startup sequence, load it only when needed
+gnome-vfs-late-init.diff, i#84137, jholesov
+
 
 [ QuickStarter ]
 # External splash screen implementation / 2nd time accelerator
@@ -521,6 +522,9 @@
 # handling of osl pipe has changed, see i#84045
 unxsplash-new-osl-pipe.diff, i#60696, jholesov
 
+# fix the slot: handling again :-(
+unxsplash-new-osl-pipe-slot.diff, i#60696, n#375529, jholesov
+
 # when OOo fails during startup, don't loop endlessly
 unxsplash-finish-on-hangup.diff, i#60696, n#357659, jholesov
 

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Apr  1 17:40:59 2008
@@ -521,9 +521,6 @@
 # Map ETXTBSY errno to locking violation, necessary for CIFS
 gnome-vfs-cifs-locking.diff, n#333001, jholesov
 
-# Move gnome-vfs out of the startup sequence, load it only when needed
-gnome-vfs-late-init.diff, i#84137, jholesov
-
 # Keep the file read/write after reload
 gnome-vfs-reload.diff, n#264140, jholesov
 
@@ -561,6 +558,10 @@
 # unlock the stream on crash/terminate/...
 webdav-locking-unlock-on-crash.diff, i#29152, jholesov
 
+# NOT LOCKING RELATED!
+# Move gnome-vfs out of the startup sequence, load it only when needed
+gnome-vfs-late-init.diff, i#84137, jholesov
+
 
 [ QuickStarter ]
 # External splash screen implementation / 2nd time accelerator
@@ -569,6 +570,9 @@
 # handling of osl pipe has changed, see i#84045
 unxsplash-new-osl-pipe.diff, i#60696, jholesov
 
+# fix the slot: handling again :-(
+unxsplash-new-osl-pipe-slot.diff, i#60696, n#375529, jholesov
+
 # when OOo fails during startup, don't loop endlessly
 unxsplash-finish-on-hangup.diff, i#60696, n#357659, jholesov
 

Added: trunk/patches/src680/unxsplash-new-osl-pipe-slot.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/unxsplash-new-osl-pipe-slot.diff	Tue Apr  1 17:40:59 2008
@@ -0,0 +1,14 @@
+diff --git desktop/unx/source/start.c desktop/unx/source/start.c
+index 95435a3..f7b762e 100644
+--- desktop/unx/source/start.c
++++ desktop/unx/source/start.c
+@@ -331,7 +331,8 @@ send_args( int fd, rtl_uString *pCwdPath )
+ 
+         // this is not a param, we have to prepend filenames with file://
+         // FIXME: improve the check
+-        if ( pTmp->buffer[0] != (sal_Unicode)'-' )
++        if ( ( pTmp->buffer[0] != (sal_Unicode)'-' ) &&
++             ( rtl_ustr_indexOfAscii_WithLength( pTmp->buffer, pTmp->length, "slot:", 5 /* length */ ) ) )
+         {
+             sal_Int32 nFirstColon = rtl_ustr_indexOfChar_WithLength( pTmp->buffer, pTmp->length, ':' );
+             sal_Int32 nFirstSlash = rtl_ustr_indexOfChar_WithLength( pTmp->buffer, pTmp->length, '/' );