From a3ad7ea0fda79dbe83099600410f43cd6b1992fa Mon Sep 17 00:00:00 2001 From: "bryner%netscape.com" Date: Tue, 27 Aug 2002 04:08:31 +0000 Subject: [PATCH] Sync with API changes. git-svn-id: svn://10.0.0.236/trunk@128226 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/xre/nsAppRunner.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mozilla/toolkit/xre/nsAppRunner.cpp b/mozilla/toolkit/xre/nsAppRunner.cpp index 33bd16b0062..f69c3687fc6 100644 --- a/mozilla/toolkit/xre/nsAppRunner.cpp +++ b/mozilla/toolkit/xre/nsAppRunner.cpp @@ -486,7 +486,7 @@ static nsresult OpenWindow(const nsAFlatCString& aChromeURL, } } - sarg->SetData(aAppArgs.get()); + sarg->SetData(aAppArgs); nsCAutoString features("chrome,dialog=no,all"); if (aHeight != nsIAppShellService::SIZE_TO_CONTENT) { @@ -521,12 +521,14 @@ static void DumpArbitraryHelp() rv = e->GetNext(getter_AddRefs(catEntry)); if (NS_FAILED(rv) || !catEntry) break; - nsXPIDLCString entryString; - rv = catEntry->GetData(getter_Copies(entryString)); - if (NS_FAILED(rv) || !((const char *)entryString)) break; + nsCAutoString entryString; + rv = catEntry->GetData(entryString); + if (NS_FAILED(rv) || entryString.IsEmpty()) break; nsXPIDLCString contractidString; - rv = catman->GetCategoryEntry(COMMAND_LINE_ARGUMENT_HANDLERS,(const char *)entryString, getter_Copies(contractidString)); + rv = catman->GetCategoryEntry(COMMAND_LINE_ARGUMENT_HANDLERS + entryString.get(), + getter_Copies(contractidString)); if (NS_FAILED(rv) || !((const char *)contractidString)) break; #ifdef DEBUG_CMD_LINE