diff -r 46868b4f4bfd -r f4f4388b26a8 firefox-appname.patch --- a/firefox-appname.patch Mon Jan 10 10:39:11 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -From: Wolfgang Rosenauer -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 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 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 dirSvc - (do_GetService("@mozilla.org/file/directory_service;1")); - NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE); -