From 4ba915cb1f54e994bee6e7d535a2e39f83b7fe33 Mon Sep 17 00:00:00 2001 From: Myagi Date: Mon, 2 Feb 2009 04:43:28 +0100 Subject: [PATCH] fixed some invalid GUIDs for overlay states (maybe old SVN leftovers) changed context menu ID name to TortoiseGit --- src/TortoiseShell/Guids.h | 8 ++++---- src/TortoiseShell/TortoiseSVN.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/TortoiseShell/Guids.h b/src/TortoiseShell/Guids.h index b61bcca..961547f 100644 --- a/src/TortoiseShell/Guids.h +++ b/src/TortoiseShell/Guids.h @@ -46,9 +46,9 @@ DEFINE_GUID(CLSID_Tortoisegit_UPTODATE, DEFINE_GUID(CLSID_Tortoisegit_MODIFIED, 0x8DA7CDCB, 0xDC0B, 0x4246, 0x80, 0xBD, 0x81, 0x2E, 0x94, 0x27, 0x34, 0xAF); -// {30351348-7B7D-4FCC-81B4-1E394CA267EB} +// {475A024D-6157-4e03-8C61-D1FA9806415C} DEFINE_GUID(CLSID_Tortoisegit_CONFLICTING, -0x30351348, 0x7B7D, 0x4FCC, 0x81, 0xB4, 0x1E, 0x39, 0x4C, 0xA2, 0x67, 0xEB); +0x475A024D, 0x6157, 0x4e03, 0x8C, 0x61, 0xD1, 0xFA, 0x98, 0x06, 0x41, 0x5C); // {10A0FDD2-B0C0-4cd4-A7AE-E594CE3B91C8} DEFINE_GUID(CLSID_Tortoisegit_UNCONTROLLED, @@ -62,7 +62,7 @@ DEFINE_GUID(CLSID_Tortoisegit_DROPHANDLER, // {5F380D0B-EE64-479b-B2AD-EF437BF4B0A6} DEFINE_GUID(CLSID_Tortoisegit_READONLY, -0xfbe9c21c, 0x72a4, 0x40fa, 0x95, 0x3a, 0xb2, 0x91, 0xbe, 0x9e, 0xf5, 0xe6); +0x5F380D0B, 0xEE64, 0x479b, 0xB2, 0xAD, 0xEF, 0x43, 0x7b, 0xf4, 0xb0, 0xa6); // {D69716CD-6993-4d0d-898F-5EBBC25C5D4D} @@ -85,5 +85,5 @@ DEFINE_GUID(CLSID_Tortoisegit_IGNORED, // {18BF1135-6EA2-405f-A71E-16EEE7F71F8B} DEFINE_GUID(CLSID_Tortoisegit_UNVERSIONED, -0xec9929cd, 0xb045, 0x4bd9, 0x8e, 0x3d, 0x6f, 0x7e, 0x80, 0x5c, 0xd6, 0x8a); +0x18BF1135, 0x6EA2, 0x405f, 0xA7, 0x1E, 0x16, 0xEE, 0xE7, 0xF7, 0x1F, 0x8B); diff --git a/src/TortoiseShell/TortoiseSVN.cpp b/src/TortoiseShell/TortoiseSVN.cpp index a4c642f..1cc10b8 100644 --- a/src/TortoiseShell/TortoiseSVN.cpp +++ b/src/TortoiseShell/TortoiseSVN.cpp @@ -45,7 +45,7 @@ bool g_ignoredovlloaded = false; bool g_unversionedovlloaded = false; CComCriticalSection g_csGlobalCOMGuard; -LPCTSTR g_MenuIDString = _T("TortoiseSVN"); +LPCTSTR g_MenuIDString = _T("TortoiseGit"); extern std::set g_exts; #pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") -- 2.11.0