Blob Blame History Raw
diff -up firefox-63.0/netwerk/wifi/nsWifiScannerDBus.cpp.1500366 firefox-63.0/netwerk/wifi/nsWifiScannerDBus.cpp
--- firefox-63.0/netwerk/wifi/nsWifiScannerDBus.cpp.1500366	2018-10-15 21:20:49.000000000 +0200
+++ firefox-63.0/netwerk/wifi/nsWifiScannerDBus.cpp	2018-10-22 08:37:05.629824640 +0200
@@ -17,6 +17,7 @@ nsWifiScannerDBus::nsWifiScannerDBus(nsC
     already_AddRefed<DBusConnection>(dbus_bus_get(DBUS_BUS_SYSTEM, nullptr));
 
   if (mConnection) {
+    dbus_connection_setup_with_g_main(mConnection, nullptr);
     dbus_connection_set_exit_on_disconnect(mConnection, false);
   }
 
diff -up firefox-63.0/netwerk/wifi/nsWifiScannerDBus.h.1500366 firefox-63.0/netwerk/wifi/nsWifiScannerDBus.h
--- firefox-63.0/netwerk/wifi/nsWifiScannerDBus.h.1500366	2018-10-15 21:20:49.000000000 +0200
+++ firefox-63.0/netwerk/wifi/nsWifiScannerDBus.h	2018-10-22 08:37:05.629824640 +0200
@@ -9,6 +9,7 @@
 
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
+#include <dbus/dbus-glib-lowlevel.h>
 
 class nsWifiAccessPoint;
 
diff -up firefox-63.0/toolkit/components/remote/nsDBusRemoteService.cpp.1500366 firefox-63.0/toolkit/components/remote/nsDBusRemoteService.cpp
--- firefox-63.0/toolkit/components/remote/nsDBusRemoteService.cpp.1500366	2018-10-15 21:20:52.000000000 +0200
+++ firefox-63.0/toolkit/components/remote/nsDBusRemoteService.cpp	2018-10-22 08:37:05.629824640 +0200
@@ -174,6 +174,7 @@ nsDBusRemoteService::Startup(const char*
     return NS_ERROR_FAILURE;
   }
   dbus_connection_set_exit_on_disconnect(mConnection, false);
+  dbus_connection_setup_with_g_main(mConnection, nullptr);
 
   mAppName = aAppName;
   ToLowerCase(mAppName);
diff -up firefox-63.0/widget/xremoteclient/DBusRemoteClient.cpp.1500366 firefox-63.0/widget/xremoteclient/DBusRemoteClient.cpp
--- firefox-63.0/widget/xremoteclient/DBusRemoteClient.cpp.1500366	2018-10-15 21:20:52.000000000 +0200
+++ firefox-63.0/widget/xremoteclient/DBusRemoteClient.cpp	2018-10-22 10:12:29.207925928 +0200
@@ -12,6 +12,7 @@
 #include "mozilla/Base64.h"
 #include "nsPrintfCString.h"
 
+#include <dbus/dbus-glib-lowlevel.h>
 #include <dlfcn.h>
 
 using mozilla::LogLevel;
@@ -43,6 +44,7 @@ DBusRemoteClient::Init()
     return NS_ERROR_FAILURE;
 
   dbus_connection_set_exit_on_disconnect(mConnection, false);
+  dbus_connection_setup_with_g_main(mConnection, nullptr);
 
   return NS_OK;
 }