author | Wolfgang Rosenauer <wr@rosenauer.org> |
Thu, 11 Nov 2010 12:54:25 +0100 | |
changeset 195 | 50b5cb1f2b86 |
parent 137 | 5bf88897596f |
permissions | -rw-r--r-- |
8 | 1 |
From: Wolfgang Rosenauer <wr@rosenauer.org> |
2 |
Subject: Hardcode app starter for default check |
|
3 |
||
0 | 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 |
|
6 |
+++ b/browser/components/shell/src/nsGNOMEShellService.cpp |
|
137
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
7 |
@@ -105,22 +105,26 @@ nsresult |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
8 |
nsGNOMEShellService::Init() |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
9 |
{ |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
10 |
nsresult rv; |
0 | 11 |
|
137
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
12 |
// GConf _must_ be available, or we do not allow |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
13 |
// CreateInstance to succeed. |
0 | 14 |
|
137
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
15 |
nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID); |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
16 |
+ if (!gconf) |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
17 |
+ return NS_ERROR_NOT_AVAILABLE; |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
18 |
+ |
0 | 19 |
+ /* This path to firefox is hardcoded for the default path setting */ |
137
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
20 |
+ mAppPath.Assign("/usr/bin/firefox"); |
0 | 21 |
+ return NS_OK; |
137
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
22 |
+ |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
23 |
nsCOMPtr<nsIGIOService> giovfs = |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
24 |
do_GetService(NS_GIOSERVICE_CONTRACTID); |
0 | 25 |
|
137
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
26 |
- if (!gconf) |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
27 |
- return NS_ERROR_NOT_AVAILABLE; |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
28 |
- |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
29 |
// Check G_BROKEN_FILENAMES. If it's set, then filenames in glib use |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
30 |
// the locale encoding. If it's not set, they use UTF-8. |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
31 |
mUseLocaleFilenames = PR_GetEnv("G_BROKEN_FILENAMES") != nsnull; |
0 | 32 |
|
137
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
33 |
nsCOMPtr<nsIProperties> dirSvc |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
34 |
(do_GetService("@mozilla.org/file/directory_service;1")); |
5bf88897596f
Minor improvement to appname patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
126
diff
changeset
|
35 |
NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE); |
0 | 36 |