[Pkg-telepathy-commits] [telepathy-mission-control-6] 136/280: Prevent assert for offline accounts with power saving

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 37365d623ad78997b47be1da78e422fbc1cbeea1
Author: John Brooks <john.brooks at jollamobile.com>
Date:   Thu Dec 12 15:46:27 2013 -0700

    Prevent assert for offline accounts with power saving
    
    Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72652
---
 src/mcd-connection.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 78b25b9..de2a6f5 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -1571,10 +1571,10 @@ on_inactivity_changed (McdSlacker *slacker,
     McdConnection *self)
 {
   McdConnectionPrivate *priv = self->priv;
-  DEBUG ("%sactive, %s have power saving iface.", inactive ? "in" : "",
-      priv->has_power_saving_if ? "has" : "doesn't");
+  DEBUG ("%sactive, connection %s have power saving iface.", inactive ? "in" : "",
+      priv->has_power_saving_if ? "does" : "doesn't");
 
-  if (priv->has_power_saving_if)
+  if (priv->tp_conn != NULL && priv->has_power_saving_if)
     tp_cli_connection_interface_power_saving_call_set_power_saving (priv->tp_conn, -1,
         inactive, NULL, NULL, NULL, NULL);
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git