Commits December 2018

commits@gajim.org

1 participants
81 discussions

[Git][gajim/gajim][master] Remove unused event
by Philipp Hörist 04 Dec '18

04 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 932377f5 by Philipp Hörist at 2018-12-04T18:32:13Z Remove unused event - - - - - 2 changed files: - gajim/common/connection.py - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -450,16 +450,11 @@ class CommonConnection: if app.is_installed('GPG'): self.USE_GPG = True self.gpg = gpg.GnuPG() - app.nec.push_incoming_event(BeforeChangeShowEvent(None, - conn=self, show=show, message=msg)) self.connect_and_init(show, msg, sign_msg) return if show == 'offline': if self.connection: - app.nec.push_incoming_event(BeforeChangeShowEvent(None, - conn=self, show=show, message=msg)) - p = self.get_module('Presence').get_presence( typ='unavailable', status=msg, @@ -474,8 +469,6 @@ class CommonConnection: if self.connected == 1: return if show == 'invisible': - app.nec.push_incoming_event(BeforeChangeShowEvent(None, - conn=self, show=show, message=msg)) self._change_to_invisible(msg) return if show not in ['offline', 'online', 'chat', 'away', 'xa', 'dnd']: @@ -488,8 +481,6 @@ class CommonConnection: idle_sec = idle.Monitor.get_idle_sec() idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(time.time() - idle_sec)) - app.nec.push_incoming_event(BeforeChangeShowEvent(None, - conn=self, show=show, message=msg)) if was_invisible: self._change_from_invisible() self._update_status(show, msg, idle_time=idle_time) ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -397,9 +397,6 @@ class GcPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): class OurShowEvent(nec.NetworkIncomingEvent): name = 'our-show' -class BeforeChangeShowEvent(nec.NetworkIncomingEvent): - name = 'before-change-show' - class GcMessageReceivedEvent(nec.NetworkIncomingEvent): name = 'gc-message-received' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/932377f533a97d25aabf210b4fe52fb0a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/932377f533a97d25aabf210b4fe52fb0a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Refactor disconnect code
by Philipp Hörist 04 Dec '18

04 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 78f439c6 by Philipp Hörist at 2018-12-04T18:28:50Z Refactor disconnect code Fixes #9467 - - - - - 700666b8 by Philipp Hörist at 2018-12-04T18:29:32Z Refactor send timeouts Fixes #9459 - - - - - 7 changed files: - gajim/common/connection.py - gajim/common/modules/ping.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/config.py - gajim/gtk/account_wizard.py - gajim/gui_interface.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -44,6 +44,7 @@ from string import Template from urllib.request import urlopen from urllib.error import URLError +from gi.repository import GLib if sys.platform in ('win32', 'darwin'): import certifi import OpenSSL.crypto @@ -85,7 +86,6 @@ class CommonConnection: # ... self.connected = 0 self.connection = None # xmpppy ClientCommon instance - self.on_purpose = False self.is_zeroconf = False self.password = '' self.server_resource = self._compute_resource() @@ -98,6 +98,7 @@ class CommonConnection: self.old_show = '' self.priority = app.get_priority(name, 'offline') self.time_to_reconnect = None + self._reconnect_timer_source = None self.pep = {} # Do we continue connection when we get roster (send presence,get vcard..) @@ -151,7 +152,7 @@ class CommonConnection: def quit(self, kill_core): if kill_core and app.account_is_connected(self.name): - self.disconnect(on_purpose=True) + self.disconnect(reconnect=False) def test_gpg_passphrase(self, password): """ @@ -190,14 +191,6 @@ class CommonConnection: conn=self)) return signed - def _on_disconnected(self): - """ - Called when a disconnect request has completed successfully - """ - self.disconnect(on_purpose=True) - app.nec.push_incoming_event(OurShowEvent(None, conn=self, - show='offline')) - def get_status(self): return app.SHOW_LIST[self.connected] @@ -453,7 +446,6 @@ class CommonConnection: # set old_show to requested 'show' in case we need to # recconect before we auth to server self.old_show = show - self.on_purpose = False self.server_resource = self._compute_resource() if app.is_installed('GPG'): self.USE_GPG = True @@ -464,7 +456,6 @@ class CommonConnection: return if show == 'offline': - self.connected = 0 if self.connection: app.nec.push_incoming_event(BeforeChangeShowEvent(None, conn=self, show=show, message=msg)) @@ -474,11 +465,8 @@ class CommonConnection: status=msg, caps=False) - self.connection.RegisterDisconnectHandler(self._on_disconnected) self.connection.send(p, now=True) - self.connection.start_disconnect() - else: - self._on_disconnected() + self.disconnect(reconnect=False) return if show != 'offline' and self.connected > 0: @@ -578,16 +566,6 @@ class Connection(CommonConnection, ConnectionHandlers): self._nec_stanza_message_outgoing) def get_config_values_or_default(self): - if app.config.get_per('accounts', self.name, 'keep_alives_enabled'): - self.keepalives = app.config.get_per('accounts', self.name, - 'keep_alive_every_foo_secs') - else: - self.keepalives = 0 - if app.config.get_per('accounts', self.name, 'ping_alives_enabled'): - self.pingalives = app.config.get_per('accounts', self.name, - 'ping_alive_every_foo_secs') - else: - self.pingalives = 0 self.client_cert = app.config.get_per('accounts', self.name, 'client_cert') self.client_cert_passphrase = '' @@ -625,29 +603,22 @@ class Connection(CommonConnection, ConnectionHandlers): self.time_to_reconnect = None self.retrycount = 0 - # We are doing disconnect at so many places, better use one function in all - def disconnect(self, on_purpose=False): - log.info('Disconnect: on_purpose: %s', on_purpose) - self.on_purpose = on_purpose - self.connected = 0 - self.time_to_reconnect = None - + def disconnect(self, reconnect=True, immediately=False): if self.connection is None: + if not reconnect: + self._sm_resume_data = {} + self._disconnect() + app.nec.push_incoming_event(OurShowEvent( + None, conn=self, show='offline')) return - app.interface.music_track_changed(None, None, self.name) - self.get_module('PEP').reset_stored_publish() - self.get_module('VCardAvatars').avatar_advertised = False - - if not on_purpose: - self._sm_resume_data = self.connection.get_resume_data() - - app.proxy65_manager.disconnect(self.connection) - self.terminate_sessions() - self.remove_all_transfers() - self.connection.disconnect() - ConnectionHandlers._unregister_handlers(self) - self.connection = None + log.info('Starting to disconnect %s', self.name) + disconnect_cb = partial(self._on_disconnect, reconnect) + self.connection.disconnect_handlers = [disconnect_cb] + if immediately: + self.connection.disconnect() + else: + self.connection.start_disconnect() def set_oldst(self): # Set old state if self.old_show: @@ -659,61 +630,77 @@ class Connection(CommonConnection, ConnectionHandlers): app.nec.push_incoming_event(OurShowEvent( None, conn=self, show=app.SHOW_LIST[self.connected])) - def disconnectedReconnCB(self): - """ - Called when we are disconnected - """ - log.info('disconnectedReconnCB called') - if app.account_is_connected(self.name): - # we cannot change our status to offline or connecting - # after we auth to server - self.old_show = app.SHOW_LIST[self.connected] - self.connected = 0 - if not self.on_purpose: + def _on_disconnect(self, reconnect=True): + # Clear disconnect handlers + self.connection.disconnect_handlers = [] + + if reconnect: + reconnect = app.config.get_per( + 'accounts', self.name, 'autoreconnect') + + log.info('Disconnect %s, reconnect: %s', self.name, reconnect) + + if reconnect: + if app.account_is_connected(self.name): + # we cannot change our status to offline or connecting + # after we auth to server + self.old_show = app.SHOW_LIST[self.connected] + if not self._sm_resume_data: - app.nec.push_incoming_event(OurShowEvent(None, conn=self, - show='offline')) - else: - app.nec.push_incoming_event(OurShowEvent(None, conn=self, - show='error')) - if self.connection: - self.connection.UnregisterDisconnectHandler( - self.disconnectedReconnCB) - self.disconnect() - if app.config.get_per('accounts', self.name, 'autoreconnect'): - self.connected = -1 - app.nec.push_incoming_event(OurShowEvent(None, conn=self, - show='error')) - if app.status_before_autoaway[self.name]: - # We were auto away. So go back online - self.status = app.status_before_autoaway[self.name] - app.status_before_autoaway[self.name] = '' - self.old_show = 'online' - # this check has moved from reconnect method - # do exponential backoff until less than 5 minutes - if self.retrycount < 2 or self.last_time_to_reconnect is None: - self.last_time_to_reconnect = 5 - self.last_time_to_reconnect += random.randint(0, 5) - if self.last_time_to_reconnect < 200: - self.last_time_to_reconnect *= 1.5 - self.time_to_reconnect = int(self.last_time_to_reconnect) - log.info("Reconnect to %s in %ss", self.name, self.time_to_reconnect) - app.idlequeue.set_alarm(self._reconnect_alarm, - self.time_to_reconnect) - elif self.on_connect_failure: - self.on_connect_failure() - self.on_connect_failure = None - else: - # show error dialog - self._connection_lost() + self._sm_resume_data = self.connection.get_resume_data() + self._disconnect() + self._set_reconnect_timer() + else: - self.disconnect() - self.on_purpose = False - # END disconnectedReconnCB + self._sm_resume_data = {} + self._disconnect() + app.nec.push_incoming_event(OurShowEvent( + None, conn=self, show='offline')) + + def _disconnect(self): + log.info('Set state disconnected') + self.connected = 0 + self.disable_reconnect_timer() + + app.interface.music_track_changed(None, None, self.name) + self.get_module('PEP').reset_stored_publish() + self.get_module('VCardAvatars').avatar_advertised = False + + app.proxy65_manager.disconnect(self.connection) + self.terminate_sessions() + self.remove_all_transfers() + ConnectionHandlers._unregister_handlers(self) + self.connection = None + + def _set_reconnect_timer(self): + self.connected = -1 + app.nec.push_incoming_event(OurShowEvent( + None, conn=self, show='error')) + if app.status_before_autoaway[self.name]: + # We were auto away. So go back online + self.status = app.status_before_autoaway[self.name] + app.status_before_autoaway[self.name] = '' + self.old_show = 'online' + # this check has moved from reconnect method + # do exponential backoff until less than 5 minutes + if self.retrycount < 2 or self.last_time_to_reconnect is None: + self.last_time_to_reconnect = 5 + self.last_time_to_reconnect += random.randint(0, 5) + if self.last_time_to_reconnect < 200: + self.last_time_to_reconnect *= 1.5 + self.time_to_reconnect = int(self.last_time_to_reconnect) + log.info("Reconnect to %s in %ss", self.name, self.time_to_reconnect) + self._reconnect_timer_source = GLib.timeout_add_seconds( + self.time_to_reconnect, self._reconnect_alarm) + + def disable_reconnect_timer(self): + self.time_to_reconnect = None + if self._reconnect_timer_source is not None: + GLib.source_remove(self._reconnect_timer_source) + self._reconnect_timer_source = None def _connection_lost(self): log.info('_connection_lost') - self.disconnect(on_purpose=False) if self.removing_account: return app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, @@ -786,7 +773,7 @@ class Connection(CommonConnection, ConnectionHandlers): if self.connection: self.connection.UnregisterDisconnectHandler( self._on_new_account) - self.disconnect(on_purpose=True) + self.disconnect(reconnect=False) # it's the second time we get the form, we have info user # typed, so send them if is_form: @@ -813,7 +800,7 @@ class Connection(CommonConnection, ConnectionHandlers): conn=self, config=conf, is_form=is_form)) self.connection.UnregisterDisconnectHandler( self._on_new_account) - self.disconnect(on_purpose=True) + self.disconnect(reconnect=False) return if not data[1]: # wrong answer app.nec.push_incoming_event(InformationEvent( @@ -1002,7 +989,7 @@ class Connection(CommonConnection, ConnectionHandlers): self._connection_lost() else: # try reconnect if connection has failed before auth to server - self.disconnectedReconnCB() + self._set_reconnect_timer() return @@ -1104,7 +1091,7 @@ class Connection(CommonConnection, ConnectionHandlers): if not con_type: # we are not retrying, and not conecting if not self.retrycount and self.connected != 0: - self.disconnect(on_purpose=True) + self._disconnect() if self._proxy: pritxt = _('Could not connect to "%(host)s" via proxy "%(proxy)s"') %\ {'host': self._hostname, 'proxy': self._proxy['host']} @@ -1129,14 +1116,11 @@ class Connection(CommonConnection, ConnectionHandlers): log.error('Connection to proxy failed: %s', reason) self.time_to_reconnect = None self.on_connect_failure = None - self.disconnect(on_purpose=True) + self._disconnect() app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, title=_('Connection to proxy failed'), msg=reason)) def _connect_success(self, con, con_type): - if not self.connected: # We went offline during connecting process - # FIXME - not possible, maybe it was when we used threads - return log.info('Connect successfull') _con_type = con_type if _con_type != self._current_type: @@ -1144,7 +1128,7 @@ class Connection(CommonConnection, ConnectionHandlers): 'is %s and returned is %s', self._current_type, _con_type) self._connect_to_next_host() return - con.RegisterDisconnectHandler(self._on_disconnected) + con.RegisterDisconnectHandler(self.disconnect) if _con_type == 'plain' and app.config.get_per('accounts', self.name, 'action_when_plaintext_connection') == 'warn': app.nec.push_incoming_event(PlainConnectionEvent(None, conn=self, @@ -1152,7 +1136,7 @@ class Connection(CommonConnection, ConnectionHandlers): return True if _con_type == 'plain' and app.config.get_per('accounts', self.name, 'action_when_plaintext_connection') == 'disconnect': - self.disconnect(on_purpose=True) + self.disconnect(reconnect=False) app.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) return False @@ -1168,7 +1152,7 @@ class Connection(CommonConnection, ConnectionHandlers): def connection_accepted(self, con, con_type): if not con or not con.Connection: - self.disconnect(on_purpose=True) + self._disconnect() app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, title=_('Could not connect to account %s') % self.name, msg=_('Connection with account %s has been lost. Retry ' @@ -1179,8 +1163,8 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection_auto_accepted = False self.connected_hostname = self._current_host['host'] self.on_connect_failure = None - con.UnregisterDisconnectHandler(self._on_disconnected) - con.RegisterDisconnectHandler(self.disconnectedReconnCB) + con.UnregisterDisconnectHandler(self.disconnect) + con.RegisterDisconnectHandler(self._on_disconnect) log.debug('Connected to server %s:%s with %s', self._current_host['host'], self._current_host['port'], con_type) @@ -1287,7 +1271,7 @@ class Connection(CommonConnection, ConnectionHandlers): def ssl_certificate_accepted(self): if not self.connection: - self.disconnect(on_purpose=True) + self._disconnect() app.nec.push_incoming_event( ConnectionLostEvent( None, conn=self, @@ -1337,7 +1321,7 @@ class Connection(CommonConnection, ConnectionHandlers): # Forget password, it's wrong self.password = None log.debug("Couldn't authenticate to %s", self._hostname) - self.disconnect(on_purpose=True) + self.disconnect(reconnect=False) app.nec.push_incoming_event( OurShowEvent(None, conn=self, show='offline')) app.nec.push_incoming_event(InformationEvent( @@ -1361,6 +1345,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.connected = 2 self.retrycount = 0 self.set_oldst() + self._set_send_timeouts() def _on_connection_active(self): # Connection was successful, reset sm resume data @@ -1382,9 +1367,22 @@ class Connection(CommonConnection, ConnectionHandlers): self.connected = 2 self.retrycount = 0 self._discover_server() + self._set_send_timeouts() + + def _set_send_timeouts(self): + if app.config.get_per('accounts', self.name, 'keep_alives_enabled'): + keep_alive_seconds = app.config.get_per( + 'accounts', self.name, 'keep_alive_every_foo_secs') + self.connection.set_send_timeout(keep_alive_seconds, + self._send_keepalive) - def send_keepalive(self): - # nothing received for the last foo seconds + if app.config.get_per('accounts', self.name, 'ping_alives_enabled'): + ping_alive_seconds = app.config.get_per( + 'accounts', self.name, 'ping_alive_every_foo_secs') + self.connection.set_send_timeout2( + ping_alive_seconds, self.get_module('Ping').send_keepalive_ping) + + def _send_keepalive(self): if self.connection: self.connection.send(' ') @@ -1400,8 +1398,6 @@ class Connection(CommonConnection, ConnectionHandlers): # If we are already connected, and privacy rules are supported, send # offline presence first as it's required by XEP-0126 if self.connected > 1 and self.get_module('PrivacyLists').supported: - self.on_purpose = True - self.remove_all_transfers() self.get_module('Presence').send_presence( typ='unavailable', @@ -1460,6 +1456,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.connect() def connect_and_init(self, show, msg, sign_msg): + self.disable_reconnect_timer() self.continue_connect_info = [show, msg, sign_msg] self.connect_and_auth() @@ -1467,11 +1464,6 @@ class Connection(CommonConnection, ConnectionHandlers): if not app.account_is_connected(self.name): return - self.connection.set_send_timeout(self.keepalives, self.send_keepalive) - self.connection.set_send_timeout2( - self.pingalives, self.get_module('Ping').send_keepalive_ping) - self.connection.onreceive(None) - self.get_module('Discovery').discover_server_info() self.get_module('Discovery').discover_account_info() self.get_module('Discovery').discover_server_items() @@ -1816,7 +1808,7 @@ class Connection(CommonConnection, ConnectionHandlers): type_ != 'ANONYMOUS': app.nec.push_incoming_event( NonAnonymousServerErrorEvent(None, conn=self)) - self._on_disconnected() + self.disconnect(reconnect=False) return self.pasword_callback = (callback, type_) if type_ == 'X-MESSENGER-OAUTH2': @@ -1843,7 +1835,7 @@ class Connection(CommonConnection, ConnectionHandlers): '%s&scope=wl.messenger%%20wl.offline_access&' 'response_type=code&redirect_uri=%s') % (client_id, script_url) helpers.launch_browser_mailer('url', token_url) - self.disconnect(on_purpose=True) + self.disconnect(reconnect=False) app.nec.push_incoming_event( Oauth2CredentialsRequiredEvent(None, conn=self)) return ===================================== gajim/common/modules/ping.py ===================================== @@ -71,7 +71,7 @@ class Ping: # We haven't got the pong in time, disco and reconnect log.warning('No reply received for keepalive ping. Reconnecting...') - self._con.disconnectedReconnCB() + self._con.disconnect(immediately=True) def send_ping(self, contact: ContactsT) -> None: if not app.account_is_connected(self._account): ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -676,7 +676,7 @@ class ClientZeroconf: def zeroconf_init(self, show, msg): self.zeroconf = zeroconf.Zeroconf(self.caller._on_new_service, self.caller._on_remove_service, self.caller._on_name_conflictCB, - self.caller._on_disconnected, self.caller._on_error, + self.caller._on_disconnect, self.caller._on_error, self.caller.username, self.caller.host, self.port) self.zeroconf.txt['msg'] = msg self.zeroconf.txt['status'] = show ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -127,7 +127,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def _on_resolve_timeout(self): if self.connected: if not self.connection.resolve_all(): - self._on_disconnected() + self.disconnect() return False diffs = self.roster.getDiffs() for key in diffs: @@ -162,22 +162,6 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): app.nec.push_incoming_event(ZeroconfPresenceReceivedEvent( None, conn=self, fjid=jid, show='offline', status='')) - def disconnectedReconnCB(self): - """ - Called when we are disconnected. Comes from network manager for example - we don't try to reconnect, network manager will tell us when we can - """ - if app.account_is_connected(self.name): - # we cannot change our status to offline or connecting - # after we auth to server - self.old_show = STATUS_LIST[self.connected] - self.connected = 0 - app.nec.push_incoming_event(OurShowEvent(None, conn=self, - show='offline')) - # random number to show we wait network manager to send us a reconenct - self.time_to_reconnect = 5 - self.on_purpose = False - def _on_name_conflictCB(self, alt_name): self.disconnect() app.nec.push_incoming_event(OurShowEvent(None, conn=self, @@ -241,14 +225,33 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): GLib.timeout_add_seconds(5, self._on_resolve_timeout) return True - def disconnect(self, on_purpose=False): + def disconnect(self, reconnect=True, immediately=True): + log.info('Start disconnecting zeroconf') + if reconnect: + if app.account_is_connected(self.name): + # we cannot change our status to offline or connecting + # after we auth to server + self.old_show = STATUS_LIST[self.connected] + + # random number to show we wait network manager to send + # us a reconenct + self.time_to_reconnect = 5 + else: + self.time_to_reconnect = None + self.connected = 0 - self.time_to_reconnect = None if self.connection: self.connection.disconnect() self.connection = None # stop calling the timeout self.call_resolve_timeout = False + app.nec.push_incoming_event(OurShowEvent(None, conn=self, + show='offline')) + + def _on_disconnect(self): + self.connected = 0 + app.nec.push_incoming_event(OurShowEvent(None, conn=self, + show='offline')) def reannounce(self): if self.connected: ===================================== gajim/config.py ===================================== @@ -185,7 +185,7 @@ class RemoveAccountWindow: # Close all opened windows app.interface.roster.close_all(self.account, force=True) if self.account in app.connections: - app.connections[self.account].disconnect(on_purpose=True) + app.connections[self.account].disconnect(reconnect=False) app.connections[self.account].cleanup() del app.connections[self.account] app.logger.remove_roster(app.get_jid_from_account(self.account)) ===================================== gajim/gtk/account_wizard.py ===================================== @@ -574,8 +574,6 @@ class AccountCreationWizard: 'sub_request': {}} app.interface.minimized_controls[self.account] = {} app.connections[self.account].connected = 0 - app.connections[self.account].keepalives = app.config.get_per( - 'accounts', self.account, 'keep_alive_every_foo_secs') app.groups[self.account] = {} app.contacts.add_account(self.account) app.gc_connected[self.account] = {} ===================================== gajim/gui_interface.py ===================================== @@ -1341,7 +1341,7 @@ class Interface: def on_cancel(): del self.instances[account]['online_dialog']['ssl_error'] - obj.conn.disconnect(on_purpose=True) + obj.conn.disconnect(reconnect=False) app.nec.push_incoming_event(OurShowEvent(None, conn=obj.conn, show='offline')) @@ -1404,7 +1404,7 @@ class Interface: def on_cancel(): del self.instances[obj.conn.name]['online_dialog']\ ['plain_connection'] - obj.conn.disconnect(on_purpose=True) + obj.conn.disconnect(reconnect=False) app.nec.push_incoming_event(OurShowEvent(None, conn=obj.conn, show='offline')) @@ -1436,7 +1436,7 @@ class Interface: def on_cancel(): del self.instances[obj.conn.name]['online_dialog']['insecure_ssl'] - obj.conn.disconnect(on_purpose=True) + obj.conn.disconnect(reconnect=False) app.nec.push_incoming_event(OurShowEvent(None, conn=obj.conn, show='offline')) @@ -1478,7 +1478,7 @@ class Interface: def on_cancel(): del self.instances[obj.conn.name]['online_dialog']\ ['insecure_password'] - obj.conn.disconnect(on_purpose=True) + obj.conn.disconnect(reconnect=False) app.nec.push_incoming_event(OurShowEvent(None, conn=obj.conn, show='offline')) @@ -2458,12 +2458,12 @@ class Interface: for connection in app.connections.values(): if connection.connected <= 0 and connection.time_to_reconnect: log.info('Connect %s', connection.name) - connection.reconnect() + GLib.timeout_add_seconds(2, connection.reconnect) else: for connection in app.connections.values(): if connection.connected > 1: log.info('Disconnect %s', connection.name) - connection.disconnectedReconnCB() + connection.disconnect(immediately=True) def create_zeroconf_default_config(self): if app.config.get_per('accounts', app.ZEROCONF_ACC_NAME, 'name'): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/59855a6c8d5f9bf5ac3c5947cb9e284c1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/59855a6c8d5f9bf5ac3c5947cb9e284c1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Windows: Use nbxmpp 0.6.8
by Philipp Hörist 04 Dec '18

04 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: bb81277c by Philipp Hörist at 2018-12-04T11:20:15Z Windows: Use nbxmpp 0.6.8 - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -93,7 +93,7 @@ function install_deps { mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six PIP_REQUIREMENTS="\ -git+https://dev.gajim.org/gajim/python-nbxmpp.git +nbxmpp==0.6.8 git+https://dev.gajim.org/lovetox/pybonjour-python3.git git+https://github.com/enthought/pywin32-ctypes.git keyring View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bb81277c173c5b59df2db5b0ef137b1bd1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bb81277c173c5b59df2db5b0ef137b1bd1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Determine delay timestamp correctly
by Philipp Hörist 04 Dec '18

04 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 59855a6c by Philipp Hörist at 2018-12-04T11:18:17Z Determine delay timestamp correctly - Check the from attr on the delay node to determine if its a user timestamp or from the server - Dont use user timestamp for sorting - Record the user timestamp in additional data so its saved to the database Fixes #9444 - - - - - 4 changed files: - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/misc.py - + test/no_gui/unit/test_helpers.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -131,12 +131,13 @@ class MAM: raise nbxmpp.NodeProcessed # Timestamp parsing - timestamp = parse_delay(forwarded) - if timestamp is None: + # Most servers dont set the 'from' attr, so we cant check for it + delay_timestamp = parse_delay(forwarded) + if delay_timestamp is None: + log.warning('No timestamp on MAM message') + log.warning(stanza) raise nbxmpp.NodeProcessed - user_timestamp = parse_delay(message) - # Fix for self messaging if not groupchat: to = message.getTo() @@ -181,8 +182,7 @@ class MAM: {'conn': self._con, 'additional_data': AdditionalDataDict(), 'encrypted': False, - 'timestamp': timestamp, - 'user_timestamp': user_timestamp, + 'timestamp': delay_timestamp, 'self_message': self_message, 'groupchat': groupchat, 'muc_pm': muc_pm, @@ -250,7 +250,12 @@ class MAM: # For example Chatstates, Receipts, Chatmarkers log.debug(event.message.getProperties()) return - log.debug(event.msgtxt) + + user_timestamp = parse_delay(event.stanza) + if user_timestamp is not None: + # Record it as a user timestamp + event.additional_data.set_value( + 'gajim', 'user_timestamp', user_timestamp) event.correct_id = parse_correction(event.message) parse_oob(event) ===================================== gajim/common/modules/message.py ===================================== @@ -226,17 +226,42 @@ class Message: except nbxmpp.NodeProcessed: return - timestamp, delayed = parse_delay(event.stanza), True - if timestamp is None: + subject = event.stanza.getSubject() + groupchat = event.mtype == 'groupchat' + muc_subject = subject and groupchat + + # Determine timestamps + if groupchat: + delay_entity_jid = event.jid + else: + delay_entity_jid = self._con.get_own_jid().getDomain() + + if muc_subject: + # MUC Subjects can have a delay timestamp + # to indicate when the user has set the subject, + # the 'from' attr on these delays is the MUC server + # but we treat it as user timestamp timestamp = time.time() - delayed = False + user_timestamp = parse_delay(event.stanza, from_=delay_entity_jid) + + else: + timestamp = parse_delay(event.stanza, from_=delay_entity_jid) + if timestamp is None: + timestamp = time.time() + + user_timestamp = parse_delay(event.stanza, + not_from=[delay_entity_jid]) + + if user_timestamp is not None: + event.additional_data.set_value( + 'gajim', 'user_timestamp', user_timestamp) parse_bob_data(event.stanza) event_attr = { 'popup': False, 'msg_log_id': None, - 'subject': event.stanza.getSubject(), + 'subject': subject, 'displaymarking': parse_securitylabel(event.stanza), 'attention': parse_attention(event.stanza), 'correct_id': parse_correction(event.stanza), @@ -244,7 +269,7 @@ class Message: 'form_node': parse_form(event.stanza), 'xhtml': parse_xhtml(event.stanza), 'timestamp': timestamp, - 'delayed': delayed, + 'delayed': user_timestamp is not None, } parse_oob(event) @@ -262,7 +287,7 @@ class Message: event.session, event.fjid, timestamp) return - if event.mtype == 'groupchat': + if groupchat: app.nec.push_incoming_event(GcMessageReceivedEvent( None, conn=self._con, ===================================== gajim/common/modules/misc.py ===================================== @@ -65,18 +65,45 @@ def parse_eme(stanza): # XEP-0203: Delayed Delivery -def parse_delay(stanza, epoch=True, convert='utc'): - timestamp = None - delay = stanza.getTagAttr( - 'delay', 'stamp', namespace=nbxmpp.NS_DELAY2) - if delay is not None: - timestamp = parse_datetime(delay, check_utc=True, +def parse_delay(stanza, epoch=True, convert='utc', from_=None, not_from=None): + ''' + Returns the first valid delay timestamp that matches + + :param epoch: Returns the timestamp as epoch + + :param convert: Converts the timestamp to either utc or local + + :param from_: Matches only delays that have the according + from attr set + + :param not_from: Matches only delays that have the according + from attr not set + ''' + delays = stanza.getTags('delay', namespace=nbxmpp.NS_DELAY2) + + for delay in delays: + stamp = delay.getAttr('stamp') + if stamp is None: + log.warning('Invalid timestamp received: %s', stamp) + log.warning(stanza) + continue + + delay_from = delay.getAttr('from') + if from_ is not None: + if delay_from != from_: + continue + if not_from is not None: + if delay_from in not_from: + continue + + timestamp = parse_datetime(stamp, check_utc=True, epoch=epoch, convert=convert) if timestamp is None: - log.warning('Invalid timestamp received: %s', delay) + log.warning('Invalid timestamp received: %s', stamp) log.warning(stanza) + continue - return timestamp + return timestamp # XEP-0066: Out of Band Data ===================================== test/no_gui/unit/test_helpers.py ===================================== @@ -0,0 +1,30 @@ +import unittest + +import nbxmpp + +from gajim.common.modules.misc import parse_delay + +class TestHelpers(unittest.TestCase): + + def test_parse_delay(self): + + node = """ + <message> + <delay xmlns='urn:xmpp:delay' from='capulet.com' stamp='2002-09-10T23:08:25Z' /> + <delay xmlns='urn:xmpp:delay' from='romeo.com' stamp='2010-09-10T23:08:25Z' /> + <delay xmlns='urn:xmpp:delay' stamp='2015-09-10T23:08:25Z' /> + </message> + """ + message = nbxmpp.Node(node=node) + + timestamp = parse_delay(message) + self.assertEqual(timestamp, 1031699305.0) + + timestamp = parse_delay(message, from_='capulet.com') + self.assertEqual(timestamp, 1031699305.0) + + timestamp = parse_delay(message, from_='romeo.com') + self.assertEqual(timestamp, 1284160105.0) + + timestamp = parse_delay(message, not_from=['romeo.com']) + self.assertEqual(timestamp, 1031699305.0) \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59855a6c8d5f9bf5ac3c5947cb9e284c16… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59855a6c8d5f9bf5ac3c5947cb9e284c16… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Dont plug out NonBlockingBind before its finished
by Philipp Hörist 03 Dec '18

03 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 11dcf387 by Philipp Hörist at 2018-12-03T20:00:57Z Dont plug out NonBlockingBind before its finished - - - - - 1 changed file: - nbxmpp/auth_nb.py Changes: ===================================== nbxmpp/auth_nb.py ===================================== @@ -631,7 +631,6 @@ class NonBlockingBind(PlugIn): iq = Protocol('iq', typ='set', payload=[node]) self._owner.SendAndWaitForResponse( iq, func=self._on_session) - self.PlugOut() return if resp: log.error('Binding failed: %s.', resp.getTag('error')) @@ -649,10 +648,11 @@ class NonBlockingBind(PlugIn): log.error('Session open failed') self._owner.Connection.start_disconnect() self._owner.Dispatcher.Event(Realm.CONNECTING, Event.SESSION_FAILED) - self.PlugOut() + self.PlugOut() def _on_bind_successful(self): feats = self._owner.Dispatcher.Stream.features if feats.getTag('sm', namespace=NS_STREAM_MGMT): self._owner.Smacks.send_enable() self._owner.Dispatcher.Event(Realm.CONNECTING, Event.CONNECTION_ACTIVE) + self.PlugOut() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/11dcf387a89ff4c5d1cf2b842d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/11dcf387a89ff4c5d1cf2b842d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Dont disconnect when server negotiates sessions
by Philipp Hörist 03 Dec '18

03 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 483a893c by Philipp Hörist at 2018-12-03T19:56:21Z Dont disconnect when server negotiates sessions Fixes #62 - - - - - 1 changed file: - nbxmpp/auth_nb.py Changes: ===================================== nbxmpp/auth_nb.py ===================================== @@ -647,8 +647,8 @@ class NonBlockingBind(PlugIn): self._on_bind_successful() else: log.error('Session open failed') - self._owner.Connection.start_disconnect() - self._owner.Dispatcher.Event(Realm.CONNECTING, Event.SESSION_FAILED) + self._owner.Connection.start_disconnect() + self._owner.Dispatcher.Event(Realm.CONNECTING, Event.SESSION_FAILED) self.PlugOut() def _on_bind_successful(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/483a893c577bc2b73ca23fc831… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/483a893c577bc2b73ca23fc831… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 7 commits: Windows: Remove cryptography fix
by Philipp Hörist 03 Dec '18

03 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: e1773e20 by Philipp Hörist at 2018-12-03T14:44:01Z Windows: Remove cryptography fix The package has been fixed in the mingw repos - - - - - 9d6fac69 by Philipp Hörist at 2018-12-03T14:44:18Z Fix opening links in MUC subject The default GTK link handler does not work on Windows and Mac Fixes #9453 - - - - - 1b5272c8 by Andrey Gursky at 2018-12-03T14:44:48Z Fix receipts for chat This is a regression from e3050697 - - - - - 108b0878 by Philipp Hörist at 2018-12-03T14:45:30Z AccountsWindow: Fix back button - - - - - 5b9c564f by Philipp Hörist at 2018-12-03T14:46:00Z Better handle not available keyring backends - - - - - f8047c63 by Philipp Hörist at 2018-12-03T14:46:12Z Fix error when creating MUC Fixes #9473 - - - - - bbc038ec by Philipp Hörist at 2018-12-03T14:46:20Z Handle presence without from attr correctly Fixes #9472 - - - - - 9 changed files: - gajim/common/helpers.py - gajim/common/modules/caps.py - gajim/common/modules/chatstates.py - gajim/common/modules/receipts.py - gajim/common/modules/vcard_avatars.py - gajim/common/passwords.py - gajim/groupchat_control.py - gajim/gtk/accounts.py - win/_base.sh Changes: ===================================== gajim/common/helpers.py ===================================== @@ -55,7 +55,6 @@ from gajim.common import configpaths from gajim.common.i18n import Q_ from gajim.common.i18n import _ from gajim.common.i18n import ngettext -from gajim.common.caps_cache import muc_caps_cache log = logging.getLogger('gajim.c.helpers') @@ -1465,8 +1464,9 @@ def call_counter(func): return helper def get_sync_threshold(jid, archive_info): + cache = caps_cache.muc_caps_cache if archive_info is None or archive_info.sync_threshold is None: - if muc_caps_cache.supports(jid, 'muc#roomconfig_membersonly'): + if cache.supports(jid, 'muc#roomconfig_membersonly'): threshold = app.config.get('private_room_sync_threshold') else: threshold = app.config.get('public_room_sync_threshold') ===================================== gajim/common/modules/caps.py ===================================== @@ -42,6 +42,15 @@ class Caps: self._create_suitable_client_caps = caps_cache.create_suitable_client_caps def _presence_received(self, _con, stanza): + if stanza.getType() in ('unavailable', 'error'): + return + + from_ = stanza.getFrom() + if from_ is None: + # Presence from ourself + return + full_jid = str(from_) + hash_method = node = caps_hash = None caps = stanza.getTag('c', namespace=nbxmpp.NS_CAPS) @@ -50,8 +59,6 @@ class Caps: node = caps['node'] caps_hash = caps['ver'] - from_ = stanza.getFrom() - full_jid = str(from_) show = parse_show(stanza) type_ = parse_type(stanza) ===================================== gajim/common/modules/chatstates.py ===================================== @@ -74,8 +74,8 @@ class Chatstate: return full_jid = stanza.getFrom() - - if self._con.get_own_jid().bareMatch(full_jid): + if full_jid is None or self._con.get_own_jid().bareMatch(full_jid): + # Presence from ourself return contact = app.contacts.get_gc_contact( ===================================== gajim/common/modules/receipts.py ===================================== @@ -78,7 +78,7 @@ class Receipts: event.resource) contact = app.contacts.get_contact(self._account, event.jid) - if contact is None and contact.sub not in ('to', 'none'): + if contact is not None and contact.sub not in ('to', 'none'): return contact @staticmethod ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -51,12 +51,15 @@ class VCardAvatars: app.config.set_per('accounts', self._account, 'avatar_sha', '') def _presence_received(self, _con, stanza): - update = stanza.getTag('x', namespace=nbxmpp.NS_VCARD_UPDATE) - if update is None: + if stanza.getType() in ('unavailable', 'error'): return jid = stanza.getFrom() + update = stanza.getTag('x', namespace=nbxmpp.NS_VCARD_UPDATE) + if update is None: + return + avatar_sha = update.getTagData('photo') if avatar_sha is None: log.info('%s is not ready to promote an avatar', jid) ===================================== gajim/common/passwords.py ===================================== @@ -31,6 +31,7 @@ log = logging.getLogger('gajim.password') try: import keyring + from keyring.core import recommended KEYRING_AVAILABLE = True except ImportError: KEYRING_AVAILABLE = False @@ -53,6 +54,7 @@ class SecretPasswordStorage(PasswordStorage): def __init__(self): self.keyring = keyring.get_keyring() + log.info('Chose %s backend', self.keyring) def save_password(self, account_name, password): try: @@ -83,10 +85,20 @@ class PasswordStorageManager(PasswordStorage): def connect_backends(self): """Initialize backend connections, determining which ones are available. """ - # TODO: handle disappearing backends - if app.config.get('use_keyring') and KEYRING_AVAILABLE: - self.secret = SecretPasswordStorage() + if not app.config.get('use_keyring') or not KEYRING_AVAILABLE: + return + + backends = keyring.backend.get_all_keyring() + for backend in backends: + log.info('Found keyring backend: %s', backend) + + for backend in backends: + if recommended(backend): + self.secret = SecretPasswordStorage() + return + log.warning('No recommended keyring backend found, ' + 'plain storage is used') def get_password(self, account_name): pw = app.config.get_per('accounts', account_name, 'password') ===================================== gajim/groupchat_control.py ===================================== @@ -54,6 +54,7 @@ from gajim.common.caps_cache import muc_caps_cache from gajim.common import events from gajim.common import app from gajim.common import helpers +from gajim.common.helpers import launch_browser_mailer from gajim.common.modules import dataforms from gajim.common import ged from gajim.common import i18n @@ -3050,6 +3051,7 @@ class SubjectPopover(Gtk.Popover): self.label.set_line_wrap(True) self.label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) self.label.set_max_width_chars(80) + self.label.connect('activate-link', self._on_activate_link) scrolledwindow.add(self.label) @@ -3069,3 +3071,10 @@ class SubjectPopover(Gtk.Popover): # So we switch after show to False and again to True self.label.set_selectable(False) self.label.set_selectable(True) + + @staticmethod + def _on_activate_link(_label, uri): + # We have to use this, because the default GTK handler + # is not cross-platform compatible + launch_browser_mailer(None, uri) + return Gdk.EVENT_STOP ===================================== gajim/gtk/accounts.py ===================================== @@ -82,6 +82,10 @@ class AccountsWindow(Gtk.ApplicationWindow): app.ged.register_event_handler( 'our-show', ged.GUI2, self._nec_our_status) + @property + def stack(self): + return self._ui.stack + def _nec_our_status(self, event): self.update_accounts() ===================================== win/_base.sh ===================================== @@ -75,11 +75,6 @@ function install_deps { https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz - # Fix broken cryptography package - curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz \ - https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz - build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz - build_pacman --noconfirm -S mingw-w64-"${ARCH}"-gtk3 mingw-w64-"${ARCH}"-"${PYTHON_ID}" \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip \ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/193092d0a249e8fd6377ed322831e5126… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/193092d0a249e8fd6377ed322831e5126… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Handle presence without from attr correctly
by Philipp Hörist 03 Dec '18

03 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: fd6dec12 by Philipp Hörist at 2018-12-03T14:40:43Z Handle presence without from attr correctly Fixes #9472 - - - - - 3 changed files: - gajim/common/modules/caps.py - gajim/common/modules/chatstates.py - gajim/common/modules/vcard_avatars.py Changes: ===================================== gajim/common/modules/caps.py ===================================== @@ -42,6 +42,15 @@ class Caps: self._create_suitable_client_caps = caps_cache.create_suitable_client_caps def _presence_received(self, _con, stanza): + if stanza.getType() in ('unavailable', 'error'): + return + + from_ = stanza.getFrom() + if from_ is None: + # Presence from ourself + return + full_jid = str(from_) + hash_method = node = caps_hash = None caps = stanza.getTag('c', namespace=nbxmpp.NS_CAPS) @@ -50,8 +59,6 @@ class Caps: node = caps['node'] caps_hash = caps['ver'] - from_ = stanza.getFrom() - full_jid = str(from_) show = parse_show(stanza) type_ = parse_type(stanza) ===================================== gajim/common/modules/chatstates.py ===================================== @@ -74,8 +74,8 @@ class Chatstate: return full_jid = stanza.getFrom() - - if self._con.get_own_jid().bareMatch(full_jid): + if full_jid is None or self._con.get_own_jid().bareMatch(full_jid): + # Presence from ourself return contact = app.contacts.get_gc_contact( ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -51,12 +51,15 @@ class VCardAvatars: app.config.set_per('accounts', self._account, 'avatar_sha', '') def _presence_received(self, _con, stanza): - update = stanza.getTag('x', namespace=nbxmpp.NS_VCARD_UPDATE) - if update is None: + if stanza.getType() in ('unavailable', 'error'): return jid = stanza.getFrom() + update = stanza.getTag('x', namespace=nbxmpp.NS_VCARD_UPDATE) + if update is None: + return + avatar_sha = update.getTagData('photo') if avatar_sha is None: log.info('%s is not ready to promote an avatar', jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fd6dec1208dd6c5dd7bd2e2cf7785e893b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fd6dec1208dd6c5dd7bd2e2cf7785e893b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix error when creating MUC
by Philipp Hörist 03 Dec '18

03 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1d11e066 by Philipp Hörist at 2018-12-03T13:17:46Z Fix error when creating MUC Fixes #9473 - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -56,7 +56,6 @@ from gajim.common import configpaths from gajim.common.i18n import Q_ from gajim.common.i18n import _ from gajim.common.i18n import ngettext -from gajim.common.caps_cache import muc_caps_cache log = logging.getLogger('gajim.c.helpers') @@ -1450,8 +1449,9 @@ def call_counter(func): return helper def get_sync_threshold(jid, archive_info): + cache = caps_cache.muc_caps_cache if archive_info is None or archive_info.sync_threshold is None: - if muc_caps_cache.supports(jid, 'muc#roomconfig_membersonly'): + if cache.supports(jid, 'muc#roomconfig_membersonly'): threshold = app.config.get('private_room_sync_threshold') else: threshold = app.config.get('public_room_sync_threshold') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1d11e06647152ad29bb78253678a1471af… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1d11e06647152ad29bb78253678a1471af… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Idlequeue: Restore by mistake removed flags
by Philipp Hörist 02 Dec '18

02 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: da055616 by André Apitzsch at 2018-12-02T12:38:52Z Idlequeue: Restore by mistake removed flags - - - - - 5c6c045a by Philipp Hörist at 2018-12-02T13:33:57Z Merge branch 'idlequeue' into 'master' Idlequeue: Restore by mistake removed flags See merge request gajim/python-nbxmpp!24 - - - - - 1 changed file: - nbxmpp/idlequeue.py Changes: ===================================== nbxmpp/idlequeue.py ===================================== @@ -37,15 +37,25 @@ if os.name == 'nt': elif os.name == 'posix': import fcntl -FLAG_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.HUP -FLAG_READ = GLib.IOCondition.IN | GLib.IOCondition.PRI | \ - GLib.IOCondition.HUP -FLAG_READ_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.IN | \ - GLib.IOCondition.PRI | GLib.IOCondition.HUP -FLAG_CLOSE = GLib.IOCondition.HUP -PENDING_READ = GLib.IOCondition.IN # There is data to read. -PENDING_WRITE = GLib.IOCondition.OUT # Data CAN be written without blocking. -IS_CLOSED = GLib.IOCondition.HUP # Hung up (connection broken) +if HAVE_GLIB: + FLAG_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.HUP + FLAG_READ = GLib.IOCondition.IN | GLib.IOCondition.PRI | \ + GLib.IOCondition.HUP + FLAG_READ_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.IN | \ + GLib.IOCondition.PRI | GLib.IOCondition.HUP + FLAG_CLOSE = GLib.IOCondition.HUP + PENDING_READ = GLib.IOCondition.IN # There is data to read. + PENDING_WRITE = GLib.IOCondition.OUT # Data CAN be written without blocking. + IS_CLOSED = GLib.IOCondition.HUP # Hung up (connection broken) +else: + FLAG_WRITE = 20 # write only 10100 + FLAG_READ = 19 # read only 10011 + FLAG_READ_WRITE = 23 # read and write 10111 + FLAG_CLOSE = 16 # wait for close 10000 + PENDING_READ = 3 # waiting read event 11 + PENDING_WRITE = 4 # waiting write event 100 + IS_CLOSED = 16 # channel closed 10000 + def get_idlequeue(): """ View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/073553215d153ff1f3991a223… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/073553215d153ff1f3991a223… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2018