From 2a980838a9ccc576fe1699f047e00b783ccf7e7b Mon Sep 17 00:00:00 2001 From: mathieui Date: Thu, 20 Dec 2012 18:50:34 +0100 Subject: Fix #2186 (muc password in the config file) Also use the passwords on start, and automatically use a password with /join if there is one. --- src/bookmark.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/bookmark.py') diff --git a/src/bookmark.py b/src/bookmark.py index 8d84022d..c9659cd2 100644 --- a/src/bookmark.py +++ b/src/bookmark.py @@ -73,6 +73,8 @@ class Bookmark(object): if self.nick: local += '/%s' % self.nick local += ':' + if self.password: + config.set_and_save('password', self.password, section=self.jid) return local def parse_from_element(el, method=None): @@ -211,6 +213,7 @@ def get_local(): nick = jid.resource else: nick = None - b = Bookmark(jid.bare, autojoin=True, nick=nick, method='local') + passwd = config.get_by_tabname('password', '', jid.bare, fallback=False) or None + b = Bookmark(jid.bare, autojoin=True, nick=nick, password=passwd, method='local') if not get_by_jid(b.jid): bookmarks.append(b) -- cgit v1.2.3