1 From: Wolfgang Rosenauer <wr@rosenauer.org>

     2 Subject: Hardcode app starter for default check

     3 

     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

     7 @@ -105,22 +105,26 @@ nsresult

     8  nsGNOMEShellService::Init()

     9  {

    10    nsresult rv;

    11  

    12    // GConf _must_ be available, or we do not allow

    13    // CreateInstance to succeed.

    14  

    15    nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);

    16 +  if (!gconf)

    17 +    return NS_ERROR_NOT_AVAILABLE;

    18 +

    19 +  /* This path to firefox is hardcoded for the default path setting */

    20 +  mAppPath.Assign("/usr/bin/firefox");

    21 +  return NS_OK;

    22 +

    23    nsCOMPtr<nsIGIOService> giovfs =

    24      do_GetService(NS_GIOSERVICE_CONTRACTID);

    25  

    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;

    32  

    33    nsCOMPtr<nsIProperties> dirSvc

    34      (do_GetService("@mozilla.org/file/directory_service;1"));

    35    NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE);

    36