# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1281691445 -7200
# Node ID 5bf88897596ff53cfe24f77c2e0b51dd4a17cd8e
# Parent  0051f2b9308b7e8a66770bc6238257dec88f403d
Minor improvement to appname patch

diff -r 0051f2b9308b -r 5bf88897596f firefox-appname.patch
--- a/firefox-appname.patch	Fri Aug 13 11:23:46 2010 +0200
+++ b/firefox-appname.patch	Fri Aug 13 11:24:05 2010 +0200
@@ -4,26 +4,33 @@
 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
-@@ -127,17 +127,21 @@ nsGNOMEShellService::Init()
-   nsCOMPtr<nsILocalFile> appPath;
-   rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile),
-                    getter_AddRefs(appPath));
-   NS_ENSURE_SUCCESS(rv, rv);
+@@ -105,22 +105,26 @@ nsresult
+ nsGNOMEShellService::Init()
+ {
+   nsresult rv;
  
-   rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME));
-   NS_ENSURE_SUCCESS(rv, rv);
+   // GConf _must_ be available, or we do not allow
+   // CreateInstance to succeed.
  
--  return appPath->GetNativePath(mAppPath);
+   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 appPath->GetNativePath(mAppPath);
++  mAppPath.Assign("/usr/bin/firefox");
 +  return NS_OK;
- }
++
+   nsCOMPtr<nsIGIOService> giovfs =
+     do_GetService(NS_GIOSERVICE_CONTRACTID);
  
- NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService)
+-  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;
  
- PRBool
- nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const
- {
+   nsCOMPtr<nsIProperties> dirSvc
+     (do_GetService("@mozilla.org/file/directory_service;1"));
+   NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE);