* debian/patches/power-ignore-bad-dbus-requests.patch:
- If we get a DBus request while the manager isn't active, ignore it.
LP: #969535
Fixes LP: #969535
(bzr r323)
Michael Terry
12 years ago
| 2 | 2 |
* debian/patches/power-check-null-devices.patch:
|
| 3 | 3 |
- NULL-guard the return value of up_client_get_devices.
|
| 4 | 4 |
LP: #868928
|
| 5 | |
|
| 6 | |
-- Michael Terry <mterry@ubuntu.com> Wed, 25 Apr 2012 16:24:53 -0400
|
|
5 |
* debian/patches/power-ignore-bad-dbus-requests.patch:
|
|
6 |
- If we get a DBus request while the manager isn't active, ignore it.
|
|
7 |
LP: #969535
|
|
8 |
|
|
9 |
-- Michael Terry <mterry@ubuntu.com> Wed, 25 Apr 2012 17:00:56 -0400
|
| 7 | 10 |
|
| 8 | 11 |
gnome-settings-daemon (3.4.1-0ubuntu1) precise-proposed; urgency=low
|
| 9 | 12 |
|
|
0 |
Index: gnome-settings-daemon-3.4.1/plugins/power/gsd-power-manager.c
|
|
1 |
===================================================================
|
|
2 |
--- gnome-settings-daemon-3.4.1.orig/plugins/power/gsd-power-manager.c 2012-04-25 16:53:47.385612908 -0400
|
|
3 |
+++ gnome-settings-daemon-3.4.1/plugins/power/gsd-power-manager.c 2012-04-25 17:04:19.765619601 -0400
|
|
4 |
@@ -4149,6 +4149,12 @@
|
|
5 |
{
|
|
6 |
GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
|
|
7 |
|
|
8 |
+ /* Check session pointer as a proxy for whether the manager is in the
|
|
9 |
+ start or stop state */
|
|
10 |
+ if (manager->priv->session == NULL) {
|
|
11 |
+ return;
|
|
12 |
+ }
|
|
13 |
+
|
|
14 |
g_debug ("Calling method '%s.%s' for Power",
|
|
15 |
interface_name, method_name);
|
|
16 |
|
|
17 |
@@ -4183,6 +4189,12 @@
|
|
18 |
GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
|
|
19 |
GVariant *retval = NULL;
|
|
20 |
|
|
21 |
+ /* Check session pointer as a proxy for whether the manager is in the
|
|
22 |
+ start or stop state */
|
|
23 |
+ if (manager->priv->session == NULL) {
|
|
24 |
+ return NULL;
|
|
25 |
+ }
|
|
26 |
+
|
|
27 |
if (g_strcmp0 (property_name, "Icon") == 0) {
|
|
28 |
retval = engine_get_icon_property_variant (manager);
|
|
29 |
} else if (g_strcmp0 (property_name, "Tooltip") == 0) {
|
| 25 | 25 |
git_keyring_environment.patch
|
| 26 | 26 |
power-no-fallback-notifications.patch
|
| 27 | 27 |
power-check-null-devices.patch
|
|
28 |
power-ignore-bad-dbus-requests.patch
|