diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-29 14:46:12 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-29 14:50:12 +0000 |
| commit | e47e89d0e85856b48d02c56b3ee01a2a37ceeff1 (patch) | |
| tree | 5906193eef859705c77f7926d4177e8912820c38 /main/upower/daemon-fix-get_critical_action.patch | |
| parent | 723ca9ec0b1300295697d6b3a30d5bac7b338ee5 (diff) | |
| download | aports-e47e89d0e85856b48d02c56b3ee01a2a37ceeff1.tar.bz2 aports-e47e89d0e85856b48d02c56b3ee01a2a37ceeff1.tar.xz | |
main/upower: add fixes fom upstream
This fixes segfault in xfsettingsd
Diffstat (limited to 'main/upower/daemon-fix-get_critical_action.patch')
| -rw-r--r-- | main/upower/daemon-fix-get_critical_action.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/main/upower/daemon-fix-get_critical_action.patch b/main/upower/daemon-fix-get_critical_action.patch new file mode 100644 index 0000000000..6afe9b7a98 --- /dev/null +++ b/main/upower/daemon-fix-get_critical_action.patch @@ -0,0 +1,28 @@ +From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.pitt@ubuntu.com> +Date: Tue, 23 Feb 2016 09:51:07 +0100 +Subject: daemon: fix get_critical_action() + +Fix copy&paste error from e7e9156f that called the wrong _complete_ function +for up_daemon_get_critical_action(). + +https://bugs.freedesktop.org/show_bug.cgi?id=94262 + +diff --git a/src/up-daemon.c b/src/up-daemon.c +index be14cbe..e95f904 100644 +--- a/src/up-daemon.c ++++ b/src/up-daemon.c +@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton, + GDBusMethodInvocation *invocation, + UpDaemon *daemon) + { +- up_exported_daemon_complete_get_display_device (skeleton, invocation, +- up_backend_get_critical_action (daemon->priv->backend)); ++ up_exported_daemon_complete_get_critical_action (skeleton, invocation, ++ up_backend_get_critical_action (daemon->priv->backend)); + return TRUE; + } + +-- +cgit v0.10.2 + |