Some more bugfixes (see 0.16 branch)

2016-07-17 14:29:53 +02:00 · 2016-07-17 14:29:53 +02:00 · ac729ce050
--- a/src/common/connection.py
+++ b/src/common/connection.py
@ -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,
--- a/src/dialogs.py
+++ b/src/dialogs.py
@ -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: