Commits October 2018

commits@gajim.org

1 participants
107 discussions

[Git][gajim/gajim][gajim_1.1] 3 commits: Update ChangeLog
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 6b63d91f by Philipp Hörist at 2018-10-24T17:09:54Z Update ChangeLog - - - - - 060332e3 by Philipp Hörist at 2018-10-24T17:10:22Z Windows: Add folder to DLL search This makes python look into the `bin` folder when searching for DLLs before it trys C:\Windows or C:\Windows\system32 and potentially finds other versions of DLLs Fixes #8968 - - - - - 4a812dce by Philipp Hörist at 2018-10-24T17:10:22Z Fix Windows build Appveyor adds ssl libs to the system folder which trips pythons ssl module see https://github.com/appveyor/ci/issues/2571 - - - - - 3 changed files: - ChangeLog - appveyor.yml - win/misc/create-launcher.py Changes: ===================================== ChangeLog ===================================== @@ -1,4 +1,18 @@ -Gajim 1.0.99.1 (13 October 2018) +Gajim 1.1.0 (TBA) + + New + + * Remove support for XEP-0091 + + Bug fixes + + * 9322 Error when adding contact + * 9385 Ignore invalid bookmarks + * 9386 Discovery: Browsing nodes without identity + * 9393 Error when parsing invalid timestamps + * 9398 Error on jingle file transfer + +Gajim 1.0.99.1 (07 October 2018) New ===================================== appveyor.yml ===================================== @@ -18,6 +18,8 @@ clone_depth: 1 # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) build_script: + - del C:\Windows\System32\libssl-*.dll C:\Windows\system32\libcrypto-*.dll + - del C:\Windows\SysWOW64\libssl-*.dll C:\Windows\SysWOW64\libcrypto-*.dll - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --noprogressbar --overwrite \\* - ps: | $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() ===================================== win/misc/create-launcher.py ===================================== @@ -87,10 +87,15 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, Py_FrozenFlag = 1; Py_Initialize(); PySys_SetArgvEx(__argc, szArglist, 0); - result = PyRun_SimpleString("import sys; import os;" - "sys.frozen=True;" - "from gajim import gajim;" - "gajim.main();"); + result = PyRun_SimpleString( + "import sys; import os;" + "sys.frozen=True;" + "from pathlib import Path;" + "root_path = Path(sys.executable).parents[1];" + "from ctypes import windll;" + "windll.kernel32.SetDllDirectoryW(str(root_path / 'bin'));" + "from gajim import gajim;" + "gajim.main();"); Py_Finalize(); return result; } View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3db2138e34f2380e65182d49d08ca25b2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3db2138e34f2380e65182d49d08ca25b2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Windows: Add folder to DLL search
by Philipp Hörist 23 Oct '18

23 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: fe21ae60 by Philipp Hörist at 2018-10-23T20:58:49Z Windows: Add folder to DLL search This makes python look into the `bin` folder when searching for DLLs before it trys C:\Windows or C:\Windows\system32 and potentially finds other versions of DLLs Fixes #8968 - - - - - 9184c66e by Philipp Hörist at 2018-10-23T21:27:02Z Fix Windows build Appveyor adds ssl libs to the system folder which trips pythons ssl module see https://github.com/appveyor/ci/issues/2571 - - - - - 2 changed files: - appveyor.yml - win/misc/create-launcher.py Changes: ===================================== appveyor.yml ===================================== @@ -18,6 +18,8 @@ clone_depth: 1 # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) build_script: + - del C:\Windows\System32\libssl-*.dll C:\Windows\system32\libcrypto-*.dll + - del C:\Windows\SysWOW64\libssl-*.dll C:\Windows\SysWOW64\libcrypto-*.dll - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --noprogressbar --overwrite \\* - ps: | $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() ===================================== win/misc/create-launcher.py ===================================== @@ -87,10 +87,15 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, Py_FrozenFlag = 1; Py_Initialize(); PySys_SetArgvEx(__argc, szArglist, 0); - result = PyRun_SimpleString("import sys; import os;" - "sys.frozen=True;" - "from gajim import gajim;" - "gajim.main();"); + result = PyRun_SimpleString( + "import sys; import os;" + "sys.frozen=True;" + "from pathlib import Path;" + "root_path = Path(sys.executable).parents[1];" + "from ctypes import windll;" + "windll.kernel32.SetDllDirectoryW(str(root_path / 'bin'));" + "from gajim import gajim;" + "gajim.main();"); Py_Finalize(); return result; } View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/96653762474aa9ec05499bb8e3fe90721… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/96653762474aa9ec05499bb8e3fe90721… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update ChangeLog
by Philipp Hörist 22 Oct '18

22 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 96653762 by Philipp Hörist at 2018-10-22T17:52:47Z Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,17 @@ +Gajim 1.1.0 (TBA) + + New + + * Remove support for XEP-0091 + + Bug fixes + + * 9322 Error when adding contact + * 9385 Ignore invalid bookmarks + * 9386 Discovery: Browsing nodes without identity + * 9393 Error when parsing invalid timestamps + * 9398 Error on jingle file transfer + Gajim 1.0.99.1 (07 October 2018) New View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/96653762474aa9ec05499bb8e3fe907219… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/96653762474aa9ec05499bb8e3fe907219… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 14 commits: Make bookmark parsing more resilient
by Philipp Hörist 22 Oct '18

22 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: f51c6f6b by Philipp Hörist at 2018-10-22T17:09:12Z Make bookmark parsing more resilient Fixes #9385 - - - - - b9e02f20 by Philipp Hörist at 2018-10-22T17:09:12Z DiscoveryWindow: Add default identity Fixes #9386 - - - - - 2002c3cf by Philipp Hörist at 2018-10-22T17:09:12Z Use parse_datetime for parsing idle time Fixes #9393 - - - - - defdb888 by Philipp Hörist at 2018-10-22T17:09:12Z Remove support for XEP-0091 - - - - - 186626ad by Philipp Hörist at 2018-10-22T17:09:12Z Use parse_delay also for presences - - - - - 5568b970 by Philipp Hörist at 2018-10-22T17:09:12Z Fix missing declaration Fixes #9322 - - - - - 968aae2c by Philipp Hörist at 2018-10-22T17:09:12Z Make idna and precis-18n required dependencys - - - - - 664a96ce by Philipp Hörist at 2018-10-22T17:09:12Z Prepare for nbxmpp API change - - - - - 117be487 by Philipp Hörist at 2018-10-22T17:09:13Z Fix flickering tooltips in 3.24.1 - - - - - ee982229 by André Apitzsch at 2018-10-22T17:09:13Z Flatpak: package new required dependency - - - - - c8ca387f by Philipp Hörist at 2018-10-22T17:09:13Z Remove idna as dependency We use the python inbuilt idna module - - - - - ee7db4f7 by Daniel Brötzmann at 2018-10-22T17:09:13Z Remove ESessions leftovers - - - - - ba82ab9d by Yann Leboulanger at 2018-10-22T17:09:13Z fix regression from [e265514d]: gupnp object is keept globally. Fixes #9398 - - - - - 3db2138e by Philipp Hörist at 2018-10-22T17:09:13Z Make var global - - - - - 13 changed files: - README.md - flatpak/org.gajim.Gajim.yaml - gajim/common/app.py - gajim/common/config.py - gajim/common/connection_handlers_events.py - gajim/common/modules/bookmarks.py - gajim/common/modules/misc.py - gajim/common/modules/util.py - − gajim/data/gui/esession_info_window.ui - gajim/disco.py - gajim/gajim.py - gajim/gtk/add_contact.py - setup.py Changes: ===================================== README.md ===================================== @@ -11,7 +11,7 @@ - python3-openssl (>=0.14) - python3-cssutils (>=1.0.2) - python3-keyring - +- python3-precis-i18n ### Optional Runtime Requirements @@ -25,7 +25,6 @@ - gir1.2-gupnpigd-1.0 for better NAT traversing - gir1.2-networkmanager-1.0 for network lose detection - gir1.2-geoclue-2.0 for sharing your location -- python3-idna and python3-precis-i18n for correctly parsing JIDs ### Compile-time Requirements ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -213,6 +213,15 @@ modules: url: https://files.pythonhosted.org/packages/6b/15/a9fb9010f58d1c55dd0b7779db233… sha256: c74dbe19c92f5052774eadb15136263548dd013250f1ed1027988e7fef125c8d + - name: python3-precis_i18n + buildsystem: simple + build-commands: + - pip3 install --prefix=/app precis_i18n-1.0.0-py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/08/9d/d32f1b7c6d280c82a786b629ba89b… + sha256: f6942bbffec698d0d7e30c42f589f3f6da13e723d047997d0761a41facf2986f + - name: gspell cleanup: - /bin ===================================== gajim/common/app.py ===================================== @@ -145,6 +145,8 @@ ZEROCONF_ACC_NAME = 'Local' idlequeue = None # type: nbxmpp.idlequeue.IdleQueue socks5queue = None +gupnp_igd = None + gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_MUC, nbxmpp.NS_MUC_USER, nbxmpp.NS_MUC_ADMIN, nbxmpp.NS_MUC_OWNER, @@ -275,7 +277,8 @@ def detect_dependencies(): try: gi.require_version('GUPnPIgd', '1.0') from gi.repository import GUPnPIgd - GUPnPIgd.SimpleIgd() + global gupnp_igd + gupnp_igd = GUPnPIgd.SimpleIgd() _dependencies['UPNP'] = True except ValueError: pass ===================================== gajim/common/config.py ===================================== @@ -209,7 +209,6 @@ class Config: 'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')], 'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')], 'tabs_close_button': [opt_bool, True, _('Show close button in tab?')], - 'esession_modp': [opt_str, '15,16,14', _('A list of modp groups to use in a Diffie-Hellman, highest preference first, separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher numbers are more secure, but take longer to calculate when you start a session.')], 'tooltip_status_online_color': [opt_color, '#73D216'], 'tooltip_status_free_for_chat_color': [opt_color, '#3465A4'], 'tooltip_status_away_color': [opt_color, '#EDD400'], ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -17,7 +17,6 @@ # pylint: disable=no-init # pylint: disable=attribute-defined-outside-init -from calendar import timegm import logging from time import time as time_time @@ -30,6 +29,8 @@ from gajim.common import app from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.modules import dataforms +from gajim.common.modules.misc import parse_idle +from gajim.common.modules.misc import parse_delay from gajim.common.const import KindConstant, SSLError from gajim.common.pep import SUPPORTED_PERSONAL_USER_EVENTS from gajim.common.jingle_transport import JingleTransportSocks5 @@ -87,18 +88,6 @@ class HelperEvent: minimized = app.interface.minimized_controls[self.conn.name] self.gc_control = minimized.get(self.jid) - def _generate_timestamp(self, tag): - # Make sure we use only int/float Epoch time - if tag is None: - self.timestamp = time_time() - return - try: - tim = helpers.datetime_tuple(tag) - self.timestamp = timegm(tim) - except Exception: - log.error('wrong timestamp, ignoring it: %s', tag) - self.timestamp = time_time() - def get_oob_data(self, stanza): oob_node = stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) if oob_node is not None: @@ -249,17 +238,14 @@ PresenceHelperEvent): self.user_nick = self.stanza.getTagData('nick') or '' self.contact_nickname = None self.transport_auto_auth = False + # XEP-0203 - delay_tag = self.stanza.getTag('delay', namespace=nbxmpp.NS_DELAY2) - if delay_tag: - self._generate_timestamp(self.stanza.timestamp) + self.timestamp = parse_delay(self.stanza) + if self.timestamp is None: + self.timestamp = time_time() + # XEP-0319 - self.idle_time = None - idle_tag = self.stanza.getTag('idle', namespace=nbxmpp.NS_IDLE) - if idle_tag: - time_str = idle_tag.getAttr('since') - tim = helpers.datetime_tuple(time_str) - self.idle_time = timegm(tim) + self.idle_time = parse_idle(self.stanza) xtags = self.stanza.getTags('x') for x in xtags: @@ -268,9 +254,6 @@ PresenceHelperEvent): self.is_gc = True elif namespace == nbxmpp.NS_SIGNED: sig_tag = x - elif namespace == nbxmpp.NS_DELAY and not self.timestamp: - # XEP-0091 - self._generate_timestamp(self.stanza.timestamp) self.status = self.stanza.getStatus() or '' self._generate_show() ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -166,6 +166,7 @@ class Bookmarks: autojoin_val = conf.getAttr('autojoin') if not autojoin_val: # not there (it's optional) autojoin_val = False + minimize_val = conf.getTag('minimize', namespace=NS_GAJIM_BM) if not minimize_val: # not there, try old Gajim behaviour minimize_val = conf.getAttr('minimize') @@ -189,19 +190,27 @@ class Bookmarks: conf.getAttr('jid')) continue + bookmark = { + 'name': conf.getAttr('name'), + 'password': conf.getTagData('password'), + 'nick': conf.getTagData('nick'), + 'print_status': print_status + } + + try: + bookmark['autojoin'] = from_xs_boolean(autojoin_val) + bookmark['minimize'] = from_xs_boolean(minimize_val) + except ValueError as error: + log.warning(error) + continue + if check_merge: if jid in self.bookmarks: continue merged = True log.debug('Found Bookmark: %s', jid) - self.bookmarks[jid] = { - 'name': conf.getAttr('name'), - 'autojoin': from_xs_boolean(autojoin_val), - 'minimize': from_xs_boolean(minimize_val), - 'password': conf.getTagData('password'), - 'nick': conf.getTagData('nick'), - 'print_status': print_status} + self.bookmarks[jid] = bookmark return merged ===================================== gajim/common/modules/misc.py ===================================== @@ -139,3 +139,24 @@ def parse_xhtml(stanza): if app.config.get('ignore_incoming_xhtml'): return None return stanza.getXHTML() + + +# XEP-0319: Last User Interaction in Presence + +def parse_idle(stanza): + idle_tag = stanza.getTag('idle', namespace=nbxmpp.NS_IDLE) + if idle_tag is None: + return + + since = idle_tag.getAttr('since') + if since is None: + log.warning('No since attr in idle node') + log.warning(stanza) + return + + timestamp = parse_datetime(since, convert='utc', epoch=True) + if timestamp is None: + log.warning('Invalid timestamp received: %s', since) + log.warning(stanza) + + return timestamp ===================================== gajim/common/modules/util.py ===================================== @@ -47,20 +47,16 @@ def is_muc_pm(message: nbxmpp.Node, def from_xs_boolean(value: Union[str, bool]) -> bool: - # Convert a xs:boolean ('true', 'false', '1', '0', '') - # to a python boolean (True, False) if isinstance(value, bool): return value - if value in ('1', 'true'): + if value in ('1', 'true', 'True'): return True - # '0', 'false' or empty - if value in ('0', 'false', ''): + if value in ('0', 'false', 'False', ''): return False - raise ValueError( - 'Cant convert %s to python boolean' % value) + raise ValueError('Cant convert %s to python boolean' % value) def to_xs_boolean(value: Union[bool, None]) -> str: ===================================== gajim/data/gui/esession_info_window.ui deleted ===================================== @@ -1,162 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkDialog" id="esession_info_window"> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="border_width">5</property> - <property name="window_position">center-on-parent</property> - <property name="type_hint">dialog</property> - <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">2</property> - <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="verify_now_button"> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <signal name="clicked" handler="on_verify_now_button_clicked" swapped="no"/> - <child> - <object class="GtkBox" id="hbox3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-apply</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="button_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Verify</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="close_button3"> - <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="title-hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkImage" id="security_image"> - <property name="width_request">32</property> - <property name="height_request">32</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="verification_status_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">4</property> - <child> - <object class="GtkLabel" id="info_display"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">(<b>ESession</b> info)</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">10</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="-10">verify_now_button</action-widget> - <action-widget response="-7">close_button3</action-widget> - </action-widgets> - </object> -</interface> ===================================== gajim/disco.py ===================================== @@ -405,6 +405,10 @@ class ServicesCache: Callback for when we receive an agent's info array is (agent, node, identities, features, data) """ + if not identities: + # Ejabberd doesn't send identities when using admin nodes + identities = [{'category': 'server', 'type': 'im', 'name': node}] + self._on_agent_info(str(from_), node, identities, features, data) def _disco_info_error(self, from_, error): ===================================== gajim/gajim.py ===================================== @@ -74,6 +74,11 @@ def _init_gtk(): from gajim.application import GajimApplication + # Fix bug in 3.24.1 with flickering tooltips + if sys.platform in ('darwin', 'win32'): + settings = Gtk.Settings.get_default() + settings.set_property('gtk-cursor-theme-size', 16) + application = GajimApplication() _install_sginal_handlers(application) application.run(sys.argv) ===================================== gajim/gtk/add_contact.py ===================================== @@ -126,6 +126,7 @@ class AddNewContactWindow(Gtk.ApplicationWindow): type_ = 'jabber' if type_ == 'jabber': self.uid_entry.set_text(jid) + transport = None else: uid, transport = app.get_name_and_server_from_jid(jid) self.uid_entry.set_text(uid.replace('%', '@', 1)) ===================================== setup.py ===================================== @@ -285,8 +285,9 @@ setup( data_files=data_files, install_requires=[ 'keyring', - 'nbxmpp>=0.6.8', + 'nbxmpp>=0.6.8,<0.7.0', 'pyOpenSSL>=0.12', - 'cssutils>=1.0.2' + 'cssutils>=1.0.2', + 'precis-i18n>=1.0.0', ] ) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/479bfa56cb5b93268a8b2ac2a9b6a3496… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/479bfa56cb5b93268a8b2ac2a9b6a3496… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make var global
by Philipp Hörist 22 Oct '18

22 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: dc59801d by Philipp Hörist at 2018-10-22T17:04:37Z Make var global - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== @@ -145,6 +145,8 @@ ZEROCONF_ACC_NAME = 'Local' idlequeue = None # type: nbxmpp.idlequeue.IdleQueue socks5queue = None +gupnp_igd = None + gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_MUC, nbxmpp.NS_MUC_USER, nbxmpp.NS_MUC_ADMIN, nbxmpp.NS_MUC_OWNER, @@ -275,6 +277,7 @@ def detect_dependencies(): try: gi.require_version('GUPnPIgd', '1.0') from gi.repository import GUPnPIgd + global gupnp_igd gupnp_igd = GUPnPIgd.SimpleIgd() _dependencies['UPNP'] = True except ValueError: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dc59801d93e0c691f95388b541d21d9f1e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dc59801d93e0c691f95388b541d21d9f1e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix regression from [e265514d]: gupnp object is keept globally. Fixes #9398
by Yann Leboulanger 22 Oct '18

22 Oct '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 286f820f by Yann Leboulanger at 2018-10-22T11:38:40Z fix regression from [e265514d]: gupnp object is keept globally. Fixes #9398 - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== @@ -275,7 +275,7 @@ def detect_dependencies(): try: gi.require_version('GUPnPIgd', '1.0') from gi.repository import GUPnPIgd - GUPnPIgd.SimpleIgd() + gupnp_igd = GUPnPIgd.SimpleIgd() _dependencies['UPNP'] = True except ValueError: pass View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/286f820f77942c4f8e29e8c1526f2db148… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/286f820f77942c4f8e29e8c1526f2db148… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove ESessions leftovers
by Philipp Hörist 22 Oct '18

22 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f28720d by Daniel Brötzmann at 2018-10-21T21:17:42Z Remove ESessions leftovers - - - - - 2 changed files: - gajim/common/config.py - − gajim/data/gui/esession_info_window.ui Changes: ===================================== gajim/common/config.py ===================================== @@ -209,7 +209,6 @@ class Config: 'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')], 'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')], 'tabs_close_button': [opt_bool, True, _('Show close button in tab?')], - 'esession_modp': [opt_str, '15,16,14', _('A list of modp groups to use in a Diffie-Hellman, highest preference first, separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher numbers are more secure, but take longer to calculate when you start a session.')], 'tooltip_status_online_color': [opt_color, '#73D216'], 'tooltip_status_free_for_chat_color': [opt_color, '#3465A4'], 'tooltip_status_away_color': [opt_color, '#EDD400'], ===================================== gajim/data/gui/esession_info_window.ui deleted ===================================== @@ -1,162 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkDialog" id="esession_info_window"> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="border_width">5</property> - <property name="window_position">center-on-parent</property> - <property name="type_hint">dialog</property> - <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">2</property> - <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="verify_now_button"> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <signal name="clicked" handler="on_verify_now_button_clicked" swapped="no"/> - <child> - <object class="GtkBox" id="hbox3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-apply</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="button_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Verify</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="close_button3"> - <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="title-hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkImage" id="security_image"> - <property name="width_request">32</property> - <property name="height_request">32</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="verification_status_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">4</property> - <child> - <object class="GtkLabel" id="info_display"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">(<b>ESession</b> info)</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">10</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="-10">verify_now_button</action-widget> - <action-widget response="-7">close_button3</action-widget> - </action-widgets> - </object> -</interface> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4f28720db09e44a64606b2c81e5945776b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4f28720db09e44a64606b2c81e5945776b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Add support for distribution as wheel package
by Philipp Hörist 21 Oct '18

21 Oct '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 27c8aff9 by André Apitzsch at 2018-10-21T13:42:03Z Add support for distribution as wheel package https://www.python.org/dev/peps/pep-0427/ - - - - - 0589a264 by Philipp Hörist at 2018-10-21T17:20:09Z Merge branch 'wheel' into 'master' Add support for distribution as wheel package See merge request gajim/python-nbxmpp!18 - - - - - 2 changed files: - + setup.cfg - setup.py Changes: ===================================== setup.cfg ===================================== @@ -0,0 +1,5 @@ +[bdist_wheel] +universal = 1 + +[metadata] +license_file = COPYING ===================================== setup.py ===================================== @@ -1,6 +1,6 @@ #!/usr/bin/env python -from distutils.core import setup +from setuptools import setup setup(name='nbxmpp', version='0.6.8', View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/126a422ef705a7f4e11e0c0e2… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/126a422ef705a7f4e11e0c0e2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Remove unused svn keyword Id
by Philipp Hörist 21 Oct '18

21 Oct '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b1002f82 by André Apitzsch at 2018-10-08T21:16:19Z Remove unused svn keyword Id - - - - - 126a422e by Philipp Hörist at 2018-10-21T17:19:41Z Merge branch 'removeId' into 'master' Remove unused svn keyword Id See merge request gajim/python-nbxmpp!17 - - - - - 7 changed files: - nbxmpp/__init__.py - nbxmpp/client_nb.py - nbxmpp/features_nb.py - nbxmpp/plugin.py - nbxmpp/protocol.py - nbxmpp/roster_nb.py - nbxmpp/simplexml.py Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -1,5 +1,3 @@ -# $Id: __init__.py,v 1.9 2005/03/07 09:34:51 snakeru Exp $ - """ This is a fork of the xmpppy jabber python library. Most of the code is inherited but has been extended by implementation of non-blocking transports ===================================== nbxmpp/client_nb.py ===================================== @@ -14,8 +14,6 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -# $Id: client.py,v 1.52 2006/01/02 19:40:55 normanr Exp $ - """ Client class establishes connection to XMPP Server and handles authentication """ ===================================== nbxmpp/features_nb.py ===================================== @@ -13,8 +13,6 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -# $Id: features.py,v 1.22 2005/09/30 20:13:04 mikealbon Exp $ - """ Different stuff that wasn't worth separating it into modules (Registration, Privacy Lists, ...) ===================================== nbxmpp/plugin.py ===================================== @@ -12,8 +12,6 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -# $Id: client.py,v 1.52 2006/01/02 19:40:55 normanr Exp $ - """ Provides PlugIn class functionality to develop extentions for xmpppy """ ===================================== nbxmpp/protocol.py ===================================== @@ -12,8 +12,6 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -# $Id: protocol.py,v 1.52 2006/01/09 22:08:57 normanr Exp $ - """ Protocol module contains tools that are needed for processing of xmpp-related data structures, including jabber-objects like JID or different stanzas and ===================================== nbxmpp/roster_nb.py ===================================== @@ -14,9 +14,6 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -# $Id: roster.py,v 1.17 2005/05/02 08:38:49 snakeru Exp $ - - """ Simple roster implementation. Can be used though for different tasks like mass-renaming of contacts. ===================================== nbxmpp/simplexml.py ===================================== @@ -12,8 +12,6 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -# $Id: simplexml.py,v 1.27 2005/04/30 07:20:27 snakeru Exp $ - """ Simplexml module provides xmpppy library with all needed tools to handle XML nodes and XML streams. I'm personally using it in many other separate View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/3e4c66556bb830556b16ffae0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/3e4c66556bb830556b16ffae0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove idna as dependency
by Philipp Hörist 21 Oct '18

21 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7397cc8a by Philipp Hörist at 2018-10-21T07:36:36Z Remove idna as dependency We use the python inbuilt idna module - - - - - 3 changed files: - README.md - setup.py - win/_base.sh Changes: ===================================== README.md ===================================== @@ -11,7 +11,6 @@ - python3-openssl (>=0.14) - python3-cssutils (>=1.0.2) - python3-keyring -- python3-idna - python3-precis-i18n ### Optional Runtime Requirements ===================================== setup.py ===================================== @@ -289,6 +289,5 @@ setup( 'pyOpenSSL>=0.12', 'cssutils>=1.0.2', 'precis-i18n>=1.0.0', - 'idna>=2.7', ] ) ===================================== win/_base.sh ===================================== @@ -103,7 +103,6 @@ python-axolotl qrcode cssutils precis-i18n -idna " build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7397cc8af6e3f8efd5d5057dbbd5978cf3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7397cc8af6e3f8efd5d5057dbbd5978cf3… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
...
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2018