ooo-build r11547 - in branches/ooo-build-2-3: . patches/src680

[jholesovsky svn gnome org]

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

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

        * patches/src680/unxsplash-finish-on-hangup.diff: Finish oosplash when
          OOo fails during startup. (merge from trunk)


Added:
   branches/ooo-build-2-3/patches/src680/unxsplash-finish-on-hangup.diff   (props changed)
      - copied unchanged from r11546, /trunk/patches/src680/unxsplash-finish-on-hangup.diff
Modified:
   branches/ooo-build-2-3/ChangeLog
   branches/ooo-build-2-3/patches/src680/apply

Modified: branches/ooo-build-2-3/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-3/patches/src680/apply	(original)
+++ branches/ooo-build-2-3/patches/src680/apply	Mon Feb 11 11:37:47 2008
@@ -561,6 +561,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 < oog680-m8]
 # External splash screen implementation / 2nd time accelerator
 unxsplash-rework-m7.diff, i#60696, michael/jholesov