|
 |
29a772 |
diff -up firefox-24.0/mozilla-esr24/browser/components/preferences/advanced.xul.default firefox-24.0/mozilla-esr24/browser/components/preferences/advanced.xul
|
|
|
29a772 |
--- firefox-24.0/mozilla-esr24/browser/components/preferences/advanced.xul.default 2013-09-11 05:22:18.000000000 +0200
|
|
|
29a772 |
+++ firefox-24.0/mozilla-esr24/browser/components/preferences/advanced.xul 2013-10-31 12:51:28.597413904 +0100
|
|
|
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"/>
|
|
|
29a772 |
@@ -72,7 +72,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
|
|
|
29a772 |
@@ -106,7 +106,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
|
|
|
29a772 |
@@ -174,7 +174,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;"/>
|
|
|
29a772 |
diff -up firefox-24.0/mozilla-esr24/browser/components/shell/src/Makefile.in.default firefox-24.0/mozilla-esr24/browser/components/shell/src/Makefile.in
|
|
|
29a772 |
--- firefox-24.0/mozilla-esr24/browser/components/shell/src/Makefile.in.default 2013-10-31 12:49:11.279309914 +0100
|
|
|
29a772 |
+++ firefox-24.0/mozilla-esr24/browser/components/shell/src/Makefile.in 2013-10-31 12:52:27.772465355 +0100
|
|
|
29a772 |
@@ -13,7 +13,7 @@ include $(DEPTH)/config/autoconf.mk
|
|
|
29a772 |
FORCE_STATIC_LIB = 1
|
|
|
29a772 |
USE_STATIC_LIBS = 1
|
|
|
29a772 |
|
|
|
29a772 |
-DISABLED_EXTRA_COMPONENTS = nsSetDefaultBrowser.js nsSetDefaultBrowser.manifest
|
|
|
29a772 |
+#DISABLED_EXTRA_COMPONENTS = nsSetDefaultBrowser.js nsSetDefaultBrowser.manifest
|
|
|
29a772 |
|
|
|
29a772 |
include $(topsrcdir)/config/rules.mk
|
|
|
29a772 |
|
|
|
29a772 |
diff -up firefox-24.0/mozilla-esr24/browser/components/shell/src/nsGNOMEShellService.cpp.default firefox-24.0/mozilla-esr24/browser/components/shell/src/nsGNOMEShellService.cpp
|
|
|
29a772 |
--- firefox-24.0/mozilla-esr24/browser/components/shell/src/nsGNOMEShellService.cpp.default 2013-09-11 05:22:18.000000000 +0200
|
|
|
29a772 |
+++ firefox-24.0/mozilla-esr24/browser/components/shell/src/nsGNOMEShellService.cpp 2013-10-31 12:56:17.450679146 +0100
|
|
|
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) {
|
|
|
29a772 |
gchar *nativePath = g_filename_from_utf8(aKeyValue, -1, NULL, NULL, NULL);
|
|
|
29a772 |
if (!nativePath) {
|
|
|
29a772 |
@@ -158,17 +158,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 |
|
|
|
29a772 |
@@ -253,16 +249,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) {
|
|
|
29a772 |
diff -up firefox-24.0/mozilla-esr24/browser/components/shell/src/nsGNOMEShellService.h.default firefox-24.0/mozilla-esr24/browser/components/shell/src/nsGNOMEShellService.h
|
|
|
29a772 |
--- firefox-24.0/mozilla-esr24/browser/components/shell/src/nsGNOMEShellService.h.default 2013-09-11 05:22:18.000000000 +0200
|
|
|
29a772 |
+++ firefox-24.0/mozilla-esr24/browser/components/shell/src/nsGNOMEShellService.h 2013-10-31 12:49:11.280309915 +0100
|
|
|
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
|