From c76137a92c3a9e2e321af806f02361d9a59b4454 Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Sun, 22 Jun 2003 16:20:32 +0000 Subject: [PATCH] 209985 patch by bugzilla@pippo.demon.co.uk r=cavin sr=dmose MAPI does not check HKEY_CURRENT_USER for default mail client git-svn-id: svn://10.0.0.236/trunk@144041 18797224-902f-48f8-a5cc-f745e15eee43 --- .../mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp b/mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp index 0904c9a101a..2227e81ff9e 100644 --- a/mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp +++ b/mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp @@ -230,8 +230,14 @@ PRBool nsMapiRegistryUtils::IsDefaultMailClient() { if (!isSmartDll() && !isMozDll()) return PR_FALSE; + //first try to get the users default mail client nsCAutoString name; - GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Clients\\Mail", "", name); + GetRegistryKey(HKEY_CURRENT_USER, "Software\\Clients\\Mail", "", name); + //if that fails then get the machine's default client + if(name.IsEmpty()){ + GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Clients\\Mail", "", name); + } + if (!name.IsEmpty()) { nsCAutoString keyName("Software\\Clients\\Mail\\"); keyName += name.get();