2 Subject: Hardcode app starter for default check |
2 Subject: Hardcode app starter for default check |
3 |
3 |
4 diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp |
4 diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp |
5 --- a/browser/components/shell/src/nsGNOMEShellService.cpp |
5 --- a/browser/components/shell/src/nsGNOMEShellService.cpp |
6 +++ b/browser/components/shell/src/nsGNOMEShellService.cpp |
6 +++ b/browser/components/shell/src/nsGNOMEShellService.cpp |
7 @@ -127,17 +127,21 @@ nsGNOMEShellService::Init() |
7 @@ -105,22 +105,26 @@ nsresult |
8 nsCOMPtr<nsILocalFile> appPath; |
8 nsGNOMEShellService::Init() |
9 rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile), |
9 { |
10 getter_AddRefs(appPath)); |
10 nsresult rv; |
11 NS_ENSURE_SUCCESS(rv, rv); |
|
12 |
11 |
13 rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME)); |
12 // GConf _must_ be available, or we do not allow |
14 NS_ENSURE_SUCCESS(rv, rv); |
13 // CreateInstance to succeed. |
15 |
14 |
16 - return appPath->GetNativePath(mAppPath); |
15 nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID); |
|
16 + if (!gconf) |
|
17 + return NS_ERROR_NOT_AVAILABLE; |
|
18 + |
17 + /* This path to firefox is hardcoded for the default path setting */ |
19 + /* This path to firefox is hardcoded for the default path setting */ |
18 + mAppPath.Assign ("/usr/bin/firefox"); |
20 + mAppPath.Assign("/usr/bin/firefox"); |
19 + |
|
20 + //return appPath->GetNativePath(mAppPath); |
|
21 + return NS_OK; |
21 + return NS_OK; |
22 } |
22 + |
|
23 nsCOMPtr<nsIGIOService> giovfs = |
|
24 do_GetService(NS_GIOSERVICE_CONTRACTID); |
23 |
25 |
24 NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService) |
26 - if (!gconf) |
|
27 - return NS_ERROR_NOT_AVAILABLE; |
|
28 - |
|
29 // Check G_BROKEN_FILENAMES. If it's set, then filenames in glib use |
|
30 // the locale encoding. If it's not set, they use UTF-8. |
|
31 mUseLocaleFilenames = PR_GetEnv("G_BROKEN_FILENAMES") != nsnull; |
25 |
32 |
26 PRBool |
33 nsCOMPtr<nsIProperties> dirSvc |
27 nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const |
34 (do_GetService("@mozilla.org/file/directory_service;1")); |
28 { |
35 NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE); |
29 |
36 |