[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                        |    1 
 patches/dev300/win32-quickstarter-exit.diff |   38 ----------------------------
 2 files changed, 39 deletions(-)

New commits:
commit 69e9c654b525719c44482c755e020741dabd3931
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 18:09:07 2011 +0300

    Kill win32-quickstarter-exit.diff
    
    It had been in the UnUsedButNotYetRemovedFromGit set for long.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d580786..72d0fc5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1196,7 +1196,6 @@ dont-check-fqdn.diff
 [ UnUsedButNotYetRemovedFromGit ]
 # diffs kept for reference as there might soon be a need to resurrect
 # part of the code
-win32-quickstarter-exit.diff, i#73550, tml
 novell-win32-avoid-premature-shutdown.diff, n#269146, tml
 
 # Provides a great speed-up for a mail merge operation : 7x faster
diff --git a/patches/dev300/win32-quickstarter-exit.diff b/patches/dev300/win32-quickstarter-exit.diff
deleted file mode 100644
index bda2933..0000000
--- a/patches/dev300/win32-quickstarter-exit.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- sfx2/source/appl/shutdowniconw32.cxx
-+++ sfx2/source/appl/shutdowniconw32.cxx
-@@ -472,10 +472,15 @@ LRESULT CALLBACK listenerWndProc( HWND h
-                             nid.hWnd = hWnd;
-                             nid.uID = ID_QUICKSTART;
-                             Shell_NotifyIconA(NIM_DELETE, &nid);
-+                            if( aExecuterWindow == NULL &&
-+                                aListenerWindow == NULL )
-+                                if ( !ShutdownIcon::bModalMode )
-+                                    ShutdownIcon::terminateDesktop();
-+                                
-                             break;
-                     }
--
--					PostMessage( aExecuterWindow, WM_COMMAND, m, (LPARAM)hWnd );
-+                    if( aExecuterWindow != NULL )
-+                        PostMessage( aExecuterWindow, WM_COMMAND, m, (LPARAM)hWnd );
-                 }
-                 break;
-             }
-@@ -679,12 +684,13 @@ void win32_shutdown_sys_tray()
- 	if ( ShutdownIcon::IsQuickstarterInstalled() )
- 	{
- 		if( IsWindow( aListenerWindow ) )
--		{
- 			DestroyWindow( aListenerWindow );
--			aListenerWindow = NULL;
-+        aListenerWindow = NULL;
-+
-+        if( IsWindow( aExecuterWindow ) )
- 			DestroyWindow( aExecuterWindow );
--			aExecuterWindow = NULL;
--		}
-+        aExecuterWindow = NULL;
-+
- 		UnregisterClassA( QUICKSTART_CLASSNAME, GetModuleHandle( NULL ) );
- 		UnregisterClassA( EXECUTER_WINDOWCLASS, GetModuleHandle( NULL ) );
- 	}