Commits December 2017

commits@gajim.org

1 participants
64 discussions

[Git][gajim/gajim][master] Catch exception when parsing avatars
by Philipp Hörist 29 Dec '17

29 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b8fd8c8a by Philipp Hörist at 2017-12-29T20:14:59+01:00 Catch exception when parsing avatars If the VCard contains a <PHOTO/> tag this is parsed as {'PHOTO': ''} this throws: TypeError: string indices must be integers - - - - - 1 changed file: - gajim/common/connection_handlers.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -477,7 +477,7 @@ class ConnectionVcard: def _get_vcard_photo(self, vcard, jid): try: photo = vcard['PHOTO']['BINVAL'] - except (KeyError, AttributeError): + except (KeyError, AttributeError, TypeError): avatar_sha = None photo_decoded = None else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b8fd8c8a3fbdd1f69528ce6e9de3d75c11… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b8fd8c8a3fbdd1f69528ce6e9de3d75c11… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused code
by Philipp Hörist 29 Dec '17

29 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 361ad92b by Philipp Hörist at 2017-12-29T19:08:05+01:00 Remove unused code - - - - - 2 changed files: - gajim/common/resolver.py - gajim/gui_interface.py Changes: ===================================== gajim/common/resolver.py ===================================== --- a/gajim/common/resolver.py +++ b/gajim/common/resolver.py @@ -20,18 +20,12 @@ import sys import logging import functools -log = logging.getLogger('gajim.c.resolver') - -if __name__ == '__main__': - sys.path.append('../..') - from gajim.common import i18n - from gajim.common import configpaths - configpaths.gajimpaths.init(None) from gi.repository import Gio, GLib +log = logging.getLogger('gajim.c.resolver') -def get_resolver(idlequeue): +def get_resolver(): return GioResolver() @@ -141,10 +135,7 @@ class GioResolver(CommonResolver): # below lines is on how to use API and assist in testing if __name__ == '__main__': from gi.repository import Gtk - from nbxmpp import idlequeue - - idlequeue = idlequeue.get_idlequeue() - resolver = get_resolver(idlequeue) + resolver = get_resolver() def clicked(widget): global resolver @@ -165,5 +156,4 @@ if __name__ == '__main__': but.connect('clicked', clicked) win.add(hbox) win.show_all() - GLib.timeout_add(200, idlequeue.process) Gtk.main() ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2773,7 +2773,7 @@ class Interface: app.idlequeue = idlequeue.get_idlequeue() # resolve and keep current record of resolved hosts - app.resolver = resolver.get_resolver(app.idlequeue) + app.resolver = resolver.get_resolver() app.socks5queue = socks5.SocksQueue(app.idlequeue, self.handle_event_file_rcv_completed, self.handle_event_file_progress, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/361ad92b26ba45b67bac0c748cff0914b8… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/361ad92b26ba45b67bac0c748cff0914b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Raise nbxmpp version
by Philipp Hörist 28 Dec '17

28 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1d835fbf by Philipp Hörist at 2017-12-28T18:10:26+01:00 Raise nbxmpp version - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -53,7 +53,7 @@ from gajim.common import i18n from gajim.common import logging_helpers from gajim.common import crypto -MIN_NBXMPP_VER = "0.6.1" +MIN_NBXMPP_VER = "0.6.2" MIN_GTK_VER = "3.20.0" View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1d835fbfd74fc7019ccf197fdeef6ae9a4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1d835fbfd74fc7019ccf197fdeef6ae9a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix LMC in Groupchats
by Philipp Hörist 28 Dec '17

28 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: ccc69bc7 by Philipp Hörist at 2017-12-28T17:37:37+01:00 Fix LMC in Groupchats - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1994,6 +1994,8 @@ class GroupchatControl(ChatControlBase): self.model.remove(parent_iter) def _message_sent(self, obj): + if not obj.message: + return # we'll save sent message text when we'll receive it in # _nec_gc_message_received self.last_sent_msg = obj.stanza_id View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ccc69bc7ee04824a3e51a2f01260098a41… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ccc69bc7ee04824a3e51a2f01260098a41… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add support for XEP-0368
by Philipp Hörist 27 Dec '17

27 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8e09fd92 by Marc Schink at 2017-12-20T18:38:01+01:00 Add support for XEP-0368 - Use xmpps-client SRV records - Use separate host entry per connection type - Replace 'connection_types' with 'allow_plaintext_connection' option - - - - - d3333ba9 by Philipp Hörist at 2017-12-27T22:10:26+01:00 Merge branch 'xep_0368' into 'master' Add support for XEP-0368 See merge request gajim/gajim!177 - - - - - 2 changed files: - gajim/common/config.py - gajim/common/connection.py Changes: ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -339,8 +339,7 @@ class Config: 'keyname': [ opt_str, '', '', True ], 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.'), True], 'autonegotiate_esessions': [opt_bool, False, _('Should Gajim automatically start an encrypted session when possible?')], - #keep tls, ssl and plain lowercase - 'connection_types': [ opt_str, 'tls', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], + 'allow_plaintext_connection': [ opt_bool, False, _('Allow plaintext connections')], 'tls_version': [ opt_str, '1.2', '' ], 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], 'authentication_mechanisms': [ opt_str, '', _('List (space separated) of authentication mechanisms to try. Can contain ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, PLAIN, X-MESSENGER-OAUTH2 or XEP-0078') ], ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -110,6 +110,9 @@ ssl_error = { #100 is for internal usage: host not correct } +SERVICE_START_TLS = 'xmpp-client' +SERVICE_DIRECT_TLS = 'xmpps-client' + class CommonConnection: """ Common connection class, can be derivated for normal connection or zeroconf @@ -643,10 +646,8 @@ class Connection(CommonConnection, ConnectionHandlers): CommonConnection.__init__(self, name) ConnectionHandlers.__init__(self) # this property is used to prevent double connections - self.last_connection = None # last ClientCommon instance # If we succeed to connect, remember it so next time we try (after a # disconnection) we try only this type. - self.last_connection_type = None self.lang = None if locale.getdefaultlocale()[0]: self.lang = locale.getdefaultlocale()[0].split('_')[0] @@ -789,7 +790,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.terminate_sessions() self.remove_all_transfers() self.connection.disconnect() - self.last_connection = None self.connection = None def set_oldst(self): # Set old state @@ -1078,29 +1078,50 @@ class Connection(CommonConnection, ConnectionHandlers): self.redirected = None # SRV resolver self._proxy = proxy - self._hosts = [ {'host': h, 'port': p, 'ssl_port': ssl_p, 'prio': 10, - 'weight': 10} ] + self._hosts = [ + {'host': h, 'port': p, 'type': 'tls', 'prio': 10, 'weight': 10}, + {'host': h, 'port': ssl_p, 'type': 'ssl', 'prio': 10, 'weight': 10}, + {'host': h, 'port': p, 'type': 'plain', 'prio': 10, 'weight': 10} + ] self._hostname = hostname if use_srv and self._proxy is None: - # add request for srv query to the resolve, on result '_on_resolve' - # will be called - app.resolver.resolve('_xmpp-client._tcp.' + helpers.idn_to_ascii( - h), self._on_resolve) + self._srv_hosts = [] + + services = [SERVICE_START_TLS, SERVICE_DIRECT_TLS] + self._num_pending_srv_records = len(services) + + for service in services: + record_name = '_' + service + '._tcp.' + helpers.idn_to_ascii(h) + app.resolver.resolve(record_name, self._on_resolve_srv) else: - self._on_resolve('', []) + self._connect_to_next_host() + + def _append_srv_record(self, record, con_type): + tmp = record.copy() + tmp['type'] = con_type + + if tmp in self._srv_hosts: + return + + self._srv_hosts.append(tmp) + + def _on_resolve_srv(self, host, result): + for record in result: + service = host[1:] + if service.startswith(SERVICE_START_TLS): + self._append_srv_record(record, 'tls') + self._append_srv_record(record, 'plain') + elif service.startswith(SERVICE_DIRECT_TLS): + self._append_srv_record(record, 'ssl') + + self._num_pending_srv_records -= 1 + if self._num_pending_srv_records: + return + + if self._srv_hosts: + self._hosts = self._srv_hosts.copy() - def _on_resolve(self, host, result_array): - # SRV query returned at least one valid result, we put it in hosts dict - if len(result_array) != 0: - self._hosts = [i for i in result_array] - # Add ssl port - ssl_p = 5223 - if app.config.get_per('accounts', self.name, 'use_custom_host'): - ssl_p = app.config.get_per('accounts', self.name, - 'custom_port') - for i in self._hosts: - i['ssl_port'] = ssl_p self._connect_to_next_host() def _on_resolve_txt(self, host, result_array): @@ -1128,34 +1149,7 @@ class Connection(CommonConnection, ConnectionHandlers): def _connect_to_next_host(self, retry=False): log.debug('Connection to next host') - if len(self._hosts): - # No config option exist when creating a new account - if self.name in app.config.get_per('accounts'): - self._connection_types = app.config.get_per('accounts', self.name, - 'connection_types').split() - else: - self._connection_types = ['tls', 'ssl'] - if self.last_connection_type: - if self.last_connection_type in self._connection_types: - self._connection_types.remove(self.last_connection_type) - self._connection_types.insert(0, self.last_connection_type) - - - if self._proxy and self._proxy['type']=='bosh': - # with BOSH, we can't do TLS negotiation with <starttls>, we do only "plain" - # connection and TLS with handshake right after TCP connecting ("ssl") - scheme = nbxmpp.transports_nb.urisplit(self._proxy['bosh_uri'])[0] - if scheme=='https': - self._connection_types = ['ssl'] - else: - self._connection_types = ['plain'] - - host = self._select_next_host(self._hosts) - self._current_host = host - self._hosts.remove(host) - self.connect_to_next_type() - - else: + if not self._hosts: if not retry and self.retrycount == 0: log.debug("Out of hosts, giving up connecting to %s", self.name) self.time_to_reconnect = None @@ -1169,66 +1163,74 @@ class Connection(CommonConnection, ConnectionHandlers): # try reconnect if connection has failed before auth to server self.disconnectedReconnCB() - def connect_to_next_type(self, retry=False): + return + + connection_types = ['tls', 'ssl'] + allow_plaintext_connection = app.config.get_per('accounts', self.name, + 'allow_plaintext_connection') + + if allow_plaintext_connection: + connection_types.append('plain') + + if self._proxy and self._proxy['type'] == 'bosh': + # with BOSH, we can't do TLS negotiation with <starttls>, we do only "plain" + # connection and TLS with handshake right after TCP connecting ("ssl") + scheme = nbxmpp.transports_nb.urisplit(self._proxy['bosh_uri'])[0] + if scheme == 'https': + connection_types = ['ssl'] + else: + connection_types = ['plain'] + + host = self._select_next_host(self._hosts) + self._hosts.remove(host) + + # Skip record if connection type is not supported. + if host['type'] not in connection_types: + log.debug("Skipping connection record with unsupported type: %s" % + host['type']) + self._connect_to_next_host(retry) + return + + self._current_host = host + if self.redirected: self.disconnect(on_purpose=True) self.connect() return - if len(self._connection_types): - self._current_type = self._connection_types.pop(0) - if self.last_connection: - self.last_connection.socket.disconnect() - self.last_connection = None - self.connection = None - - if self._current_type == 'ssl': - # SSL (force TLS on different port than plain) - # If we do TLS over BOSH, port of XMPP server should be the standard one - # and TLS should be negotiated because TLS on 5223 is deprecated - if self._proxy and self._proxy['type']=='bosh': - port = self._current_host['port'] - else: - port = self._current_host['ssl_port'] - elif self._current_type == 'tls': - # TLS - negotiate tls after XMPP stream is estabilished - port = self._current_host['port'] - elif self._current_type == 'plain': - # plain connection on defined port - port = self._current_host['port'] - - cacerts = os.path.join(common.app.DATA_DIR, 'other', 'cacerts.pem') - if not os.path.exists(cacerts): - cacerts = '' - mycerts = common.app.MY_CACERTS - tls_version = app.config.get_per('accounts', self.name, - 'tls_version') - cipher_list = app.config.get_per('accounts', self.name, - 'cipher_list') - secure_tuple = (self._current_type, cacerts, mycerts, tls_version, cipher_list) - - con = nbxmpp.NonBlockingClient( - domain=self._hostname, - caller=self, - idlequeue=app.idlequeue) - - self.last_connection = con - # increase default timeout for server responses - nbxmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \ - self.try_connecting_for_foo_secs - # FIXME: this is a hack; need a better way - if self.on_connect_success == self._on_new_account: - con.RegisterDisconnectHandler(self._on_new_account) - - if self.client_cert and app.config.get_per('accounts', self.name, - 'client_cert_encrypted'): - app.nec.push_incoming_event(ClientCertPassphraseEvent( - None, conn=self, con=con, port=port, - secure_tuple=secure_tuple)) - return - self.on_client_cert_passphrase('', con, port, secure_tuple) - else: - self._connect_to_next_host(retry) + self._current_type = self._current_host['type'] + + port = self._current_host['port'] + cacerts = os.path.join(common.app.DATA_DIR, 'other', 'cacerts.pem') + if not os.path.exists(cacerts): + cacerts = '' + mycerts = common.app.MY_CACERTS + tls_version = app.config.get_per('accounts', self.name, + 'tls_version') + cipher_list = app.config.get_per('accounts', self.name, + 'cipher_list') + secure_tuple = (self._current_type, cacerts, mycerts, tls_version, + cipher_list) + + con = nbxmpp.NonBlockingClient( + domain=self._hostname, + caller=self, + idlequeue=app.idlequeue) + + # increase default timeout for server responses + nbxmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \ + self.try_connecting_for_foo_secs + # FIXME: this is a hack; need a better way + if self.on_connect_success == self._on_new_account: + con.RegisterDisconnectHandler(self._on_new_account) + + if self.client_cert and app.config.get_per('accounts', self.name, + 'client_cert_encrypted'): + app.nec.push_incoming_event(ClientCertPassphraseEvent( + None, conn=self, con=con, port=port, + secure_tuple=secure_tuple)) + return + self.on_client_cert_passphrase('', con, port, secure_tuple) def on_client_cert_passphrase(self, passphrase, con, port, secure_tuple): self.client_cert_passphrase = passphrase @@ -1239,7 +1241,7 @@ class Connection(CommonConnection, ConnectionHandlers): port=port, on_connect=self.on_connect_success, on_proxy_failure=self.on_proxy_failure, - on_connect_failure=self.connect_to_next_type, + on_connect_failure=self._connect_to_next_host, on_stream_error_cb=self._StreamCB, proxy=self._proxy, secure_tuple = secure_tuple) @@ -1295,9 +1297,9 @@ class Connection(CommonConnection, ConnectionHandlers): return _con_type = con_type if _con_type != self._current_type: - log.info('Connecting to next type beacuse desired is %s and returned is %s' + log.info('Connecting to next host beacuse desired type is %s and returned is %s' % (self._current_type, _con_type)) - self.connect_to_next_type() + self._connect_to_next_host() return con.RegisterDisconnectHandler(self._on_disconnected) if _con_type == 'plain' and app.config.get_per('accounts', self.name, @@ -1329,7 +1331,7 @@ class Connection(CommonConnection, ConnectionHandlers): msg=_('Connection with account %s has been lost. Retry ' 'connecting.') % self.name)) return - self.hosts = [] + self._hosts = [] self.connection_auto_accepted = False self.connected_hostname = self._current_host['host'] self.on_connect_failure = None @@ -1338,15 +1340,6 @@ class Connection(CommonConnection, ConnectionHandlers): log.debug('Connected to server %s:%s with %s' % ( self._current_host['host'], self._current_host['port'], con_type)) - self.last_connection_type = con_type - if con_type == 'tls' and 'ssl' in self._connection_types: - # we were about to try ssl after tls, but tls succeed, so - # definitively stop trying ssl - con_types = app.config.get_per('accounts', self.name, - 'connection_types').split() - con_types.remove('ssl') - app.config.set_per('accounts', self.name, 'connection_types', - ' '.join(con_types)) if app.config.get_per('accounts', self.name, 'anonymous_auth'): name = None else: @@ -2228,7 +2221,7 @@ class Connection(CommonConnection, ConnectionHandlers): def _on_new_account(self, con=None, con_type=None): if not con_type: - if len(self._connection_types) or len(self._hosts): + if self._hosts: # There are still other way to try to connect return reason = _('Could not connect to "%s"') % self._hostname View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8ea39cff754c87ec6a6e51e7c1e8f1e26… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8ea39cff754c87ec6a6e51e7c1e8f1e26… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-0.6.2
by Philipp Hörist 27 Dec '17

27 Dec '17

Philipp Hörist pushed new tag nbxmpp-0.6.2 at gajim / python-nbxmpp --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/tree/nbxmpp-0.6.2 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Update Changelog
by Philipp Hörist 27 Dec '17

27 Dec '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: bd95b25f by Philipp Hörist at 2017-12-27T20:22:17+01:00 Update Changelog - - - - - 82fafe74 by Philipp Hörist at 2017-12-27T20:23:06+01:00 Prepare 0.6.2 release - - - - - 3 changed files: - ChangeLog - nbxmpp/__init__.py - setup.py Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +python-nbxmpp 0.6.2 (27 December 2017) + + * Correctly load client certs + * Warn on any error in the certificate chain + * Fixed a traceback loop + python-nbxmpp 0.6.1 (29 November 2017) * Add new getStanzaIDAttrs method ===================================== nbxmpp/__init__.py ===================================== --- a/nbxmpp/__init__.py +++ b/nbxmpp/__init__.py @@ -17,4 +17,4 @@ from .client_nb import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.6.1" +__version__ = "0.6.2" ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.6.1', + version='0.6.2', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org', View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/abfe8658091b987f76732c74f… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/abfe8658091b987f76732c74f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix SSL verify
by Philipp Hörist 27 Dec '17

27 Dec '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: abfe8658 by Philipp Hörist at 2017-12-27T19:57:28+01:00 Fix SSL verify Fixes #37 This commit was lost while migrating from mercurial to Git - - - - - 1 changed file: - nbxmpp/tls_nb.py Changes: ===================================== nbxmpp/tls_nb.py ===================================== --- a/nbxmpp/tls_nb.py +++ b/nbxmpp/tls_nb.py @@ -494,13 +494,13 @@ class NonBlockingTLS(PlugIn): def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: + if not self._owner.ssl_errnum: + self._owner.ssl_errnum = errnum if depth == 0: self._owner.ssl_certificate = cert - if not ok: - self._owner.ssl_errnum = errnum return True - except: - log.error("Exception caught in _ssl_info_callback:", exc_info=True) + except Exception: + log.exception("Exception caught in _ssl_info_callback:") # Make sure something is printed, even if log is disabled. traceback.print_exc() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/abfe8658091b987f76732c74f7… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/abfe8658091b987f76732c74f7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add 'active' chatstate to groupchat messages
by Philipp Hörist 27 Dec '17

27 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8ea39cff by Philipp Hörist at 2017-12-27T19:09:12+01:00 Add 'active' chatstate to groupchat messages Fixes #8801 - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -2032,11 +2032,19 @@ class GroupchatControl(ChatControlBase): correct_id = self.last_sent_msg else: correct_id = None + + # Set chatstate + chatstate = None + if app.config.get('outgoing_chat_state_notifications') != 'disabled': + chatstate = 'active' + self.reset_kbd_mouse_timeout_vars() + self.contact.our_chatstate = chatstate + # Send the message - app.nec.push_outgoing_event(GcMessageOutgoingEvent(None, - account=self.account, jid=self.room_jid, message=message, - xhtml=xhtml, label=label, correct_id=correct_id, - automatic_message=False)) + app.nec.push_outgoing_event(GcMessageOutgoingEvent( + None, account=self.account, jid=self.room_jid, message=message, + xhtml=xhtml, label=label, chatstate=chatstate, + correct_id=correct_id, automatic_message=False)) self.msg_textview.get_buffer().set_text('') self.msg_textview.grab_focus() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8ea39cff754c87ec6a6e51e7c1e8f1e260… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8ea39cff754c87ec6a6e51e7c1e8f1e260… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Use higher level API to focus windows
by Philipp Hörist 26 Dec '17

26 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 23de7d53 by Philipp Hörist at 2017-12-26T21:55:19+01:00 Use higher level API to focus windows set_active_tab() already calls present(), no need to call it afterwards again - - - - - 1b2ab928 by Philipp Hörist at 2017-12-26T21:55:19+01:00 Fix focus after destruction of StartChatDialog On destroy() the window that was last focused gets the focus again. if destroy() is called from the StartChat Dialog, the new ChatControl is not yet focused, because present() seems to be asynchron, at least on KDE, and takes time. - - - - - 6 changed files: - gajim/dialogs.py - gajim/gui_interface.py - gajim/message_window.py - gajim/remote_control.py - gajim/roster_window.py - plugins/dbus_plugin/plugin.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2776,6 +2776,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self.set_show_menubar(False) self.set_title(_('Start new Conversation')) self.set_default_size(-1, 400) + self.ready_to_destroy = False self.builder = gtkgui_helpers.get_gtk_builder( 'start_chat_dialog.ui') @@ -2891,7 +2892,7 @@ class StartChatDialog(Gtk.ApplicationWindow): else: app.interface.new_chat_from_jid(row.account, row.jid) - self.destroy() + self.ready_to_destroy = True def _on_search_changed(self, entry): search_text = entry.get_text() ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1767,7 +1767,7 @@ class Interface: self.roster.draw_contact(jid, account) if w: w.set_active_tab(ctrl) - w.window.get_window().focus(Gtk.get_current_event_time()) + w.window.present() # Using isinstance here because we want to catch all derived types if isinstance(ctrl, ChatControlBase): tv = ctrl.conv_textview @@ -2145,7 +2145,6 @@ class Interface: # For JEP-0172 if added_to_roster: ctrl.user_nick = app.nicks[account] - GLib.idle_add(mw.window.grab_focus) return ctrl ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -204,6 +204,14 @@ class MessageWindow(object): gtkgui_helpers.resize_window(self.window, width, height) def _on_window_focus(self, widget, event): + # on destroy() the window that was last focused gets the focus + # again. if destroy() is called from the StartChat Dialog, this + # Window is not yet focused, because present() seems to be asynchron + # at least on KDE, and takes time. + if 'start_chat' in app.interface.instances: + if app.interface.instances['start_chat'].ready_to_destroy: + app.interface.instances['start_chat'].destroy() + # window received focus, so if we had urgency REMOVE IT # NOTE: we do not have to read the message (it maybe in a bg tab) # to remove urgency hint so this functions does that ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -519,7 +519,7 @@ class SignalObject(dbus.service.Object): win = app.interface.msg_win_mgr.get_window(jid, connected_account).window if win.get_property('visible'): - win.window.focus(Gtk.get_current_event_time()) + win.window.present() return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False) @@ -658,9 +658,9 @@ class SignalObject(dbus.service.Object): win.present() # preserve the 'steal focus preservation' if self._is_first(): - win.window.focus(Gtk.get_current_event_time()) + win.window.present() else: - win.window.focus(int(time())) + win.window.present_with_time(int(time())) @dbus.service.method(INTERFACE, in_signature='', out_signature='') def show_roster(self): @@ -671,9 +671,9 @@ class SignalObject(dbus.service.Object): win.present() # preserve the 'steal focus preservation' if self._is_first(): - win.window.focus(Gtk.get_current_event_time()) + win.window.present() else: - win.window.focus(int(time())) + win.window.present_with_time(int(time())) @dbus.service.method(INTERFACE, in_signature='', out_signature='') def toggle_ipython(self): ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -3131,7 +3131,6 @@ class RosterWindow: if gc_control: mw = app.interface.msg_win_mgr.get_window(jid, account) mw.set_active_tab(gc_control) - mw.window.get_window().focus(Gtk.get_current_event_time()) return ctrl = app.interface.minimized_controls[account][jid] mw = app.interface.msg_win_mgr.get_window(jid, account) @@ -3145,7 +3144,6 @@ class RosterWindow: ctrl.on_groupchat_maximize() mw.new_tab(ctrl) mw.set_active_tab(ctrl) - mw.window.get_window().focus(Gtk.get_current_event_time()) self.remove_groupchat(jid, account) def on_edit_account(self, widget, account): ===================================== plugins/dbus_plugin/plugin.py ===================================== --- a/plugins/dbus_plugin/plugin.py +++ b/plugins/dbus_plugin/plugin.py @@ -367,7 +367,7 @@ if dbus_support.supported: win = gajim.interface.msg_win_mgr.get_window(jid, connected_account).window if win.get_property('visible'): - win.window.focus() + win.window.present() return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False) @@ -455,9 +455,9 @@ if dbus_support.supported: win.present() # preserve the 'steal focus preservation' if self._is_first(): - win.window.focus() + win.window.present() else: - win.window.focus(long(time())) + win.window.present_with_time(long(time())) @dbus.service.method(INTERFACE, in_signature='', out_signature='') def toggle_ipython(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fd7f30204413bbdf4b72b6fd8b2ab1b76… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fd7f30204413bbdf4b72b6fd8b2ab1b76… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2017