From b7acc1e2392bb6df7839ae49565258dfb777a47d Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Wed, 26 Sep 2018 14:07:12 +0200
Subject: Enabled DBus remote for all Gtk+ backends, Removed obsoleted patches

---
 mozilla-1415078.patch | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 mozilla-1415078.patch

(limited to 'mozilla-1415078.patch')

diff --git a/mozilla-1415078.patch b/mozilla-1415078.patch
new file mode 100644
index 0000000..c5c433e
--- /dev/null
+++ b/mozilla-1415078.patch
@@ -0,0 +1,57 @@
+diff --git a/toolkit/components/remote/nsRemoteService.cpp b/toolkit/components/remote/nsRemoteService.cpp
+--- a/toolkit/components/remote/nsRemoteService.cpp
++++ b/toolkit/components/remote/nsRemoteService.cpp
+@@ -34,20 +34,18 @@
+ NS_IMETHODIMP
+ nsRemoteService::Startup(const char* aAppName, const char* aProfileName)
+ {
+-#if defined(MOZ_ENABLE_DBUS)
++#if defined(MOZ_ENABLE_DBUS) && defined(MOZ_WAYLAND)
+     nsresult rv;
+     mDBusRemoteService = new nsDBusRemoteService();
+     rv = mDBusRemoteService->Startup(aAppName, aProfileName);
+     if (NS_FAILED(rv)) {
+         mDBusRemoteService = nullptr;
+     }
++#elif !defined(MOZ_WAYLAND)
++    mGtkRemoteService = new nsGTKRemoteService();
++    mGtkRemoteService->Startup(aAppName, aProfileName);
+ #endif
+ 
+-    if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
+-        mGtkRemoteService = new nsGTKRemoteService();
+-        mGtkRemoteService->Startup(aAppName, aProfileName);
+-    }
+-
+     if (!mDBusRemoteService && !mGtkRemoteService)
+         return NS_ERROR_FAILURE;
+ 
+@@ -73,7 +71,7 @@
+ NS_IMETHODIMP
+ nsRemoteService::Shutdown()
+ {
+-#if defined(MOZ_ENABLE_DBUS)
++#if defined(MOZ_ENABLE_DBUS) && defined(MOZ_WAYLAND)
+     if (mDBusRemoteService) {
+         mDBusRemoteService->Shutdown();
+         mDBusRemoteService = nullptr;
+diff --git a/widget/xremoteclient/moz.build b/widget/xremoteclient/moz.build
+--- a/widget/xremoteclient/moz.build
++++ b/widget/xremoteclient/moz.build
+@@ -11,7 +11,6 @@
+ 
+ SOURCES += [
+     'RemoteUtils.cpp',
+-    'XRemoteClient.cpp',
+ ]
+ 
+ if CONFIG['MOZ_ENABLE_DBUS'] and CONFIG['MOZ_WAYLAND']:
+@@ -20,3 +19,7 @@
+     ]
+     CXXFLAGS += CONFIG['TK_CFLAGS']
+     CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
++else:
++    SOURCES += [
++        'XRemoteClient.cpp',
++    ]
+
-- 
cgit