copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some more bugfixes (see 0.16 branch)

This commit is contained in:
tmolitor 2016-07-17 14:29:53 +02:00
parent d99f190ac6
commit ac729ce050
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/connection.py
View File

@ -479,8 +479,8 @@ class CommonConnection:
# 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,

4
src/dialogs.py
View File

@ -1366,8 +1366,8 @@ class AboutDialog:
"""
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: