277833 - Land Aviary MAPI Changes

Status: RESOLVED FIXED

(Thunderbird :: General, defect)

Description

[Scott MacGregor]

Generic tracking bug for landing the MAPI changes on the branch back to the
trunk. This includes adding the ability to register as a News handler and
support for setting the registry keys for brining up the Thunderbird options
dialog.

Comment 1

[Scott MacGregor]

Attachment: first cut at the merge

Comment 2

[Scott MacGregor]

Comment on attachment 170861 [details] [diff] [review]
first cut at the merge

time to get this landed and off the trunk merge list.

Comment 3

[David :Bienvenu]

Comment on attachment 170861 [details] [diff] [review]
first cut at the merge

+      OS registry entries to make us show up as regsitered mail and news
client
+	  in the OS
+   */

is there a tab here?

+    // we need to get the value from registry everytime

every time

are there tabs in nsMapiRegistryUtils::RegCopyKey?

more tabs, or just slightly off indentation, or just a -uw artifact?

-    rv = SetRegistryKey(HKEY_LOCAL_MACHINE,
"Software\\Classes\\news\\DefaultIcon", "", (char *)iconPath.get());
-    NS_ENSURE_SUCCESS(rv, rv);
+	 nsCAutoString iconKey (keyName);
+	 iconKey.AppendLiteral("\\DefaultIcon");
+	 rv = SetRegistryKey(HKEY_LOCAL_MACHINE, iconKey.get(),"", (char
*)iconPath.get());
+    }


+    rv = saveDefaultMailClient();
+    
+    if (NS_FAILED(saveUserDefaultMailClient()) || NS_FAILED(rv)) 
+      return NS_ERROR_FAILURE;
+    

I don't like dropping the rv here. This could be:

rv = saveDefaultMailClient();
if (NS_SUCCEEDED(rv))
  rv = saveUserDefaultMailClient();
NS_ENSURE_SUCCESS(rv, rv)

similarly here:

-	 if (NS_FAILED(RestoreBackedUpMapiDll())) return NS_ERROR_FAILURE;
+	 if (NS_FAILED(RestoreBackedUpMapiDll())) 
+	   return NS_ERROR_FAILURE;


can just be result = RestoreBackedUpMapiDll();
NS_ENSURE_SUCCESS(result, result);

sr = bienvenu with those nits.

Comment 4

[Scott MacGregor]

fixed

Comment 5

[Stephen Donner [:stephend] Not actively reading bugmail]

This checkin caused bug 279627, which has been broken in Seamonkey trunk for a
month now.