summaryrefslogtreecommitdiff
path: root/mozilla-1465371.patch
diff options
context:
space:
mode:
Diffstat (limited to 'mozilla-1465371.patch')
-rw-r--r--mozilla-1465371.patch59
1 files changed, 59 insertions, 0 deletions
diff --git a/mozilla-1465371.patch b/mozilla-1465371.patch
new file mode 100644
index 0000000..8e4e8e1
--- /dev/null
+++ b/mozilla-1465371.patch
@@ -0,0 +1,59 @@
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -1700,31 +1700,25 @@ ParseRemoteCommandLine(nsCString& progra
+
+ return REMOTE_FOUND;
+ }
+
+ static RemoteResult
+ StartRemoteClient(const char* aDesktopStartupID,
+ nsCString& program,
+ const char* profile,
+- const char* username,
+- bool aIsX11Display)
++ const char* username)
+ {
+ nsAutoPtr<nsRemoteClient> client;
+
+- if (aIsX11Display) {
+- client = new XRemoteClient();
+- } else {
+ #if defined(MOZ_ENABLE_DBUS) && defined(MOZ_WAYLAND)
+- client = new DBusRemoteClient();
++ client = new DBusRemoteClient();
+ #else
+- MOZ_ASSERT(false, "Missing remote implementation!");
+- return REMOTE_NOT_FOUND;
++ client = new XRemoteClient();
+ #endif
+- }
+
+ nsresult rv = client->Init();
+ if (NS_FAILED(rv))
+ return REMOTE_NOT_FOUND;
+
+ nsCString response;
+ bool success = false;
+ rv = client->SendCommandLine(program.get(), username, profile,
+@@ -4070,18 +4064,17 @@ XREMain::XRE_mainStartup(bool* aExitFlag
+ NS_WARNING("Cannot lock XRemote start mutex");
+ }
+ }
+
+ // Try to remote the entire command line. If this fails, start up normally.
+ const char* desktopStartupIDPtr =
+ mDesktopStartupID.IsEmpty() ? nullptr : mDesktopStartupID.get();
+
+- rr = StartRemoteClient(desktopStartupIDPtr, program, profile, username,
+- GDK_IS_X11_DISPLAY(mGdkDisplay));
++ rr = StartRemoteClient(desktopStartupIDPtr, program, profile, username);
+ if (rr == REMOTE_FOUND) {
+ *aExitFlag = true;
+ return 0;
+ }
+ if (rr == REMOTE_ARG_BAD) {
+ return 1;
+ }
+ }
+
bgstack15