|
 |
735387 |
diff -up firefox-60.1.0/toolkit/components/remote/moz.build.disable-dbus-remote firefox-60.1.0/toolkit/components/remote/moz.build
|
|
|
735387 |
--- firefox-60.1.0/toolkit/components/remote/moz.build.disable-dbus-remote 2018-06-21 09:29:35.975729500 +0200
|
|
|
735387 |
+++ firefox-60.1.0/toolkit/components/remote/moz.build 2018-06-21 09:29:53.863631963 +0200
|
|
|
735387 |
@@ -22,11 +22,6 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']
|
|
|
735387 |
'nsGTKRemoteService.cpp',
|
|
|
735387 |
'nsRemoteService.cpp',
|
|
|
735387 |
]
|
|
|
735387 |
- if CONFIG['MOZ_ENABLE_DBUS']:
|
|
|
735387 |
- SOURCES += [
|
|
|
735387 |
- 'nsDBusRemoteService.cpp',
|
|
|
735387 |
- ]
|
|
|
735387 |
- CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
|
|
|
735387 |
|
|
|
735387 |
FINAL_LIBRARY = 'xul'
|
|
|
735387 |
|
|
|
735387 |
diff -up firefox-60.1.0/toolkit/components/remote/nsRemoteService.cpp.disable-dbus-remote firefox-60.1.0/toolkit/components/remote/nsRemoteService.cpp
|
|
|
735387 |
--- firefox-60.1.0/toolkit/components/remote/nsRemoteService.cpp.disable-dbus-remote 2018-06-19 22:35:27.000000000 +0200
|
|
|
735387 |
+++ firefox-60.1.0/toolkit/components/remote/nsRemoteService.cpp 2018-06-21 09:30:24.949462465 +0200
|
|
|
735387 |
@@ -6,7 +6,7 @@
|
|
|
735387 |
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
735387 |
|
|
|
735387 |
#include "nsGTKRemoteService.h"
|
|
|
735387 |
-#ifdef MOZ_ENABLE_DBUS
|
|
|
735387 |
+#if 0 // Disable DBus remote
|
|
|
735387 |
#include "nsDBusRemoteService.h"
|
|
|
735387 |
#endif
|
|
|
735387 |
#include "nsRemoteService.h"
|
|
|
735387 |
@@ -34,7 +34,7 @@ NS_IMPL_ISUPPORTS(nsRemoteService,
|
|
|
735387 |
NS_IMETHODIMP
|
|
|
735387 |
nsRemoteService::Startup(const char* aAppName, const char* aProfileName)
|
|
|
735387 |
{
|
|
|
735387 |
-#if defined(MOZ_ENABLE_DBUS)
|
|
|
735387 |
+#if 0 // Disable DBus remote
|
|
|
735387 |
nsresult rv;
|
|
|
735387 |
mDBusRemoteService = new nsDBusRemoteService();
|
|
|
735387 |
rv = mDBusRemoteService->Startup(aAppName, aProfileName);
|