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

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Mon Feb 11 11:34:08 2008
New Revision: 11546
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11546&view=rev

Log:
        * patches/src680/unxsplash-finish-on-hangup.diff: Finish oosplash when
          OOo fails during startup.


Added:
   trunk/patches/src680/unxsplash-finish-on-hangup.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Feb 11 11:34:08 2008
@@ -574,6 +574,9 @@
 # handling of osl pipe has changed, see i#84045
 unxsplash-new-osl-pipe.diff, i#60696, jholesov
 
+# when OOo fails during startup, don't loop endlessly
+unxsplash-finish-on-hangup.diff, i#60696, n#357659, jholesov
+
 [ QuickStarter < ooh680-m5 ]
 # libstartup-notification is not necessary with oosplash.bin
 libsn-removal.diff, i#84179, jholesov

Added: trunk/patches/src680/unxsplash-finish-on-hangup.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/unxsplash-finish-on-hangup.diff	Mon Feb 11 11:34:08 2008
@@ -0,0 +1,13 @@
+--- desktop/unx/source/start.c	2008-02-11 12:05:50.000000000 +0100
++++ desktop/unx/source/start.c	2008-02-11 12:05:45.000000000 +0100
+@@ -568,7 +568,9 @@ show_splash( int status_fd )
+ 
+         /* read from pipe if data available */
+         nRetval = poll( &aPfd, 1, 50 );
+-        if ( nRetval > 0 )
++        if ( aPfd.revents & ( POLLERR | POLLHUP | POLLNVAL ) )
++            bFinish = sal_True;
++        else if ( nRetval > 0 )
+             bFinish = !read_percent( status_fd, &nPercent );
+         else if ( nRetval < 0 )
+             bFinish = sal_True;