Fix dbus remote when profile is not given
This commit is contained in:
parent
4e625cc771
commit
e113d3e05d
7
firefox-x11.sh.in
Normal file
7
firefox-x11.sh.in
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# Run Firefox under X11
|
||||||
|
#
|
||||||
|
|
||||||
|
export GDK_BACKEND=x11
|
||||||
|
/usr/bin/firefox "$@"
|
@ -161,6 +161,7 @@ Patch450: mozilla-1431052.patch
|
|||||||
Patch451: mozilla-1432414.patch
|
Patch451: mozilla-1432414.patch
|
||||||
Patch452: mozilla-1434202.patch
|
Patch452: mozilla-1434202.patch
|
||||||
Patch453: mozilla-1433081.patch
|
Patch453: mozilla-1433081.patch
|
||||||
|
Patch454: remote-profile.patch
|
||||||
|
|
||||||
# Debian patches
|
# Debian patches
|
||||||
Patch500: mozilla-440908.patch
|
Patch500: mozilla-440908.patch
|
||||||
@ -329,6 +330,7 @@ This package contains results of tests executed during build.
|
|||||||
%patch451 -p1 -b .1432414
|
%patch451 -p1 -b .1432414
|
||||||
%patch452 -p1 -b .1434202
|
%patch452 -p1 -b .1434202
|
||||||
%patch453 -p1 -b .1433081
|
%patch453 -p1 -b .1433081
|
||||||
|
%patch454 -p1 -b .remote-profile
|
||||||
|
|
||||||
# Patch for big endian platforms only
|
# Patch for big endian platforms only
|
||||||
%if 0%{?big_endian}
|
%if 0%{?big_endian}
|
||||||
|
19
remote-profile.patch
Normal file
19
remote-profile.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
|
||||||
|
index 386213efebb4..990ba32acbd4 100644
|
||||||
|
--- a/toolkit/xre/nsAppRunner.cpp
|
||||||
|
+++ b/toolkit/xre/nsAppRunner.cpp
|
||||||
|
@@ -3995,6 +3995,14 @@ XREMain::XRE_mainStartup(bool* aExitFlag)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (!profile) {
|
||||||
|
+#ifdef MOZ_DEV_EDITION
|
||||||
|
+ profile = "dev-edition-default";
|
||||||
|
+#else
|
||||||
|
+ profile = "default";
|
||||||
|
+#endif
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
nsCOMPtr<nsIFile> mutexDir;
|
||||||
|
rv = GetSpecialSystemDirectory(OS_TemporaryDirectory, getter_AddRefs(mutexDir));
|
||||||
|
if (NS_SUCCEEDED(rv)) {
|
Loading…
Reference in New Issue
Block a user