forked from mirrors/gecko-dev
Bug 1866734 - Fix --disable-dbus builds. r=stransky
Differential Revision: https://phabricator.services.mozilla.com/D194728
This commit is contained in:
parent
a510d60572
commit
bc851eaebb
1 changed files with 22 additions and 23 deletions
|
|
@ -159,6 +159,28 @@ nsAppShell::~nsAppShell() {
|
|||
if (mPipeFDs[1]) close(mPipeFDs[1]);
|
||||
}
|
||||
|
||||
mozilla::StaticRefPtr<WakeLockListener> sWakeLockListener;
|
||||
static void AddScreenWakeLockListener() {
|
||||
nsCOMPtr<nsIPowerManagerService> powerManager =
|
||||
do_GetService(POWERMANAGERSERVICE_CONTRACTID);
|
||||
if (powerManager) {
|
||||
sWakeLockListener = new WakeLockListener();
|
||||
powerManager->AddWakeLockListener(sWakeLockListener);
|
||||
} else {
|
||||
NS_WARNING(
|
||||
"Failed to retrieve PowerManagerService, wakelocks will be broken!");
|
||||
}
|
||||
}
|
||||
|
||||
static void RemoveScreenWakeLockListener() {
|
||||
nsCOMPtr<nsIPowerManagerService> powerManager =
|
||||
do_GetService(POWERMANAGERSERVICE_CONTRACTID);
|
||||
if (powerManager) {
|
||||
powerManager->RemoveWakeLockListener(sWakeLockListener);
|
||||
sWakeLockListener = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef MOZ_ENABLE_DBUS
|
||||
void nsAppShell::DBusSessionSleepCallback(GDBusProxy* aProxy,
|
||||
gchar* aSenderName,
|
||||
|
|
@ -267,29 +289,6 @@ void nsAppShell::StartDBusListening() {
|
|||
reinterpret_cast<GAsyncReadyCallback>(DBusConnectClientResponse), this);
|
||||
}
|
||||
|
||||
mozilla::StaticRefPtr<WakeLockListener> sWakeLockListener;
|
||||
|
||||
static void AddScreenWakeLockListener() {
|
||||
nsCOMPtr<nsIPowerManagerService> powerManager =
|
||||
do_GetService(POWERMANAGERSERVICE_CONTRACTID);
|
||||
if (powerManager) {
|
||||
sWakeLockListener = new WakeLockListener();
|
||||
powerManager->AddWakeLockListener(sWakeLockListener);
|
||||
} else {
|
||||
NS_WARNING(
|
||||
"Failed to retrieve PowerManagerService, wakelocks will be broken!");
|
||||
}
|
||||
}
|
||||
|
||||
static void RemoveScreenWakeLockListener() {
|
||||
nsCOMPtr<nsIPowerManagerService> powerManager =
|
||||
do_GetService(POWERMANAGERSERVICE_CONTRACTID);
|
||||
if (powerManager) {
|
||||
powerManager->RemoveWakeLockListener(sWakeLockListener);
|
||||
sWakeLockListener = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
void nsAppShell::StopDBusListening() {
|
||||
if (mLogin1Proxy) {
|
||||
g_signal_handlers_disconnect_matched(mLogin1Proxy, G_SIGNAL_MATCH_DATA, 0,
|
||||
|
|
|
|||
Loading…
Reference in a new issue