pool/gnome-settings-daemon
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 89961 from home:RBrownCCB:branches:GNOME:Factory

Browse Source 
- 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
This commit is contained in:
Vincent Untz 2011-11-03 19:21:49 +00:00 committed by Git OBS Bridge
parent 7a80be5c3d
commit fe13395545
3 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gnome-settings-daemon-upower-system-bus.patch Normal file
View File

@ -0,0 +1,52 @@
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

6
gnome-settings-daemon.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 2 15:50:48 UTC 2011 - rbrownccb@opensuse.org
- Add gnome-settings-daemon-upower-system-bus.patch to fix
suspend and hibernate keyboard buttons [bgo#660267]
-------------------------------------------------------------------
Mon Oct 17 21:37:35 UTC 2011 - malcolmlewis@opensuse.org

3
gnome-settings-daemon.spec
View File

@ -43,6 +43,8 @@ Patch15: gnome-packagekit-BNC383261.patch
Patch17: gnome-settings-daemon-stop-reload-proxy-settings.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-fix-missing-wexitstatus.patch bgo#662020 malcolmlewis@opensuse.org -- Add missing include that can cause issues at runtime, especially on 11.4.
Patch18: gnome-settings-daemon-fix-missing-wexitstatus.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-upower-system-bus.patch bgo#660267 rbrownccb@opensuse.org -- Make g-s-d look for UPower on system bus to fix suspend button
Patch19: gnome-settings-daemon-upower-system-bus.patch
BuildRequires: fdupes
BuildRequires: gnome-common
# Disabled because of the non-rebased patches
@ -145,6 +147,7 @@ translation-update-upstream
%patch17 -p1
%endif
%patch18
%patch19 -p1
%if 0%{?BUILD_FROM_VCS}
NOCONFIGURE=1 /usr/bin/gnome-autogen.sh