Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim
Commits:
-
191a5772
by Philipp Hörist at 2018-03-17T14:16:59+01:00
-
c3896630
by Philipp Hörist at 2018-03-17T14:17:08+01:00
-
4fec13b7
by Philipp Hörist at 2018-03-17T14:17:19+01:00
3 changed files:
Changes:
| ... | ... | @@ -228,7 +228,8 @@ try: |
| 228 | 228 |
session = conference.new_session(Farstream.MediaType.AUDIO)
|
| 229 | 229 |
del session
|
| 230 | 230 |
del conference
|
| 231 |
- except GLib.GError:
|
|
| 231 |
+ except Exception as e:
|
|
| 232 |
+ glog.info(e)
|
|
| 232 | 233 |
HAVE_FARSTREAM = False
|
| 233 | 234 |
|
| 234 | 235 |
except (ImportError, ValueError):
|
| ... | ... | @@ -1104,8 +1104,12 @@ class Logger: |
| 1104 | 1104 |
|
| 1105 | 1105 |
:param account_jid: The jid of the account
|
| 1106 | 1106 |
"""
|
| 1107 |
- |
|
| 1108 |
- jid_id = self.get_jid_id(account_jid)
|
|
| 1107 |
+ try:
|
|
| 1108 |
+ jid_id = self.get_jid_id(account_jid)
|
|
| 1109 |
+ except ValueError:
|
|
| 1110 |
+ # This happens if the JID never made it to the Database
|
|
| 1111 |
+ # because the account was never connected
|
|
| 1112 |
+ return
|
|
| 1109 | 1113 |
|
| 1110 | 1114 |
sql = '''
|
| 1111 | 1115 |
DELETE FROM roster_entry WHERE account_jid_id = {jid_id};
|
| ... | ... | @@ -227,7 +227,7 @@ class Interface: |
| 227 | 227 |
path = gtkgui_helpers.get_icon_path('gajim-connection_lost', 48)
|
| 228 | 228 |
account = obj.conn.name
|
| 229 | 229 |
notify.popup(_('Connection Failed'), account, account,
|
| 230 |
- '', path, obj.title, obj.msg)
|
|
| 230 |
+ 'connection-lost', path, obj.title, obj.msg)
|
|
| 231 | 231 |
|
| 232 | 232 |
@staticmethod
|
| 233 | 233 |
def unblock_signed_in_notifications(account):
|
| ... | ... | @@ -1685,6 +1685,10 @@ class Interface: |
| 1685 | 1685 |
resource = app.get_resource_from_jid(fjid)
|
| 1686 | 1686 |
jid = app.get_jid_without_resource(fjid)
|
| 1687 | 1687 |
|
| 1688 |
+ if type_ == 'connection-lost':
|
|
| 1689 |
+ app.interface.roster.window.present()
|
|
| 1690 |
+ return
|
|
| 1691 |
+ |
|
| 1688 | 1692 |
if type_ in ('printed_gc_msg', 'printed_marked_gc_msg', 'gc_msg'):
|
| 1689 | 1693 |
w = self.msg_win_mgr.get_window(jid, account)
|
| 1690 | 1694 |
if jid in self.minimized_controls[account]:
|