Attachment 853757 Details for Bug 1056472 – Release inhibitor properly

[patch] Release inhibitor properly

0001-Release-inhibitor-properly.patch (text/plain), 3.40 KB, created by Michael Kuhn on 2014-01-22 09:33:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Kuhn

Created: 2014-01-22 09:33:38 UTC

Size: 3.40 KB

patch

obsolete

>From aebb93f2ca01cdc6fcc489d4ca1713a0bab0823d Mon Sep 17 00:00:00 2001
>From: Michael Kuhn <suraia@ikkoku.de>
>Date: Wed, 22 Jan 2014 10:19:32 +0100
>Subject: [PATCH] Release inhibitor properly.
>
>---
> 0001-Release-inhibitor-on-sleep-and-shutdown.patch | 42 ++++++++++++++++++++++
> telepathy-mission-control.spec                     |  9 ++++-
> 2 files changed, 50 insertions(+), 1 deletion(-)
> create mode 100644 0001-Release-inhibitor-on-sleep-and-shutdown.patch
>
>diff --git a/0001-Release-inhibitor-on-sleep-and-shutdown.patch b/0001-Release-inhibitor-on-sleep-and-shutdown.patch
>new file mode 100644
>index 0000000..3d487b6
>--- /dev/null
>+++ b/0001-Release-inhibitor-on-sleep-and-shutdown.patch
>@@ -0,0 +1,42 @@
>+From b96cf39f6f612422595bc8602ddeaa420e2fe12e Mon Sep 17 00:00:00 2001
>+From: Michael Kuhn <suraia@ikkoku.de>
>+Date: Wed, 22 Jan 2014 09:56:02 +0100
>+Subject: [PATCH] Release inhibitor on sleep and shutdown.
>+
>+Also fix a memory leak in login1_inhibit_cb.
>+---
>+ src/connectivity-monitor.c | 4 ++++
>+ 1 file changed, 4 insertions(+)
>+
>+diff --git a/src/connectivity-monitor.c b/src/connectivity-monitor.c
>+index 286d73e..288d6f5 100644
>+--- a/src/connectivity-monitor.c
>++++ b/src/connectivity-monitor.c
>+@@ -298,6 +298,8 @@ login1_inhibit_cb (GObject *source G_GNUC_UNUSED,
>+         {
>+           DEBUG ("Inhibit() didn't return enough fds?");
>+         }
>++
>++      g_variant_unref (tuple);
>+     }
>+   else
>+     {
>+@@ -355,6 +357,7 @@ login1_prepare_for_sleep_cb (GDBusConnection *system_bus G_GNUC_UNUSED,
>+           DEBUG ("about to suspend");
>+           connectivity_monitor_remove_states (self, CONNECTIVITY_AWAKE,
>+               self->priv->login1_inhibit);
>++          tp_clear_pointer (&self->priv->login1_inhibit, mcd_inhibit_release);
>+         }
>+       else
>+         {
>+@@ -395,6 +398,7 @@ login1_prepare_for_shutdown_cb (GDBusConnection *system_bus G_GNUC_UNUSED,
>+           DEBUG ("about to shut down");
>+           connectivity_monitor_remove_states (self, CONNECTIVITY_RUNNING,
>+               self->priv->login1_inhibit);
>++          tp_clear_pointer (&self->priv->login1_inhibit, mcd_inhibit_release);
>+         }
>+       else
>+         {
>+-- 
>+1.8.5.3
>+
>diff --git a/telepathy-mission-control.spec b/telepathy-mission-control.spec
>index 165ab34..3ce6aa4 100644
>--- a/telepathy-mission-control.spec
>+++ b/telepathy-mission-control.spec
>@@ -2,7 +2,7 @@
> 
> Name:           telepathy-mission-control
> Version:        5.16.0
>-Release:        2%{?dist}
>+Release:        3%{?dist}
> Epoch:          1
> Summary:        Central control for Telepathy connection manager
> 
>@@ -15,6 +15,9 @@ Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{vers
> # fix failing avatar test, https://bugs.freedesktop.org/show_bug.cgi?id=71001
> Patch0049: 0049-account-manager-avatar.py-fix-race-condition-by-comb.patch
> 
>+# fix timeout on sleep/shutdown, https://bugs.freedesktop.org/show_bug.cgi?id=73599
>+Patch0001: 0001-Release-inhibitor-on-sleep-and-shutdown.patch
>+
> BuildRequires:  chrpath
> BuildRequires:  dbus-python
> BuildRequires:  glib2-devel
>@@ -51,6 +54,7 @@ files for developing applications that use %{name}.
> %prep
> %setup -q
> %patch0049 -p1 -b .0049
>+%patch0001 -p1 -b .0001
> 
> 
> %build
>@@ -107,6 +111,9 @@ fi
> 
> 
> %changelog
>+* Wed Jan 22 2014 Michael Kuhn <suraia@ikkoku.de> - 1:5.16.0-3
>+- Release inhibitor properly.
>+
> * Wed Oct 30 2013 Rex Dieter <rdieter@fedoraproject.org> - 1:5.16.0-2
> - --disable-upower
> 
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1056472: 853757