Bug 1074006 - Cleanup nsMailApp.cpp due to new GreBinD directory key. r=RattyAway. a=Standard8
authorJosiah Bruner <josiah@programmer.net>
Tue, 14 Oct 2014 13:42:40 -0400
changeset 25545 319ab9965c8155358787e13a64e21457c321262f
parent 25544 e5dd01e8191de8d1a0e56c9c31f23ed0ca35c31e
child 25546 899d3c254de4e691f7cf2225408775a941773a55
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRattyAway, Standard8
bugs1074006
Bug 1074006 - Cleanup nsMailApp.cpp due to new GreBinD directory key. r=RattyAway. a=Standard8
mail/app/nsMailApp.cpp
--- a/mail/app/nsMailApp.cpp
+++ b/mail/app/nsMailApp.cpp
@@ -181,20 +181,17 @@ static int do_main(int argc, char* argv[
     if (NS_FAILED(rv)) {
       Output("Couldn't find the application directory.\n");
       return 255;
     }
 
     nsCOMPtr<nsIFile> greDir;
     exeFile->GetParent(getter_AddRefs(greDir));
 #ifdef XP_MACOSX
-    nsCOMPtr<nsIFile> parent;
-    greDir->GetParent(getter_AddRefs(parent));
-    greDir = parent.forget();
-    greDir->AppendNative(NS_LITERAL_CSTRING(kOSXResourcesFolder));
+    greDir->SetNativeLeafName(NS_LITERAL_CSTRING(kOSXResourcesFolder));
 #endif
     SetStrongPtr(appData.directory, static_cast<nsIFile*>(greDir.get()));
     // xreDirectory already has a refcount from NS_NewLocalFile
     appData.xreDirectory = xreDirectory;
 
     result = XRE_main(argc, argv, &appData, mainFlags);
   }
   return result;