diff options
| author | Morgan Collett <morgan.collett@gmail.com> | 2008-02-15 14:27:58 (GMT) |
|---|---|---|
| committer | Chris Ball <cjb@pullcord.laptop.org> | 2008-02-15 14:27:58 (GMT) |
| commit | 57e6842377fa5887a38b7d05a51b7de525dc15d1 (patch) | |
| tree | 9fb760a19bca67fc9db8bc5f2cbe9b432d552da0 /pippy_app.py | |
| parent | ff46202e1bc80b7ce20a2ae28983943b19b917a7 (diff) | |
Trac 6475: Fix crash on launch when no telepathy connection
Diffstat (limited to 'pippy_app.py')
| -rw-r--r-- | pippy_app.py | 11 |
1 files changed, 7 insertions, 4 deletions
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) |