Philipp Hörist pushed to branch master at gajim / gajim

Commits: 4f3e4d22 by Philipp Hörist at 2019-01-07T22:44:51Z Pass xml:lang to nbxmpp

- - - - - fc64bee0 by Philipp Hörist at 2019-01-07T22:45:11Z Raise nbxmpp version

- - - - -

5 changed files:

- README.md - gajim/common/connection.py - gajim/common/modules/muc.py - gajim/gajim.py - setup.cfg

Changes:

===================================== README.md ===================================== @@ -7,7 +7,7 @@ - python3-gi - python3-gi-cairo - gir1.2-gtk-3.0 (>=3.22) -- python3-nbxmpp (>=0.9.90.2) +- python3-nbxmpp (>=0.9.90.4) - python3-openssl (>=0.14) - python3-cssutils (>=1.0.2) - python3-keyring

===================================== gajim/common/connection.py ===================================== @@ -60,8 +60,9 @@ from gajim.common import passwords from gajim.common import idle from gajim.common import modules from gajim.common import ged -from gajim.common.nec import NetworkEvent +from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.nec import NetworkEvent from gajim.common.contacts import GC_Contact from gajim.common.connection_handlers import ConnectionHandlers from gajim.common.connection_handlers_events import OurShowEvent @@ -1061,7 +1062,8 @@ class Connection(CommonConnection, ConnectionHandlers): con = nbxmpp.NonBlockingClient( domain=self._hostname, caller=self, - idlequeue=app.idlequeue) + idlequeue=app.idlequeue, + lang=i18n.LANG)

if self._sm_resume_data: con.set_resume_data(self._sm_resume_data)

===================================== gajim/common/modules/muc.py ===================================== @@ -443,7 +443,7 @@ class MUC: return

self._con.connection.get_module('MUC').request_config( - room_jid, i18n.LANG, callback=self._config_received) + room_jid, callback=self._config_received)

def _config_received(self, result): if result.is_error:

===================================== gajim/gajim.py ===================================== @@ -26,7 +26,7 @@ from distutils.version import LooseVersion as V

from gajim.common import i18n

-_MIN_NBXMPP_VER = "0.9.90.2" +_MIN_NBXMPP_VER = "0.9.90.4" _MIN_GTK_VER = "3.22.0"

===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = cssutils>=1.0.2 keyring - nbxmpp>=0.9.90.2 + nbxmpp>=0.9.90.4 precis-i18n>=1.0.0 pyOpenSSL>=0.12

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/84b2392fcc4c37c758be17e0efda3b3aeb...