forked from pool/MozillaFirefox
7806ad0aa0
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=173
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From: Wolfgang Rosenauer <wr@rosenauer.org>
|
|
Subject: Hardcode app starter for default check
|
|
|
|
diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
|
|
--- a/browser/components/shell/src/nsGNOMEShellService.cpp
|
|
+++ b/browser/components/shell/src/nsGNOMEShellService.cpp
|
|
@@ -105,22 +105,26 @@ nsresult
|
|
nsGNOMEShellService::Init()
|
|
{
|
|
nsresult rv;
|
|
|
|
// GConf _must_ be available, or we do not allow
|
|
// CreateInstance to succeed.
|
|
|
|
nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
|
|
+ if (!gconf)
|
|
+ return NS_ERROR_NOT_AVAILABLE;
|
|
+
|
|
+ /* This path to firefox is hardcoded for the default path setting */
|
|
+ mAppPath.Assign("/usr/bin/firefox");
|
|
+ return NS_OK;
|
|
+
|
|
nsCOMPtr<nsIGIOService> giovfs =
|
|
do_GetService(NS_GIOSERVICE_CONTRACTID);
|
|
|
|
- if (!gconf)
|
|
- return NS_ERROR_NOT_AVAILABLE;
|
|
-
|
|
// Check G_BROKEN_FILENAMES. If it's set, then filenames in glib use
|
|
// the locale encoding. If it's not set, they use UTF-8.
|
|
mUseLocaleFilenames = PR_GetEnv("G_BROKEN_FILENAMES") != nsnull;
|
|
|
|
nsCOMPtr<nsIProperties> dirSvc
|
|
(do_GetService("@mozilla.org/file/directory_service;1"));
|
|
NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE);
|
|
|