diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | pippy_app.py | 11 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,5 @@ +* #6475: Fix crash on launch when no telepathy connection (morgs) + 18 * Updated translations for release. 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) |