From 46d007f0e15aba176d191d349f8a916ee77d5a72 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Fri, 4 Nov 2016 11:00:24 -0500
Subject: remove unnecessary test in Awake::Impl::~Impl()

---
 src/awake.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/awake.cpp b/src/awake.cpp
index 3bcd8ed..9ee337e 100644
--- a/src/awake.cpp
+++ b/src/awake.cpp
@@ -62,12 +62,8 @@ public:
     {
         g_cancellable_cancel (m_cancellable);
         g_object_unref (m_cancellable);
-
-        if (m_system_bus != nullptr)
-        {
-            unforce_awake ();
-            g_object_unref (m_system_bus);
-        }
+        unforce_awake ();
+        g_clear_object (&m_system_bus);
     }
 
 private:
@@ -99,7 +95,6 @@ private:
 
             g_clear_pointer (&self->m_awake_cookie, g_free);
             g_variant_get (args, "(s)", &self->m_awake_cookie);
-            g_debug ("m_awake_cookie is now '%s'", self->m_awake_cookie);
 
             g_variant_unref (args);
         }
@@ -120,7 +115,7 @@ private:
                                     nullptr,
                                     G_DBUS_CALL_FLAGS_NONE,
                                     -1,
-                                    nullptr,
+                                    m_cancellable,
                                     nullptr,
                                     nullptr);
 
-- 
cgit v1.2.3