From 8973b910701c0eb6b122c0823fffa8a70c4ee6b9 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Fri, 30 May 2008 10:26:33 +0000 Subject: [PATCH] auto_join_bookmarks only join non-opened groupchats. Opened one are already auto-joined on re-connection. Fixes #3891 --- src/gajim.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gajim.py b/src/gajim.py index e34e5f81a..05b4154c6 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -3142,8 +3142,9 @@ class Interface: for bm in gajim.connections[account].bookmarks: if bm['autojoin'] in ('1', 'true'): jid = bm['jid'] - if not gajim.gc_connected[account].has_key(jid) or\ - not gajim.gc_connected[account][jid]: + # Only join non-opened groupchats. Opened one are already + # auto-joined on re-connection + if not gajim.gc_connected[account].has_key(jid): # we are not already connected minimize = bm['minimize'] in ('1', 'true') gajim.interface.join_gc_room(account, jid, bm['nick'],