03d5fe
diff -up mozilla-aurora/browser/components/preferences/advanced.xul.default mozilla-aurora/browser/components/preferences/advanced.xul
03d5fe
--- mozilla-aurora/browser/components/preferences/advanced.xul.default	2014-05-06 13:17:14.000000000 +0200
03d5fe
+++ mozilla-aurora/browser/components/preferences/advanced.xul	2014-05-06 14:07:22.972356178 +0200
29a772
@@ -40,7 +40,7 @@
29a772
 #endif
29a772
       <preference id="layout.spellcheckDefault"        name="layout.spellcheckDefault"        type="int"/>
29a772
 
29a772
-#ifdef HAVE_SHELL_SERVICE
29a772
+#ifdef 0
29a772
       
29a772
                   name="browser.shell.checkDefaultBrowser"
29a772
                   type="bool"/>
03d5fe
@@ -68,7 +68,7 @@
29a772
                   type="bool"/>
29a772
 
29a772
      
29a772
-#ifdef MOZ_UPDATER
29a772
+#ifdef 0
29a772
       <preference id="app.update.enabled"              name="app.update.enabled"              type="bool"/>
29a772
       <preference id="app.update.auto"                 name="app.update.auto"                 type="bool"/>
29a772
 #ifdef XP_WIN
03d5fe
@@ -102,7 +102,7 @@
29a772
                   type="bool"/>
29a772
     </preferences>
29a772
 
29a772
-#ifdef HAVE_SHELL_SERVICE
29a772
+#ifdef 0
29a772
     <stringbundle id="bundleShell" src="chrome://browser/locale/shellservice.properties"/>
29a772
     <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
29a772
 #endif
03d5fe
@@ -170,7 +170,7 @@
29a772
                       preference="layout.spellcheckDefault"/>
29a772
           </groupbox>
29a772
 
29a772
-#ifdef HAVE_SHELL_SERVICE
29a772
+#ifdef 0
29a772
           
29a772
           <groupbox id="systemDefaultsGroup" orient="vertical">
29a772
             <caption label="&systemDefaults.label;"/>
03d5fe
diff -up mozilla-aurora/browser/components/shell/src/Makefile.in.default mozilla-aurora/browser/components/shell/src/Makefile.in
03d5fe
diff -up mozilla-aurora/browser/components/shell/src/nsGNOMEShellService.cpp.default mozilla-aurora/browser/components/shell/src/nsGNOMEShellService.cpp
03d5fe
--- mozilla-aurora/browser/components/shell/src/nsGNOMEShellService.cpp.default	2014-05-06 13:17:14.000000000 +0200
03d5fe
+++ mozilla-aurora/browser/components/shell/src/nsGNOMEShellService.cpp	2014-05-06 14:07:22.973356181 +0200
29a772
@@ -149,8 +149,8 @@ nsGNOMEShellService::GetAppPathFromLaunc
29a772
 bool
29a772
 nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const
29a772
 {
29a772
+  nsAutoCString appName;
29a772
 
29a772
-  gchar *commandPath;
29a772
   if (mUseLocaleFilenames) {
03d5fe
     gchar *nativePath = g_filename_from_utf8(aKeyValue, -1,
03d5fe
                                              nullptr, nullptr, nullptr);
03d5fe
@@ -159,17 +159,13 @@ nsGNOMEShellService::KeyMatchesAppName(c
29a772
       return false;
29a772
     }
29a772
 
29a772
-    commandPath = g_find_program_in_path(nativePath);
29a772
+    appName.Assign(nativePath);
29a772
     g_free(nativePath);
29a772
   } else {
29a772
-    commandPath = g_find_program_in_path(aKeyValue);
29a772
+    appName.Assign(aKeyValue);
29a772
   }
29a772
 
29a772
-  if (!commandPath)
29a772
-    return false;
29a772
-
29a772
-  bool matches = mAppPath.Equals(commandPath);
29a772
-  g_free(commandPath);
29a772
+  bool matches = mAppPath.Equals(appName);
29a772
   return matches;
29a772
 }
29a772
 
03d5fe
@@ -254,16 +250,7 @@ nsGNOMEShellService::SetDefaultBrowser(b
29a772
   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
29a772
   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
29a772
   if (gconf) {
29a772
-    nsAutoCString appKeyValue;
29a772
-    if (mAppIsInPath) {
29a772
-      // mAppPath is in the users path, so use only the basename as the launcher
29a772
-      gchar *tmp = g_path_get_basename(mAppPath.get());
29a772
-      appKeyValue = tmp;
29a772
-      g_free(tmp);
29a772
-    } else {
29a772
-      appKeyValue = mAppPath;
29a772
-    }
29a772
-
29a772
+    nsAutoCString appKeyValue(MOZ_APP_NAME);
29a772
     appKeyValue.AppendLiteral(" %s");
29a772
 
29a772
     for (unsigned int i = 0; i < ArrayLength(appProtocols); ++i) {
03d5fe
diff -up mozilla-aurora/browser/components/shell/src/nsGNOMEShellService.h.default mozilla-aurora/browser/components/shell/src/nsGNOMEShellService.h
03d5fe
--- mozilla-aurora/browser/components/shell/src/nsGNOMEShellService.h.default	2014-05-06 13:17:14.000000000 +0200
03d5fe
+++ mozilla-aurora/browser/components/shell/src/nsGNOMEShellService.h	2014-05-06 14:07:22.973356181 +0200
29a772
@@ -13,7 +13,7 @@
29a772
 class nsGNOMEShellService MOZ_FINAL : public nsIShellService
29a772
 {
29a772
 public:
29a772
-  nsGNOMEShellService() : mCheckedThisSession(false), mAppIsInPath(false) { }
29a772
+  nsGNOMEShellService() : mCheckedThisSession(true), mAppIsInPath(true) { }
29a772
 
29a772
   NS_DECL_ISUPPORTS
29a772
   NS_DECL_NSISHELLSERVICE