forked from pool/gnome-settings-daemon
fe13395545
- Add gnome-settings-daemon-upower-system-bus.patch to fix suspend and hibernate keyboard buttons [bgo#660267] OBS-URL: https://build.opensuse.org/request/show/89961 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=114
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
From 3b41d8d62ebef1070e4304ad40cf395d12834808 Mon Sep 17 00:00:00 2001
|
|
From: Bastien Nocera <hadess@hadess.net>
|
|
Date: Wed, 19 Oct 2011 12:46:18 +0000
|
|
Subject: media-keys: Fix the suspend key not working
|
|
|
|
We were trying to find UPower on the session bus instead of the
|
|
system bus.
|
|
|
|
Spotted by Sebastien Bacher <seb128@ubuntu.com>
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=660267#c3
|
|
---
|
|
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
|
|
index 7330591..e1b511e 100644
|
|
--- a/plugins/media-keys/gsd-media-keys-manager.c
|
|
+++ b/plugins/media-keys/gsd-media-keys-manager.c
|
|
@@ -2053,16 +2053,6 @@ on_bus_gotten (GObject *source_object,
|
|
NULL,
|
|
(GAsyncReadyCallback) power_keyboard_ready_cb,
|
|
manager);
|
|
-
|
|
- g_dbus_proxy_new (manager->priv->connection,
|
|
- G_DBUS_PROXY_FLAGS_NONE,
|
|
- NULL,
|
|
- "org.freedesktop.UPower",
|
|
- "/org/freedesktop/UPower",
|
|
- "org.freedesktop.UPower",
|
|
- NULL,
|
|
- (GAsyncReadyCallback) upower_ready_cb,
|
|
- manager);
|
|
}
|
|
|
|
static void
|
|
@@ -2076,6 +2066,16 @@ register_manager (GsdMediaKeysManager *manager)
|
|
manager->priv->bus_cancellable,
|
|
(GAsyncReadyCallback) on_bus_gotten,
|
|
manager);
|
|
+
|
|
+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
|
|
+ G_DBUS_PROXY_FLAGS_NONE,
|
|
+ NULL,
|
|
+ "org.freedesktop.UPower",
|
|
+ "/org/freedesktop/UPower",
|
|
+ "org.freedesktop.UPower",
|
|
+ NULL,
|
|
+ (GAsyncReadyCallback) upower_ready_cb,
|
|
+ manager);
|
|
}
|
|
|
|
GsdMediaKeysManager *
|
|
--
|
|
cgit v0.9.0.2
|