Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Port from getAnID() to generate_id()
by Philipp Hörist 23 Jan '20

23 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 54929665 by Philipp Hörist at 2020-01-23T19:39:58+01:00 Port from getAnID() to generate_id() - - - - - 7 changed files: - gajim/common/connection.py - gajim/common/jingle_session.py - gajim/common/jingle_transport.py - gajim/common/jingle_xtls.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/mam.py - gajim/common/zeroconf/client_zeroconf.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -48,6 +48,7 @@ import OpenSSL.crypto import nbxmpp from nbxmpp.const import Realm from nbxmpp.const import Event +from nbxmpp.util import generate_id from gajim import common from gajim.common import helpers @@ -232,7 +233,7 @@ class CommonConnection: namespace=nbxmpp.NS_CORRECT) # XEP-0359 - obj.stanza_id = self.connection.getAnID() + obj.stanza_id = generate_id() msg_iq.setID(obj.stanza_id) if obj.message: msg_iq.setOriginID(obj.stanza_id) @@ -1625,7 +1626,7 @@ class Connection(CommonConnection, ConnectionHandlers): typ='groupchat', xhtml=xhtml) - obj.stanza_id = self.connection.getAnID() + obj.stanza_id = generate_id() msg_iq.setID(obj.stanza_id) if obj.message: msg_iq.setOriginID(obj.stanza_id) ===================================== gajim/common/jingle_session.py ===================================== @@ -31,6 +31,7 @@ import logging from enum import Enum, unique import nbxmpp +from nbxmpp.util import generate_id from gajim.common import app from gajim.common.jingle_transport import get_jingle_transport @@ -103,7 +104,7 @@ class JingleSession: # what state is session in? (one from JingleStates) self.state = JingleStates.ENDED if not sid: - sid = con.connection.getAnID() + sid = generate_id() self.sid = sid # sessionid # iq stanza id, used to determine which sessions to summon callback # later on when iq-result stanza arrives ===================================== gajim/common/jingle_transport.py ===================================== @@ -24,6 +24,7 @@ import socket from enum import IntEnum, unique import nbxmpp +from nbxmpp.util import generate_id from gajim.common import app @@ -96,7 +97,7 @@ class JingleTransport: def set_connection(self, conn): self.connection = conn if not self.sid: - self.sid = self.connection.connection.getAnID() + self.sid = generate_id() def set_file_props(self, file_props): self.file_props = file_props @@ -198,7 +199,7 @@ class JingleTransportSocks5(JingleTransport): candidate = { 'host': self.connection.peerhost[0], - 'candidate_id': self.connection.connection.getAnID(), + 'candidate_id': generate_id(), 'port': port, 'type': 'direct', 'jid': self.ourjid, @@ -214,7 +215,7 @@ class JingleTransportSocks5(JingleTransport): addr != '::1': candidate = { 'host': addr, - 'candidate_id': self.connection.connection.getAnID(), + 'candidate_id': generate_id(), 'port': port, 'type': 'direct', 'jid': self.ourjid, @@ -238,7 +239,7 @@ class JingleTransportSocks5(JingleTransport): continue candidate = { 'host': addr, - 'candidate_id': self.connection.connection.getAnID(), + 'candidate_id': generate_id(), 'port': port, 'type': 'direct', 'jid': self.ourjid, @@ -256,7 +257,7 @@ class JingleTransportSocks5(JingleTransport): continue candidate = { 'host': addr, - 'candidate_id': self.connection.connection.getAnID(), + 'candidate_id': generate_id(), 'port': port, 'type': 'direct', 'jid': self.ourjid, @@ -286,7 +287,7 @@ class JingleTransportSocks5(JingleTransport): for host in hosts: candidate = { 'host': host, - 'candidate_id': self.connection.connection.getAnID(), + 'candidate_id': generate_id(), 'port': port, 'type': 'direct', 'jid': self.ourjid, @@ -313,7 +314,7 @@ class JingleTransportSocks5(JingleTransport): for proxyhost in proxyhosts: candidate = { 'host': proxyhost['host'], - 'candidate_id': self.connection.connection.getAnID(), + 'candidate_id': generate_id(), 'port': int(proxyhost['port']), 'type': 'proxy', 'jid': proxyhost['jid'], ===================================== gajim/common/jingle_xtls.py ===================================== @@ -18,6 +18,7 @@ import os from OpenSSL import SSL, crypto import nbxmpp +from nbxmpp.util import generate_id from gajim.common import app from gajim.common import configpaths @@ -188,7 +189,7 @@ def check_cert(jid, fingerprint): def send_cert_request(con, to_jid): iq = nbxmpp.Iq('get', to=to_jid) - id_ = con.connection.getAnID() + id_ = generate_id() iq.setAttr('id', id_) pubkey = iq.setTag('pubkeys') pubkey.setNamespace(nbxmpp.NS_PUBKEY_PUBKEY) ===================================== gajim/common/modules/adhoc_commands.py ===================================== @@ -22,6 +22,7 @@ import nbxmpp from nbxmpp.structs import StanzaHandler from nbxmpp.modules import dataforms +from nbxmpp.util import generate_id from gajim.common import app from gajim.common import helpers @@ -314,7 +315,7 @@ class AdHocCommands(BaseModule): raise nbxmpp.NodeProcessed # generate new sessionid - sessionid = self._con.connection.getAnID() + sessionid = generate_id() # create new instance and run it obj = newcmd(conn=self, jid=jid, sessionid=sessionid) ===================================== gajim/common/modules/mam.py ===================================== @@ -18,6 +18,7 @@ import time from datetime import datetime, timedelta import nbxmpp +from nbxmpp.util import generate_id from nbxmpp.structs import StanzaHandler from gajim.common import app @@ -256,7 +257,7 @@ class MAM(BaseModule): return valid_id == properties.mam.query_id def _get_query_id(self, jid): - query_id = self._con.connection.getAnID() + query_id = generate_id() self._mam_query_ids[jid] = query_id return query_id ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -34,6 +34,7 @@ from nbxmpp.idlequeue import IdleObject from nbxmpp.transports import DATA_RECEIVED from nbxmpp.transports import DATA_SENT from nbxmpp.transports import DATA_ERROR +from nbxmpp.util import generate_id from gajim.common import app from gajim.common.zeroconf import zeroconf @@ -184,7 +185,7 @@ class P2PClient(IdleObject): thread_id = stanza.getThread() id_ = stanza.getID() if not id_: - id_ = self.Dispatcher.getAnID() + id_ = generate_id() if self.fd in self.conn_holder.ids_of_awaiting_messages: self.conn_holder.ids_of_awaiting_messages[self.fd].append(( id_, thread_id)) @@ -209,7 +210,7 @@ class P2PClient(IdleObject): thread_id = stanza.getThread() id_ = stanza.getID() if not id_: - id_ = self.Dispatcher.getAnID() + id_ = generate_id() if self.fd in self.conn_holder.ids_of_awaiting_messages: self.conn_holder.ids_of_awaiting_messages[self.fd].append((id_, thread_id)) @@ -800,12 +801,6 @@ class ClientZeroconf: P2PClient(None, addresses_, self, [(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok) - def getAnID(self): - """ - Generate a random id - """ - return ''.join(Random().sample(string.ascii_letters + string.digits, 6)) - def RegisterDisconnectHandler(self, handler): """ Register handler that will be called on disconnect View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/549296659dcb298b0cb28b3865b7cfbce4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/549296659dcb298b0cb28b3865b7cfbce4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Use new StanzaHandler callback signature
by Philipp Hörist 23 Jan '20

23 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: ee7be59e by Philipp Hörist at 2020-01-23T19:25:09+01:00 Use new StanzaHandler callback signature - - - - - f1ce7ccb by Philipp Hörist at 2020-01-23T19:26:50+01:00 MAM: Fix pylint error - - - - - 2 changed files: - gajim/common/modules/bytestream.py - gajim/common/modules/mam.py Changes: ===================================== gajim/common/modules/bytestream.py ===================================== @@ -548,7 +548,7 @@ class Bytestream(BaseModule): iq.setID(auth_id) self._con.connection.send(iq) - def _on_bytestream_error(self, _con, iq_obj): + def _on_bytestream_error(self, _con, iq_obj, _properties): id_ = iq_obj.getAttr('id') frm = helpers.get_full_jid_from_iq(iq_obj) query = iq_obj.getTag('query') @@ -567,7 +567,7 @@ class Bytestream(BaseModule): error_msg='')) raise nbxmpp.NodeProcessed - def _on_bytestream_set(self, con, iq_obj): + def _on_bytestream_set(self, con, iq_obj, _properties): target = iq_obj.getAttr('to') id_ = iq_obj.getAttr('id') query = iq_obj.getTag('query') @@ -625,7 +625,7 @@ class Bytestream(BaseModule): _connection_error) raise nbxmpp.NodeProcessed - def _on_result(self, _con, iq_obj): + def _on_result(self, _con, iq_obj, _properties): # if we want to respect xep-0065 we have to check for proxy # activation result in any result iq real_id = iq_obj.getAttr('id') @@ -643,7 +643,7 @@ class Bytestream(BaseModule): app.socks5queue.activate_proxy(host['idx']) raise nbxmpp.NodeProcessed - def _on_bytestream_result(self, con, iq_obj): + def _on_bytestream_result(self, con, iq_obj, _properties): frm = self._ft_get_from(iq_obj) real_id = iq_obj.getAttr('id') query = iq_obj.getTag('query') ===================================== gajim/common/modules/mam.py ===================================== @@ -402,7 +402,8 @@ class MAM(BaseModule): 'start_date': start_date, 'groupchat': groupchat}) - def _result_finished(self, _nbxmpp_client, stanza, query_id, start_date, groupchat): + def _result_finished(self, _nbxmpp_client, stanza, query_id, + start_date, groupchat): try: fin, set_ = self._parse_iq(stanza) except InvalidMamIQ: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/141bb011fa9c06eb64253eb13d88f867c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/141bb011fa9c06eb64253eb13d88f867c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Adapt to nbxmpp callback signature changes
by Philipp Hörist 23 Jan '20

23 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 141bb011 by Philipp Hörist at 2020-01-23T19:16:35+01:00 Adapt to nbxmpp callback signature changes The Client instance is now always the first argument - - - - - 19 changed files: - gajim/common/connection.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/bits_of_binary.py - gajim/common/modules/delimiter.py - gajim/common/modules/entity_time.py - gajim/common/modules/gateway.py - gajim/common/modules/mam.py - gajim/common/modules/metacontacts.py - gajim/common/modules/ping.py - gajim/common/modules/privacylists.py - gajim/common/modules/pubsub.py - gajim/common/modules/register.py - gajim/common/modules/roster.py - gajim/common/modules/search.py - gajim/common/modules/security_labels.py - gajim/common/modules/vcard_temp.py - gajim/common/proxy65_manager.py - gajim/gtk/discovery.py - gajim/gtk/server_info.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -678,7 +678,7 @@ class Connection(CommonConnection, ConnectionHandlers): if data[4] != '': helpers.replace_dataform_media(conf, data[4]) if self.new_account_form: - def _on_register_result(result): + def _on_register_result(_nbxmpp_client, result): if not nbxmpp.isResultNode(result): reason = result.getErrorMsg() or result.getError() app.nec.push_incoming_event(NetworkEvent( @@ -1362,7 +1362,7 @@ class Connection(CommonConnection, ConnectionHandlers): msg=msg, initial=initial) - def _continue_invisible(self, con, iq_obj, msg, signed, initial): + def _continue_invisible(self, _nbxmpp_client, iq_obj, msg, signed, initial): if iq_obj.getType() == 'error': # server doesn't support privacy lists return # active the privacy rule ===================================== gajim/common/modules/adhoc_commands.py ===================================== @@ -383,7 +383,7 @@ class AdHocCommands(BaseModule): self._con.connection.SendAndCallForResponse( stanza, self._action_response_received) - def _action_response_received(self, stanza): + def _action_response_received(self, _nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.info('Error: %s', stanza.getError()) @@ -413,7 +413,7 @@ class AdHocCommands(BaseModule): self._con.connection.SendAndCallForResponse( stanza, self._cancel_result_received) - def _cancel_result_received(self, stanza): + def _cancel_result_received(self, _nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.warning('Error: %s', stanza.getError()) else: ===================================== gajim/common/modules/bits_of_binary.py ===================================== @@ -52,7 +52,7 @@ class BitsOfBinary(BaseModule): self._con.connection.send(iq) raise nbxmpp.NodeProcessed - def _on_bob_received(self, _con, result, cid): + def _on_bob_received(self, _nbxmpp_client, result, cid): """ Called when we receive BoB data """ ===================================== gajim/common/modules/delimiter.py ===================================== @@ -33,7 +33,7 @@ class Delimiter(BaseModule): self._con.connection.SendAndCallForResponse( iq, self._delimiter_received) - def _delimiter_received(self, stanza): + def _delimiter_received(self, _nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.info('Request error: %s', stanza.getError()) else: @@ -56,7 +56,7 @@ class Delimiter(BaseModule): self._con.connection.SendAndCallForResponse( iq, self._set_delimiter_response) - def _set_delimiter_response(self, stanza): + def _set_delimiter_response(self, _nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.info('Store error: %s', stanza.getError()) ===================================== gajim/common/modules/entity_time.py ===================================== @@ -53,7 +53,7 @@ class EntityTime(BaseModule): self._con.connection.SendAndCallForResponse(iq, self._result_received) - def _result_received(self, stanza): + def _result_received(self, _nbxmpp_client, stanza): time_info = None if not nbxmpp.isResultNode(stanza): self._log.info('Error: %s', stanza.getError()) ===================================== gajim/common/modules/gateway.py ===================================== @@ -35,7 +35,7 @@ class Gateway(BaseModule): iq, self._on_unsubscribe_result) self._con.get_module('Roster').del_item(agent) - def _on_unsubscribe_result(self, stanza): + def _on_unsubscribe_result(self, _nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.info('Error: %s', stanza.getError()) return @@ -69,7 +69,7 @@ class Gateway(BaseModule): query.setTagData('prompt', prompt) self._con.connection.SendAndCallForResponse(iq, self._on_prompt_result) - def _on_prompt_result(self, stanza): + def _on_prompt_result(self, _nbxmpp_client, stanza): jid = str(stanza.getFrom()) fjid = stanza.getFrom().getBare() resource = stanza.getFrom().getResource() ===================================== gajim/common/modules/mam.py ===================================== @@ -297,7 +297,7 @@ class MAM(BaseModule): query, self._received_count, {'query_id': query_id}) return query_id - def _received_count(self, _con, stanza, query_id): + def _received_count(self, _nbxmpp_client, stanza, query_id): try: _, set_ = self._parse_iq(stanza) except InvalidMamIQ: @@ -402,7 +402,7 @@ class MAM(BaseModule): 'start_date': start_date, 'groupchat': groupchat}) - def _result_finished(self, _con, stanza, query_id, start_date, groupchat): + def _result_finished(self, _nbxmpp_client, stanza, query_id, start_date, groupchat): try: fin, set_ = self._parse_iq(stanza) except InvalidMamIQ: @@ -458,7 +458,7 @@ class MAM(BaseModule): 'end_date': end_date}) return query_id - def _intervall_result(self, _con, stanza, query_id, + def _intervall_result(self, _nbxmpp_client, stanza, query_id, start_date, end_date): try: fin, set_ = self._parse_iq(stanza) @@ -539,7 +539,7 @@ class MAM(BaseModule): self._con.connection.SendAndCallForResponse( iq, self._preferences_received) - def _preferences_received(self, stanza): + def _preferences_received(self, _nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.info('Error: %s', stanza.getError()) app.nec.push_incoming_event(MAMPreferenceError( @@ -580,7 +580,7 @@ class MAM(BaseModule): self._con.connection.SendAndCallForResponse( iq, self._preferences_saved) - def _preferences_saved(self, stanza): + def _preferences_saved(self, _nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.info('Error: %s', stanza.getError()) app.nec.push_incoming_event(MAMPreferenceError( ===================================== gajim/common/modules/metacontacts.py ===================================== @@ -36,7 +36,7 @@ class MetaContacts(BaseModule): self._con.connection.SendAndCallForResponse( iq, self._metacontacts_received) - def _metacontacts_received(self, stanza): + def _metacontacts_received(self, _nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.info('Request error: %s', stanza.getError()) else: @@ -93,7 +93,7 @@ class MetaContacts(BaseModule): self._con.connection.SendAndCallForResponse( iq, self._store_response_received) - def _store_response_received(self, stanza): + def _store_response_received(self, _nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.info('Store error: %s', stanza.getError()) ===================================== gajim/common/modules/ping.py ===================================== @@ -62,7 +62,9 @@ class Ping(BaseModule): self._con.connection.SendAndCallForResponse(self._get_ping_iq(to), self._keepalive_received) - def _keepalive_received(self, _stanza: nbxmpp.Iq) -> None: + def _keepalive_received(self, + _nbxmpp_client: Any, + _stanza: nbxmpp.Iq) -> None: self._log.info('Received keepalive') self.remove_timeout() @@ -91,7 +93,7 @@ class Ping(BaseModule): PingSentEvent(None, conn=self._con, contact=contact)) def _pong_received(self, - _con: ConnectionT, + _nbxmpp_client: Any, stanza: nbxmpp.Iq, ping_time: int, contact: ContactsT) -> None: ===================================== gajim/common/modules/privacylists.py ===================================== @@ -76,7 +76,7 @@ class PrivacyLists(BaseModule): self._con.connection.SendAndCallForResponse( iq, self._privacy_lists_received, {'callback': callback}) - def _privacy_lists_received(self, _con, stanza, callback): + def _privacy_lists_received(self, _nbxmpp_client, stanza, callback): lists = [] new_default = None result = nbxmpp.isResultNode(stanza) @@ -118,7 +118,7 @@ class PrivacyLists(BaseModule): self._con.connection.SendAndCallForResponse( iq, self._privacy_list_received) - def _privacy_list_received(self, stanza): + def _privacy_list_received(self, _nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.warning('List not available: %s', stanza.getError()) return @@ -152,7 +152,7 @@ class PrivacyLists(BaseModule): def del_privacy_list(self, name): self._log.info('Remove list: %s', name) - def _del_privacy_list_result(stanza): + def _del_privacy_list_result(_nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.warning('List deletion failed: %s', stanza.getError()) app.nec.push_incoming_event(InformationEvent( @@ -235,7 +235,7 @@ class PrivacyLists(BaseModule): self._con.connection.SendAndCallForResponse( iq, self._default_result_handler, {}) - def _default_result_handler(self, _con, stanza): + def _default_result_handler(self, _nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.warning('Operation failed: %s', stanza.getError()) ===================================== gajim/common/modules/pubsub.py ===================================== @@ -164,7 +164,7 @@ class PubSub(BaseModule): pubsub = query.addChild('pubsub', namespace=nbxmpp.NS_PUBSUB_OWNER) pubsub.addChild('delete', {'node': node}) - def response(_con, resp, jid, node): + def response(_nbxmpp_client, resp, jid, node): if resp.getType() == 'result' and on_ok: on_ok(jid, node) elif on_fail: @@ -218,7 +218,7 @@ class PubSub(BaseModule): self._con.connection.SendAndCallForResponse( query, self._received_pb_configuration, {'node': node}) - def _received_pb_configuration(self, _con, stanza, node): + def _received_pb_configuration(self, _nbxmpp_client, stanza, node): if not nbxmpp.isResultNode(stanza): self._log.warning('Error: %s', stanza.getError()) return ===================================== gajim/common/modules/register.py ===================================== @@ -46,7 +46,8 @@ class Register(BaseModule): iq, self._change_password_response, {'success_cb': weak_success_cb, 'error_cb': weak_error_cb}) - def _change_password_response(self, _con, stanza, success_cb, error_cb): + def _change_password_response(self, _nbxmpp_client, stanza, + success_cb, error_cb): if not nbxmpp.isResultNode(stanza): error = stanza.getErrorMsg() self._log.info('Error: %s', error) @@ -81,7 +82,7 @@ class Register(BaseModule): self.agent_registrations[agent] = {'roster_push': False, 'sub_received': False} - def _register_agent_response(self, _con, stanza, agent, + def _register_agent_response(self, _nbxmpp_client, stanza, agent, success_cb, error_cb): if not nbxmpp.isResultNode(stanza): error = stanza.getErrorMsg() @@ -114,7 +115,8 @@ class Register(BaseModule): iq, self._register_info_response, {'success_cb': weak_success_cb, 'error_cb': weak_error_cb}) - def _register_info_response(self, _con, stanza, success_cb, error_cb): + def _register_info_response(self, _nbxmpp_client, stanza, + success_cb, error_cb): if not nbxmpp.isResultNode(stanza): error = stanza.getErrorMsg() self._log.info('Error: %s', error) ===================================== gajim/common/modules/roster.py ===================================== @@ -84,7 +84,7 @@ class Roster(BaseModule): self._con.connection.SendAndCallForResponse( iq, self._roster_received) - def _roster_received(self, stanza): + def _roster_received(self, _nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.warning('Unable to retrive roster: %s', stanza.getError()) else: ===================================== gajim/common/modules/search.py ===================================== @@ -30,7 +30,7 @@ class Search(BaseModule): iq = nbxmpp.Iq(typ='get', to=jid, queryNS=nbxmpp.NS_SEARCH) self._con.connection.SendAndCallForResponse(iq, self._fields_received) - def _fields_received(self, stanza): + def _fields_received(self, _nbxmpp_client, stanza): data = None is_dataform = False @@ -67,7 +67,7 @@ class Search(BaseModule): self._con.connection.SendAndCallForResponse(iq, self._received_result) - def _received_result(self, stanza): + def _received_result(self, _nbxmpp_client, stanza): data = None is_dataform = False ===================================== gajim/common/modules/security_labels.py ===================================== @@ -45,7 +45,7 @@ class SecLabels(BaseModule): self._con.connection.SendAndCallForResponse( iq, self._catalog_received) - def _catalog_received(self, stanza): + def _catalog_received(self, _nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): self._log.info('Error: %s', stanza.getError()) return ===================================== gajim/common/modules/vcard_temp.py ===================================== @@ -135,13 +135,13 @@ class VCardTemp(BaseModule): iq, self._upload_room_avatar_result) @staticmethod - def _upload_room_avatar_result(stanza): + def _upload_room_avatar_result(_nbxmpp_client, stanza): if not nbxmpp.isResultNode(stanza): reason = stanza.getErrorMsg() or stanza.getError() app.nec.push_incoming_event(InformationEvent( None, dialog_name='avatar-upload-error', args=reason)) - def _avatar_publish_result(self, _con, stanza, sha): + def _avatar_publish_result(self, _nbxmpp_client, stanza, sha): if stanza.getType() == 'result': current_sha = app.config.get_per( 'accounts', self._account, 'avatar_sha') @@ -185,7 +185,7 @@ class VCardTemp(BaseModule): return avatar_sha, photo_decoded - def _parse_vcard(self, _con, stanza, callback, expected_sha): + def _parse_vcard(self, _nbxmpp_client, stanza, callback, expected_sha): frm_jid = stanza.getFrom() room = False if frm_jid is None: ===================================== gajim/common/proxy65_manager.py ===================================== @@ -156,7 +156,7 @@ class ProxyResolver: else: self.state = S_INITIAL - def _result_received(self, data): + def _result_received(self, _nbxmpp_client, data): self.disconnect(self.active_connection) if data.getType() == 'result': self.keep_conf() ===================================== gajim/gtk/discovery.py ===================================== @@ -2079,7 +2079,7 @@ class DiscussionGroupsBrowser(AgentBrowser): con.get_module('PubSub').send_pb_unsubscribe( self.jid, node, self._on_pep_unsubscribe, groupnode=node) - def _on_pep_subscriptions(self, conn, request): + def _on_pep_subscriptions(self, _nbxmpp_client, request): """ We got the subscribed groups list stanza. Now, if we already have items on the list, we should actualize them @@ -2108,7 +2108,7 @@ class DiscussionGroupsBrowser(AgentBrowser): # we now know subscriptions, update button states self.update_actions() - def _on_pep_subscribe(self, conn, request, groupnode): + def _on_pep_subscribe(self, _nbxmpp_client, request, groupnode): """ We have just subscribed to a node. Update UI """ @@ -2122,7 +2122,7 @@ class DiscussionGroupsBrowser(AgentBrowser): self.update_actions() - def _on_pep_unsubscribe(self, conn, request, groupnode): + def _on_pep_unsubscribe(self, _nbxmpp_client, request, groupnode): """ We have just unsubscribed from a node. Update UI """ ===================================== gajim/gtk/server_info.py ===================================== @@ -219,7 +219,7 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): open_uri(label.get_text(), account=self.account) return Gdk.EVENT_STOP - def _on_last_activity(self, stanza): + def _on_last_activity(self, _nbxmpp_client, stanza): if self._destroyed: # Window got closed in the meantime return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/141bb011fa9c06eb64253eb13d88f867ca… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/141bb011fa9c06eb64253eb13d88f867ca… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Use consistent callback signature for callbacks
by Philipp Hörist 23 Jan '20

23 Jan '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: efd417bf by Philipp Hörist at 2020-01-23T19:09:20+01:00 Use consistent callback signature for callbacks - - - - - 3 changed files: - nbxmpp/bind.py - nbxmpp/dispatcher.py - nbxmpp/features.py Changes: ===================================== nbxmpp/bind.py ===================================== @@ -89,7 +89,7 @@ class NonBlockingBind(PlugIn): self._owner.Dispatcher.SendAndCallForResponse(node, func=self._on_bind) - def _on_bind(self, stanza): + def _on_bind(self, _client, stanza): if isResultNode(stanza): bind = stanza.getTag('bind') if bind is not None: @@ -115,7 +115,7 @@ class NonBlockingBind(PlugIn): self._owner.Dispatcher.Event(Realm.CONNECTING, Event.BIND_FAILED) self.PlugOut() - def _on_session(self, stanza): + def _on_session(self, _client, stanza): if isResultNode(stanza): log.info('Successfully started session') self._on_bind_successful() ===================================== nbxmpp/dispatcher.py ===================================== @@ -613,7 +613,7 @@ class XMPPDispatcher(PlugIn): cb, args) try: if args is None: - cb(stanza) + cb(self, stanza) else: cb(self, stanza, **args) except NodeProcessed: ===================================== nbxmpp/features.py ===================================== @@ -21,7 +21,7 @@ Different stuff that wasn't worth separating it into modules from .protocol import NS_REGISTER, NS_PRIVACY, NS_DATA, Iq, isResultNode, Node def _on_default_response(disp, iq, cb): - def _on_response(resp): + def _on_response(_client, resp): if isResultNode(resp): if cb: cb(True) @@ -47,7 +47,7 @@ def getRegInfo(disp, host, info={}, sync=True): for i in info.keys(): iq.setTagData(i, info[i]) if sync: - disp.SendAndCallForResponse(iq, lambda resp: + disp.SendAndCallForResponse(iq, lambda _client, resp: _ReceivedRegInfo(disp.Dispatcher, resp, host)) else: disp.SendAndCallForResponse(iq, _ReceivedRegInfo, {'agent': host }) @@ -127,7 +127,7 @@ def getPrivacyLists(disp): lists on success. """ iq = Iq('get', NS_PRIVACY) - def _on_response(resp): + def _on_response(_client, resp): dict_ = {'lists': []} if not isResultNode(resp): disp.Event(NS_PRIVACY, PRIVACY_LISTS_RECEIVED, False) @@ -142,7 +142,7 @@ def getPrivacyLists(disp): def getActiveAndDefaultPrivacyLists(disp): iq = Iq('get', NS_PRIVACY) - def _on_response(resp): + def _on_response(_client, resp): dict_ = {'active': '', 'default': ''} if not isResultNode(resp): disp.Event(NS_PRIVACY, PRIVACY_LISTS_ACTIVE_DEFAULT, False) @@ -160,7 +160,7 @@ def getPrivacyList(disp, listname): Request specific privacy list listname. Returns list of XML nodes (rules) taken from the server responce. """ - def _on_response(resp): + def _on_response(_client, resp): if not isResultNode(resp): disp.Event(NS_PRIVACY, PRIVACY_LIST_RECEIVED, False) return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/efd417bf608b87b70bb56c34bd… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/efd417bf608b87b70bb56c34bd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Drop config updates for versions older than 4 years
by Philipp Hörist 23 Jan '20

23 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5e52522b by André Apitzsch at 2020-01-23T01:18:53+01:00 Drop config updates for versions older than 4 years - - - - - 1 changed file: - gajim/common/optparser.py Changes: ===================================== gajim/common/optparser.py ===================================== @@ -134,12 +134,6 @@ class OptionsParser: while new_version_list: new.append(int(new_version_list.pop(0))) - if old < [0, 14, 0, 1] and new >= [0, 14, 0, 1]: - self.update_config_to_01401() - if old < [0, 14, 90, 0] and new >= [0, 14, 90, 0]: - self.update_config_to_014900() - if old < [0, 16, 0, 1] and new >= [0, 16, 0, 1]: - self.update_config_to_01601() if old < [0, 16, 4, 1] and new >= [0, 16, 4, 1]: self.update_config_to_01641() if old < [0, 16, 10, 1] and new >= [0, 16, 10, 1]: @@ -177,30 +171,6 @@ class OptionsParser: app.config.set_per('accounts', account, 'file_transfer_proxies', proxies_str) - def update_config_to_01401(self): - if 'autodetect_browser_mailer' not in self.old_values or 'openwith' \ - not in self.old_values or \ - (self.old_values['autodetect_browser_mailer'] is False and \ - self.old_values['openwith'] != 'custom'): - app.config.set('autodetect_browser_mailer', True) - app.config.set('openwith', app.config.DEFAULT_OPENWITH) - app.config.set('version', '0.14.0.1') - - def update_config_to_014900(self): - if 'use_stun_server' in self.old_values and self.old_values[ - 'use_stun_server'] and not self.old_values['stun_server']: - app.config.set('use_stun_server', False) - if os.name == 'nt': - app.config.set('autodetect_browser_mailer', True) - - def update_config_to_01601(self): - if 'last_mam_id' in self.old_values: - last_mam_id = self.old_values['last_mam_id'] - for account in app.config.get_per('accounts'): - app.config.set_per('accounts', account, 'last_mam_id', - last_mam_id) - app.config.set('version', '0.16.0.1') - def update_config_to_01641(self): for account in self.old_values['accounts'].keys(): connection_types = self.old_values['accounts'][account][ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5e52522b35375aae33ba8c3a5193da5d82… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5e52522b35375aae33ba8c3a5193da5d82… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MusicTrackListener: Parsing xesam:artist correctly
by Philipp Hörist 22 Jan '20

22 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0682b8af by Philipp Hörist at 2020-01-22T22:39:22+01:00 MusicTrackListener: Parsing xesam:artist correctly - xesam:artist is always a list of strings rather than a single string - Moved the parsing logic into MusicTrackInfo - - - - - 1 changed file: - gajim/common/dbus/music_track.py Changes: ===================================== gajim/common/dbus/music_track.py ===================================== @@ -32,13 +32,17 @@ MPRIS_PLAYER_PREFIX = 'org.mpris.MediaPlayer2.' class MusicTrackInfo: __slots__ = ['title', 'album', 'artist', 'duration', 'track_number', 'paused'] - def __init__(self): - self.title = None - self.album = None - self.artist = None - self.duration = None - self.track_number = None - self.paused = None + def __init__(self, meta_info, status): + self.title = meta_info.get('xesam:title') + self.album = meta_info.get('xesam:album') + # xesam:artist is always a list of strings if not None + self.artist = meta_info.get('xesam:artist') + if self.artist is not None: + self.artist = ', '.join(self.artist) + + self.duration = float(meta_info.get('mpris:length', 0)) + self.track_number = meta_info.get('xesam:trackNumber', 0) + self.paused = status == 'Paused' class MusicTrackListener(GObject.GObject): @@ -166,22 +170,13 @@ class MusicTrackListener(GObject.GObject): self.emit('music-track-changed', info) @staticmethod - def _properties_extract(properties): + def _get_music_info(properties): meta = properties.get('Metadata') if meta is None or not meta: return None - info = MusicTrackInfo() - info.title = meta.get('xesam:title') - info.album = meta.get('xesam:album') - info.artist = meta.get('xesam:artist') - info.duration = float(meta.get('mpris:length', 0)) - info.track_number = meta.get('xesam:trackNumber', 0) - status = properties.get('PlaybackStatus') - info.paused = status is not None and status == 'Paused' - - return info + return MusicTrackInfo(meta, status) def get_playing_track(self, name): '''Return a MusicTrackInfo for the currently playing @@ -208,9 +203,7 @@ class MusicTrackListener(GObject.GObject): return None raise else: - info = self._properties_extract(result[0]) - return info - + return self._get_music_info(result[0]) # here we test :) if __name__ == '__main__': View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0682b8af4f4a0734d28bd42594934e9998… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0682b8af4f4a0734d28bd42594934e9998… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PassphraseDialog: Make button labels translatable
by Philipp Hörist 20 Jan '20

20 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0292b530 by Daniel Brötzmann at 2020-01-20T14:21:41+01:00 PassphraseDialog: Make button labels translatable - - - - - 1 changed file: - gajim/data/gui/passphrase_dialog.ui Changes: ===================================== gajim/data/gui/passphrase_dialog.ui ===================================== @@ -26,7 +26,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">_Cancel</property> + <property name="label" translatable="yes">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -41,7 +41,7 @@ </child> <child> <object class="GtkButton" id="ok_button"> - <property name="label">_OK</property> + <property name="label" translatable="yes">_OK</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0292b53030607ee0b3df839920388c6eac… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0292b53030607ee0b3df839920388c6eac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add missing return
by Philipp Hörist 17 Jan '20

17 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 194b8eb4 by Philipp Hörist at 2020-01-17T23:07:44+01:00 Add missing return - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1756,6 +1756,7 @@ def _on_file_created(file, result, user_data): outputstream = file.create_finish(result) except GLib.Error as error: callback(False, error, user_data) + return # Pass data as user_data to the callback, because # write_all_async() takes not reference to the data View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/194b8eb4f0139ee4b7283a2a68380a15a6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/194b8eb4f0139ee4b7283a2a68380a15a6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.1.3-1
by Philipp Hörist 16 Jan '20

16 Jan '20

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

1 0

[Git][gajim/gajim][gajim_1.1] 3 commits: Appdata: Fix image location because of new website
by Philipp Hörist 15 Jan '20

15 Jan '20

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: b3fd07b8 by André Apitzsch at 2020-01-15T22:58:27+01:00 Appdata: Fix image location because of new website - - - - - 77aaa021 by André Apitzsch at 2020-01-15T22:58:27+01:00 Appdata: Fix donation link - - - - - a66b293d by André Apitzsch at 2020-01-15T22:58:27+01:00 Appdata: Add copyright information See https://blogs.gnome.org/hughsie/2013/10/01/copyright-in-appdata-files/ for details. - - - - - 1 changed file: - data/org.gajim.Gajim.appdata.xml.in Changes: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> + <component type="desktop-application"> <id>org.gajim.Gajim.desktop</id> <provides> @@ -48,23 +49,23 @@ </categories> <screenshots> <screenshot type="default"> - <image>https://gajim.org/imgs/gajim_single_window_mode.png</image> - <caption>Roster, list of contacts</caption> + <image>https://gajim.org/img/screenshots/single-window-mode.png</image> + <caption>Contact list</caption> </screenshot> <screenshot> - <image>https://gajim.org/imgs/gajim_tabbed_chat.png</image> + <image>https://gajim.org/img/screenshots/tabbed-chat.png</image> <caption>Tabbed chat window</caption> </screenshot> <screenshot> - <image>https://gajim.org/imgs/groupchat_window.png</image> + <image>https://gajim.org/img/screenshots/groupchat-window.png</image> <caption>Group chat support</caption> </screenshot> <screenshot> - <image>https://gajim.org/imgs/history_window.png</image> + <image>https://gajim.org/img/screenshots/history-window.png</image> <caption>Chat history</caption> </screenshot> <screenshot> - <image>https://gajim.org/imgs/gajim_plugins.png</image> + <image>https://gajim.org/img/screenshots/plugins.png</image> <caption>Plugin manager</caption> </screenshot> </screenshots> @@ -75,7 +76,7 @@ <url type="bugtracker">https://dev.gajim.org/gajim/gajim</url> <url type="faq">https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq</url> <url type="help">https://dev.gajim.org/gajim/gajim/wikis/help/Help</url> - <url type="donation">https://gajim.org/dev.php#donate</url> + <url type="donation">https://gajim.org/development/#donating</url> <url type="translate">https://dev.gajim.org/gajim/gajim/wikis/development/DevTranslate</url> <translation type="gettext">gajim</translation> <content_rating type="oars-1.0"> View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/81dee69ba9878744a9c8cd14b6c50dbdb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/81dee69ba9878744a9c8cd14b6c50dbdb… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits