ooo-build r12206 - in branches/sled-10-sp2-ooo-build-2-4: . patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Thu Apr 17 21:34:46 2008
New Revision: 12206
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12206&view=rev

Log:
2008-04-17  Michael Meeks  <michael meeks novell com>

	* patches/src680/sfx2-quickstarter-fix.diff,
	* patches/src680/apply: fix bug introduced into the gtk+
	quickstarter up-stream, i#88382



Added:
   branches/sled-10-sp2-ooo-build-2-4/patches/src680/sfx2-quickstarter-fix.diff
Modified:
   branches/sled-10-sp2-ooo-build-2-4/ChangeLog
   branches/sled-10-sp2-ooo-build-2-4/patches/src680/apply

Modified: branches/sled-10-sp2-ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/sled-10-sp2-ooo-build-2-4/patches/src680/apply	(original)
+++ branches/sled-10-sp2-ooo-build-2-4/patches/src680/apply	Thu Apr 17 21:34:46 2008
@@ -572,6 +572,9 @@
 
 
 [ QuickStarter ]
+# fix the systray quickstarter
+sfx2-quickstarter-fix.diff, i#88382, michael
+
 # External splash screen implementation / 2nd time accelerator
 unxsplash-rework.diff, i#60696, michael/jholesov
 

Added: branches/sled-10-sp2-ooo-build-2-4/patches/src680/sfx2-quickstarter-fix.diff
==============================================================================
--- (empty file)
+++ branches/sled-10-sp2-ooo-build-2-4/patches/src680/sfx2-quickstarter-fix.diff	Thu Apr 17 21:34:46 2008
@@ -0,0 +1,19 @@
+Index: sfx2/source/appl/shutdownicon.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/appl/shutdownicon.cxx,v
+retrieving revision 1.61
+diff -u -p -r1.61 shutdownicon.cxx
+--- sfx2/source/appl/shutdownicon.cxx	2 Nov 2007 13:13:41 -0000	1.61
++++ sfx2/source/appl/shutdownicon.cxx	17 Apr 2008 10:37:07 -0000
+@@ -531,9 +531,8 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogCl
+         }
+     }
+ 
+-#ifdef WNT
+-        LeaveModalMode();
+-#endif
++    LeaveModalMode();
++
+     return 0;
+ }
+