From 5d038638f58765ec3859797704c5d0e1c0fa7903 Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Fri, 1 Jan 2016 20:19:45 -0600
Subject: handle service_set_notifier(NULL) gracefully

---
 src/service.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/service.c b/src/service.c
index 17414c7..c04122f 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1339,9 +1339,13 @@ indicator_power_service_set_notifier (IndicatorPowerService  * self,
   g_return_if_fail (!notifier || INDICATOR_IS_POWER_NOTIFIER (notifier));
   p = self->priv;
 
-  if (p->notifier != notifier)
+  if (p->notifier == notifier)
+    return;
+
+  g_clear_object (&p->notifier);
+
+  if (notifier != NULL)
     {
-      g_clear_object (&p->notifier);
       p->notifier = g_object_ref (notifier);
       indicator_power_notifier_set_bus (p->notifier, p->conn);
     }
-- 
cgit v1.2.3