From 57e6842377fa5887a38b7d05a51b7de525dc15d1 Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Fri, 15 Feb 2008 14:27:58 +0000
Subject: Trac 6475: Fix crash on launch when no telepathy connection

---
(limited to 'pippy_app.py')

diff --git a/pippy_app.py b/pippy_app.py
index 1e7bc56..5fbd6c7 100644
--- a/pippy_app.py
+++ b/pippy_app.py
@@ -193,10 +193,13 @@ class PippyActivity(ViewSourceActivity):
 
         # get the Presence Service
         self.pservice = presenceservice.get_instance()
-        name, path = self.pservice.get_preferred_connection()
-        self.tp_conn_name = name
-        self.tp_conn_path = path
-        self.conn = telepathy.client.Connection(name, path)
+        try:
+            name, path = self.pservice.get_preferred_connection()
+            self.tp_conn_name = name
+            self.tp_conn_path = path
+            self.conn = telepathy.client.Connection(name, path)
+        except TypeError:
+            self._logger.debug('No Telepathy CM, offline')
         self.initiating = None
         
         self.connect('shared', self._shared_cb)
--
cgit v0.9.1