changeset 39bc01c577a5 in /home/hg/repos/gajim

author: tmolitor thilo@eightysoft.de branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=39bc01c577a5 description: Some more bugfixes (see 0.16 branch)

diffstat:

src/common/connection.py | 4 ++-- src/dialogs.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 8e864acec622 -r 39bc01c577a5 src/common/connection.py --- a/src/common/connection.py Sun Jul 17 14:24:13 2016 +0200 +++ b/src/common/connection.py Sun Jul 17 14:29:53 2016 +0200 @@ -479,8 +479,8 @@ # chatstates - if peer supports xep85, send chatstates # please note that the only valid tag inside a message containing a # <body> tag is the active event - if chatstate and contact and contact.supports(NS_CHATSTATES): - msg_iq.setTag(chatstate, namespace=NS_CHATSTATES) + if chatstate and contact and contact.supports(nbxmpp.NS_CHATSTATES): + msg_iq.setTag(chatstate, namespace=nbxmpp.NS_CHATSTATES)

# XEP-0184 if msgtxt and gajim.config.get_per('accounts', self.name, diff -r 8e864acec622 -r 39bc01c577a5 src/dialogs.py --- a/src/dialogs.py Sun Jul 17 14:24:13 2016 +0200 +++ b/src/dialogs.py Sun Jul 17 14:29:53 2016 +0200 @@ -1366,8 +1366,8 @@ """ Where can we find this Credits file? """ - if os.path.isfile(os.path.join(gajim.defs.docdir, filename)): - return os.path.join(gajim.defs.docdir, filename) + if os.path.isfile(os.path.join(defs.docdir, filename)): + return os.path.join(defs.docdir, filename) elif os.path.isfile('../' + filename): return ('../' + filename) else: