Hello community,

here is the log from the commit of package gnome-settings-daemon for 
openSUSE:12.1 checked in at 2011-11-05 11:15:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1/gnome-settings-daemon (Old)
 and      /work/SRC/openSUSE:12.1/.gnome-settings-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-settings-daemon", Maintainer is "gnome-maintain...@suse.de"

Changes:
--------
--- /work/SRC/openSUSE:12.1/gnome-settings-daemon/gnome-settings-daemon.changes 
2011-10-24 12:46:41.000000000 +0200
+++ 
/work/SRC/openSUSE:12.1/.gnome-settings-daemon.new/gnome-settings-daemon.changes
    2011-11-05 11:47:38.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 2 15:50:48 UTC 2011 - rbrown...@opensuse.org
+
+- Add gnome-settings-daemon-upower-system-bus.patch to fix
+  suspend and hibernate keyboard buttons [bgo#660267]
+
+-------------------------------------------------------------------

New:
----
  gnome-settings-daemon-upower-system-bus.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.ZNFZbo/_old  2011-11-05 11:47:40.000000000 +0100
+++ /var/tmp/diff_new_pack.ZNFZbo/_new  2011-11-05 11:47:40.000000000 +0100
@@ -43,6 +43,8 @@
 Patch17:        gnome-settings-daemon-stop-reload-proxy-settings.patch
 # PATCH-FIX-UPSTREAM gnome-settings-daemon-fix-missing-wexitstatus.patch 
bgo#662020 malcolmle...@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 
rbrown...@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 @@
 %patch17 -p1
 %endif
 %patch18
+%patch19 -p1
 
 %if 0%{?BUILD_FROM_VCS}
 NOCONFIGURE=1 /usr/bin/gnome-autogen.sh

++++++ gnome-settings-daemon-upower-system-bus.patch ++++++
>From 3b41d8d62ebef1070e4304ad40cf395d12834808 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <had...@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 <seb...@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
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to