|
 |
0bcd21 |
diff -up mozilla-aurora/browser/components/preferences/in-content/advanced.xul.default mozilla-aurora/browser/components/preferences/in-content/advanced.xul
|
|
|
0bcd21 |
--- mozilla-aurora/browser/components/preferences/in-content/advanced.xul.default 2016-11-15 12:21:37.000000000 +0100
|
|
|
0bcd21 |
+++ mozilla-aurora/browser/components/preferences/in-content/advanced.xul 2016-12-08 10:51:04.049353573 +0100
|
|
|
0bcd21 |
@@ -75,7 +75,7 @@
|
|
|
0bcd21 |
type="bool"/>
|
|
|
0bcd21 |
|
|
|
0bcd21 |
|
|
|
0bcd21 |
-#ifdef MOZ_UPDATER
|
|
|
0bcd21 |
+#ifdef 0
|
|
|
0bcd21 |
|
|
|
0bcd21 |
name="app.update.enabled"
|
|
|
0bcd21 |
type="bool"/>
|
|
|
0bcd21 |
@@ -116,7 +116,7 @@
|
|
|
0bcd21 |
type="int"/>
|
|
|
0bcd21 |
</preferences>
|
|
|
0bcd21 |
|
|
|
0bcd21 |
-#ifdef HAVE_SHELL_SERVICE
|
|
|
0bcd21 |
+#ifdef 0
|
|
|
0bcd21 |
<stringbundle id="bundleShell" src="chrome://browser/locale/shellservice.properties"/>
|
|
|
0bcd21 |
<stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
|
|
|
0bcd21 |
#endif
|
|
|
0bcd21 |
diff -up mozilla-aurora/browser/components/shell/nsGNOMEShellService.cpp.default mozilla-aurora/browser/components/shell/nsGNOMEShellService.cpp
|
|
|
0bcd21 |
--- mozilla-aurora/browser/components/shell/nsGNOMEShellService.cpp.default 2016-11-15 12:21:39.000000000 +0100
|
|
|
0bcd21 |
+++ mozilla-aurora/browser/components/shell/nsGNOMEShellService.cpp 2016-12-08 10:51:04.049353573 +0100
|
|
|
0bcd21 |
@@ -150,8 +150,8 @@ nsGNOMEShellService::GetAppPathFromLaunc
|
|
|
0bcd21 |
bool
|
|
|
0bcd21 |
nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const
|
|
|
0bcd21 |
{
|
|
|
0bcd21 |
+ nsAutoCString appName;
|
|
|
0bcd21 |
|
|
|
0bcd21 |
- gchar *commandPath;
|
|
|
0bcd21 |
if (mUseLocaleFilenames) {
|
|
|
0bcd21 |
gchar *nativePath = g_filename_from_utf8(aKeyValue, -1,
|
|
|
0bcd21 |
nullptr, nullptr, nullptr);
|
|
|
0bcd21 |
@@ -160,17 +160,13 @@ nsGNOMEShellService::KeyMatchesAppName(c
|
|
|
0bcd21 |
return false;
|
|
|
0bcd21 |
}
|
|
|
0bcd21 |
|
|
|
0bcd21 |
- commandPath = g_find_program_in_path(nativePath);
|
|
|
0bcd21 |
+ appName.Assign(nativePath);
|
|
|
0bcd21 |
g_free(nativePath);
|
|
|
0bcd21 |
} else {
|
|
|
0bcd21 |
- commandPath = g_find_program_in_path(aKeyValue);
|
|
|
0bcd21 |
+ appName.Assign(aKeyValue);
|
|
|
0bcd21 |
}
|
|
|
0bcd21 |
|
|
|
0bcd21 |
- if (!commandPath)
|
|
|
0bcd21 |
- return false;
|
|
|
0bcd21 |
-
|
|
|
0bcd21 |
- bool matches = mAppPath.Equals(commandPath);
|
|
|
0bcd21 |
- g_free(commandPath);
|
|
|
0bcd21 |
+ bool matches = mAppPath.Equals(appName);
|
|
|
0bcd21 |
return matches;
|
|
|
0bcd21 |
}
|
|
|
0bcd21 |
|
|
|
0bcd21 |
@@ -253,16 +249,7 @@ nsGNOMEShellService::SetDefaultBrowser(b
|
|
|
0bcd21 |
nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
|
|
|
0bcd21 |
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
|
|
|
0bcd21 |
if (gconf) {
|
|
|
0bcd21 |
- nsAutoCString appKeyValue;
|
|
|
0bcd21 |
- if (mAppIsInPath) {
|
|
|
0bcd21 |
- // mAppPath is in the users path, so use only the basename as the launcher
|
|
|
0bcd21 |
- gchar *tmp = g_path_get_basename(mAppPath.get());
|
|
|
0bcd21 |
- appKeyValue = tmp;
|
|
|
0bcd21 |
- g_free(tmp);
|
|
|
0bcd21 |
- } else {
|
|
|
0bcd21 |
- appKeyValue = mAppPath;
|
|
|
0bcd21 |
- }
|
|
|
0bcd21 |
-
|
|
|
0bcd21 |
+ nsAutoCString appKeyValue(MOZ_APP_NAME);
|
|
|
0bcd21 |
appKeyValue.AppendLiteral(" %s");
|
|
|
0bcd21 |
|
|
|
0bcd21 |
for (unsigned int i = 0; i < ArrayLength(appProtocols); ++i) {
|
|
|
0bcd21 |
diff -up mozilla-aurora/browser/components/shell/nsGNOMEShellService.h.default mozilla-aurora/browser/components/shell/nsGNOMEShellService.h
|
|
|
0bcd21 |
--- mozilla-aurora/browser/components/shell/nsGNOMEShellService.h.default 2016-12-08 10:51:04.049353573 +0100
|
|
|
0bcd21 |
+++ mozilla-aurora/browser/components/shell/nsGNOMEShellService.h 2016-12-08 10:55:53.754263671 +0100
|
|
|
0bcd21 |
@@ -13,7 +13,7 @@
|
|
|
0bcd21 |
class nsGNOMEShellService final : public nsIGNOMEShellService
|
|
|
0bcd21 |
{
|
|
|
0bcd21 |
public:
|
|
|
0bcd21 |
- nsGNOMEShellService() : mAppIsInPath(false) { }
|
|
|
0bcd21 |
+ nsGNOMEShellService() : mAppIsInPath(true) { }
|
|
|
0bcd21 |
|
|
|
0bcd21 |
NS_DECL_ISUPPORTS
|
|
|
0bcd21 |
NS_DECL_NSISHELLSERVICE
|
|
|
0bcd21 |
diff -up mozilla-aurora/browser/components/shell/ShellService.jsm.default mozilla-aurora/browser/components/shell/ShellService.jsm
|
|
|
0bcd21 |
--- mozilla-aurora/browser/components/shell/ShellService.jsm.default 2016-12-08 10:56:51.602245720 +0100
|
|
|
0bcd21 |
+++ mozilla-aurora/browser/components/shell/ShellService.jsm 2016-12-08 10:56:58.213243668 +0100
|
|
|
0bcd21 |
@@ -48,7 +48,7 @@ let ShellServiceInternal = {
|
|
|
0bcd21 |
* up and "browser.shell.checkDefaultBrowser" is true, otherwise it
|
|
|
0bcd21 |
* is false.
|
|
|
0bcd21 |
*/
|
|
|
0bcd21 |
- _checkedThisSession: false,
|
|
|
0bcd21 |
+ _checkedThisSession: true,
|
|
|
0bcd21 |
get shouldCheckDefaultBrowser() {
|
|
|
0bcd21 |
// If we've already checked, the browser has been started and this is a
|
|
|
0bcd21 |
// new window open, and we don't want to check again.
|