From 3b88620c177a96dd0351912ded46d71da479e7f5 Mon Sep 17 00:00:00 2001 From: "ssu%netscape.com" Date: Thu, 14 Sep 2000 23:05:57 +0000 Subject: [PATCH] fixing bugsgape #2279 - shrimp uninstall fails. r=sgehani. affects windows platforms only --- xpinstall/wizard/windows/setup/extra.c | 6 +++--- xpinstall/wizard/windows/uninstall/extra.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xpinstall/wizard/windows/setup/extra.c b/xpinstall/wizard/windows/setup/extra.c index b4d4c752e300..58c540801c83 100644 --- a/xpinstall/wizard/windows/setup/extra.c +++ b/xpinstall/wizard/windows/setup/extra.c @@ -5081,15 +5081,15 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize) wsprintf(szVariable, "Software\\Netscape\\Netscape 6\\%s", szBuf); } - else if(lstrcmpi(szVariable, "Netscape Instant Messenger CurrentVersion") == 0) + else if(lstrcmpi(szVariable, "Netscape Netbusiness Messenger CurrentVersion") == 0) { /* parse for the current Netscape WinReg key */ - GetWinReg(HKEY_LOCAL_MACHINE, "Software\\Netscape\\Netscape Instant Messenger", "CurrentVersion", szBuf, sizeof(szBuf)); + GetWinReg(HKEY_LOCAL_MACHINE, "Software\\Netscape\\Netscape Netbusiness Messenger", "CurrentVersion", szBuf, sizeof(szBuf)); if(*szBuf == '\0') return(FALSE); - wsprintf(szVariable, "Software\\Netscape\\Netscape Instant Messenger\\%s", szBuf); + wsprintf(szVariable, "Software\\Netscape\\Netscape Netbusiness Messenger\\%s", szBuf); } else if(lstrcmpi(szVariable, "Mozilla Seamonkey CurrentVersion") == 0) { diff --git a/xpinstall/wizard/windows/uninstall/extra.c b/xpinstall/wizard/windows/uninstall/extra.c index a3da8b86d2f0..0251a985ef57 100644 --- a/xpinstall/wizard/windows/uninstall/extra.c +++ b/xpinstall/wizard/windows/uninstall/extra.c @@ -1501,19 +1501,19 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize) wsprintf(szVariable, "Software\\Netscape\\Netscape 6\\%s", szBuf); } - else if(lstrcmpi(szVariable, "WinRegKey Netscape Instant Messenger") == 0) + else if(lstrcmpi(szVariable, "WinRegKey Netscape Netbusiness Messenger") == 0) { - lstrcpy(szVariable, "Software\\Netscape\\Netscape Instant Messenger"); + lstrcpy(szVariable, "Software\\Netscape\\Netscape Netbusiness Messenger"); } - else if(lstrcmpi(szVariable, "Netscape Instant Messenger CurrentVersion") == 0) + else if(lstrcmpi(szVariable, "Netscape Netbusiness Messenger CurrentVersion") == 0) { /* parse for the current Netscape WinReg key */ - GetWinReg(HKEY_LOCAL_MACHINE, "Software\\Netscape\\Netscape Instant Messenger", "CurrentVersion", szBuf, sizeof(szBuf)); + GetWinReg(HKEY_LOCAL_MACHINE, "Software\\Netscape\\Netscape Netbusiness Messenger", "CurrentVersion", szBuf, sizeof(szBuf)); if(*szBuf == '\0') return(FALSE); - wsprintf(szVariable, "Software\\Netscape\\Netscape Instant Messenger\\%s", szBuf); + wsprintf(szVariable, "Software\\Netscape\\Netscape Netbusiness Messenger\\%s", szBuf); } else if(lstrcmpi(szVariable, "WinRegKey Mozilla Seamonkey") == 0) {