rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f29

Browse Source
This commit is contained in:
Martin Stransky 2018-10-22 10:15:17 +02:00
commit 94d38cbb91
1 changed files with 22 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
mozilla-1500366.patch
View File

@ -1,18 +1,7 @@
changeset: 441749:bb66c2fdcbe2 diff -up firefox-63.0/netwerk/wifi/nsWifiScannerDBus.cpp.1500366 firefox-63.0/netwerk/wifi/nsWifiScannerDBus.cpp
tag: tip --- firefox-63.0/netwerk/wifi/nsWifiScannerDBus.cpp.1500366 2018-10-15 21:20:49.000000000 +0200
user: Martin Stransky <stransky@redhat.com> +++ firefox-63.0/netwerk/wifi/nsWifiScannerDBus.cpp 2018-10-22 08:37:05.629824640 +0200
date: Fri Oct 19 12:01:02 2018 +0200 @@ -17,6 +17,7 @@ nsWifiScannerDBus::nsWifiScannerDBus(nsC
summary: Bug 1500366 - register all DBus connection to be handled by gmain loop, r=jhorak
diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus.cpp
--- a/netwerk/wifi/nsWifiScannerDBus.cpp
+++ b/netwerk/wifi/nsWifiScannerDBus.cpp
@@ -12,16 +12,17 @@ nsWifiScannerDBus::nsWifiScannerDBus(nsC
: mAccessPoints(aAccessPoints)
{
MOZ_ASSERT(mAccessPoints);
mConnection =
already_AddRefed<DBusConnection>(dbus_bus_get(DBUS_BUS_SYSTEM, nullptr)); already_AddRefed<DBusConnection>(dbus_bus_get(DBUS_BUS_SYSTEM, nullptr));
if (mConnection) { if (mConnection) {
@ -20,20 +9,10 @@ diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus
dbus_connection_set_exit_on_disconnect(mConnection, false); dbus_connection_set_exit_on_disconnect(mConnection, false);
} }
MOZ_COUNT_CTOR(nsWifiScannerDBus); 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
nsWifiScannerDBus::~nsWifiScannerDBus() @@ -9,6 +9,7 @@
{
diff --git a/netwerk/wifi/nsWifiScannerDBus.h b/netwerk/wifi/nsWifiScannerDBus.h
--- a/netwerk/wifi/nsWifiScannerDBus.h
+++ b/netwerk/wifi/nsWifiScannerDBus.h
@@ -4,16 +4,17 @@
#ifndef NSWIFIAPSCANNERDBUS_H_
#define NSWIFIAPSCANNERDBUS_H_
#include "nsCOMArray.h"
#define DBUS_API_SUBJECT_TO_CHANGE #define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h> #include <dbus/dbus.h>
@ -41,20 +20,10 @@ diff --git a/netwerk/wifi/nsWifiScannerDBus.h b/netwerk/wifi/nsWifiScannerDBus.h
class nsWifiAccessPoint; class nsWifiAccessPoint;
namespace mozilla { 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
class nsWifiScannerDBus final +++ firefox-63.0/toolkit/components/remote/nsDBusRemoteService.cpp 2018-10-22 08:37:05.629824640 +0200
{ @@ -174,6 +174,7 @@ nsDBusRemoteService::Startup(const char*
public:
diff --git a/toolkit/components/remote/nsDBusRemoteService.cpp b/toolkit/components/remote/nsDBusRemoteService.cpp
--- a/toolkit/components/remote/nsDBusRemoteService.cpp
+++ b/toolkit/components/remote/nsDBusRemoteService.cpp
@@ -169,16 +169,17 @@ nsDBusRemoteService::Startup(const char*
return NS_ERROR_INVALID_ARG;
mConnection = already_AddRefed<DBusConnection>(
dbus_bus_get(DBUS_BUS_SESSION, nullptr));
if (!mConnection) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
dbus_connection_set_exit_on_disconnect(mConnection, false); dbus_connection_set_exit_on_disconnect(mConnection, false);
@ -62,20 +31,18 @@ diff --git a/toolkit/components/remote/nsDBusRemoteService.cpp b/toolkit/compone
mAppName = aAppName; mAppName = aAppName;
ToLowerCase(mAppName); 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"
// D-Bus names can contain only [a-z][A-Z][0-9]_ +#include <dbus/dbus-glib-lowlevel.h>
// characters so adjust the profile string properly. #include <dlfcn.h>
nsAutoCString profileName;
nsresult rv = mozilla::Base64Encode(nsAutoCString(aProfileName), profileName);
diff --git a/widget/xremoteclient/DBusRemoteClient.cpp b/widget/xremoteclient/DBusRemoteClient.cpp
--- a/widget/xremoteclient/DBusRemoteClient.cpp
+++ b/widget/xremoteclient/DBusRemoteClient.cpp
@@ -38,16 +38,17 @@ DBusRemoteClient::Init()
return NS_OK;
mConnection = already_AddRefed<DBusConnection>( using mozilla::LogLevel;
dbus_bus_get(DBUS_BUS_SESSION, nullptr)); @@ -43,6 +44,7 @@ DBusRemoteClient::Init()
if (!mConnection)
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
dbus_connection_set_exit_on_disconnect(mConnection, false); dbus_connection_set_exit_on_disconnect(mConnection, false);
@ -83,9 +50,3 @@ diff --git a/widget/xremoteclient/DBusRemoteClient.cpp b/widget/xremoteclient/DB
return NS_OK; return NS_OK;
} }
void
DBusRemoteClient::Shutdown (void)
{
MOZ_LOG(sRemoteLm, LogLevel::Debug, ("DBusRemoteClient::Shutdown"));