Bug 791694 - Use XRE_EXECUTABLE_FILE in browser shell instead of guesswork from NS_XPCOM_CURRENT_PROCESS_DIR and MOZ_APP_NAME. r=jimm

This commit is contained in:
Mike Hommey
2012-12-14 08:32:54 +01:00
parent b0cdbdbf89
commit 4f35d40614
2 changed files with 5 additions and 6 deletions

View File

@@ -30,6 +30,7 @@
#ifdef MOZ_WIDGET_GTK2
#include "nsIImageToPixbuf.h"
#endif
#include "nsXULAppAPI.h"
#include <glib.h>
#include <glib-object.h>
@@ -108,13 +109,10 @@ nsGNOMEShellService::Init()
NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE);
nsCOMPtr<nsIFile> appPath;
rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile),
rv = dirSvc->Get(XRE_EXECUTABLE_FILE, NS_GET_IID(nsIFile),
getter_AddRefs(appPath));
NS_ENSURE_SUCCESS(rv, rv);
rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME));
NS_ENSURE_SUCCESS(rv, rv);
return appPath->GetNativePath(mAppPath);
}