[Pkg-owncloud-commits] [owncloud-client] 99/115: Windows Shell Integration: Ensure precedence

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 315c2eb4cabe5b80cd99e942c57a76feb2158f8d
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Thu Aug 21 11:05:12 2014 +0200

    Windows Shell Integration: Ensure precedence
---
 .../windows/OCShellExtensions/OCOverlays/DllMain.cpp  |  2 +-
 .../OCShellExtensions/OCOverlays/OverlayConstants.h   | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/shell_integration/windows/OCShellExtensions/OCOverlays/DllMain.cpp b/shell_integration/windows/OCShellExtensions/OCOverlays/DllMain.cpp
index 545f0c9..0539e36 100644
--- a/shell_integration/windows/OCShellExtensions/OCOverlays/DllMain.cpp
+++ b/shell_integration/windows/OCShellExtensions/OCOverlays/DllMain.cpp
@@ -108,7 +108,7 @@ HRESULT RegisterCLSID(LPCOLESTR guidStr, PCWSTR overlayStr, PCWSTR szModule)
 		return hResult;
 	}
 
-	hResult = OCOverlayRegistrationHandler::RegisterCOMObject(szModule, overlayStr, guid);
+	hResult = OCOverlayRegistrationHandler::RegisterCOMObject(szModule, OVERLAY_GENERIC_NAME, guid);
 
 	if (!SUCCEEDED(hResult)) {
 		return hResult;
diff --git a/shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h b/shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h
index 3af9e73..410aa26 100644
--- a/shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h
+++ b/shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h
@@ -22,14 +22,17 @@
 #define OVERLAY_GUID_WARNING		L"{0960F096-F328-48A3-B746-276B1E3C3722}"
 #define OVERLAY_GUID_WARNING_SHARED L"{0960F097-F328-48A3-B746-276B1E3C3722}"
 
-#define OVERLAY_NAME_ERROR			L"OCError"
-#define OVERLAY_NAME_ERROR_SHARED	L"OCErrorShared"
-#define OVERLAY_NAME_OK				L"OCOK"
-#define OVERLAY_NAME_OK_SHARED		L"OCOKShared"
-#define OVERLAY_NAME_SYNC			L"OCSync"
-#define OVERLAY_NAME_SYNC_SHARED	L"OCSyncShared"
-#define OVERLAY_NAME_WARNING		L"OCWarning"
-#define OVERLAY_NAME_WARNING_SHARED	L"OCWarningShared"
+#define OVERLAY_GENERIC_NAME        L"OC Overlay Handler"
+
+// two spaces to put us a head of the competition :/
+#define OVERLAY_NAME_ERROR			L"  OCError"
+#define OVERLAY_NAME_ERROR_SHARED	L"  OCErrorShared"
+#define OVERLAY_NAME_OK				L"  OCOK"
+#define OVERLAY_NAME_OK_SHARED		L"  OCOKShared"
+#define OVERLAY_NAME_SYNC			L"  OCSync"
+#define OVERLAY_NAME_SYNC_SHARED	L"  OCSyncShared"
+#define OVERLAY_NAME_WARNING		L"  OCWarning"
+#define OVERLAY_NAME_WARNING_SHARED	L"  OCWarningShared"
 
 #define REGISTRY_OVERLAY_KEY		L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ShellIconOverlayIdentifiers"
 #define REGISTRY_CLSID				L"CLSID"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git