From 2ce1f193d9bac4839d6414d69609c6d70e2cb2a6 Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net"
 <bsmedberg%covad.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 23 Jan 2005 23:08:00 +0000
Subject: [PATCH] From bug 276588 - additional BEOS-specific fixup. patch by
 Simon Taylor <simontaylor2@gawab.com>, r=me

git-svn-id: svn://10.0.0.236/trunk@168214 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../toolkit/components/commandlines/src/nsCommandLine.cpp    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mozilla/toolkit/components/commandlines/src/nsCommandLine.cpp b/mozilla/toolkit/components/commandlines/src/nsCommandLine.cpp
index 96a0f7ac348..c842fc31e96 100644
--- a/mozilla/toolkit/components/commandlines/src/nsCommandLine.cpp
+++ b/mozilla/toolkit/components/commandlines/src/nsCommandLine.cpp
@@ -61,6 +61,7 @@
 #include <shlobj.h>
 #elif defined(XP_BEOS)
 #include <Path.h>
+#include <Directory.h>
 #elif defined(XP_UNIX)
 #include <unistd.h>
 #endif
@@ -303,11 +304,11 @@ nsCommandLine::ResolveFile(const nsAString& aArgument, nsIFile* *aResult)
 
   BDirectory bwd(wd.get());
 
-  BPath resolved(bwd, carg.get(), true);
+  BPath resolved(&bwd, carg.get(), true);
   if (resolved.InitCheck() != B_OK)
     return NS_ERROR_FAILURE;
 
-  rv = lf->InitWithNativePath(BPath.Path());
+  rv = lf->InitWithNativePath(nsDependentCString(resolved.Path()));
   if (NS_FAILED(rv)) return rv;
 
   NS_ADDREF(*aResult = lf);