Commits

commits@gajim.org

17632 discussions

[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

[Git][gajim/gajim][master] 2 commits: Use custom dict for additional data
by Philipp Hörist 01 Dec '18

01 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 432a4edb by Philipp Hörist at 2018-11-30T22:05:15Z Use custom dict for additional data This makes it easier to retrive and store values - - - - - 3f2e3c6b by Philipp Hörist at 2018-12-01T20:46:58Z Better handle not available keyring backends - - - - - 15 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection_handlers_events.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/logger.py - gajim/common/modules/httpupload.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/misc.py - gajim/common/passwords.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/conversation_textview.py - gajim/groupchat_control.py - gajim/session.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -42,6 +42,7 @@ from gajim.common import helpers from gajim.common import ged from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.contacts import GC_Contact from gajim.common.const import AvatarSize from gajim.common.const import KindConstant @@ -923,7 +924,7 @@ class ChatControl(ChatControlBase): contact = self.contact if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() if frm == 'status': if not app.config.get('print_status_in_chats'): ===================================== gajim/chat_control_base.py ===================================== @@ -38,6 +38,7 @@ from gajim.common import helpers from gajim.common import ged from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.contacts import GC_Contact from gajim.common.connection_handlers_events import MessageOutgoingEvent from gajim.common.const import StyleAttr @@ -888,7 +889,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if other_tags_for_text is None: other_tags_for_text = [] if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() textview.print_conversation_line(text, jid, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -28,6 +28,7 @@ from gajim.common import helpers from gajim.common import app from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.modules import dataforms from gajim.common.modules.misc import parse_idle from gajim.common.modules.misc import parse_delay @@ -91,14 +92,12 @@ class HelperEvent: def get_oob_data(self, stanza): oob_node = stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) if oob_node is not None: - if 'gajim' not in self.additional_data: - self.additional_data['gajim'] = {} oob_url = oob_node.getTagData('url') if oob_url is not None: - self.additional_data['gajim']['oob_url'] = oob_url + self.additional_data.set_value('gajim', 'oob_url', oob_url) oob_desc = oob_node.getTagData('desc') if oob_desc is not None: - self.additional_data['gajim']['oob_desc'] = oob_desc + self.additional_data.set_value('gajim', 'oob_desc', oob_desc) def get_stanza_id(self, stanza, query=False): if query: @@ -407,7 +406,7 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): def generate(self): self.stanza = self.msg_obj.stanza if not hasattr(self.msg_obj, 'additional_data'): - self.additional_data = {} + self.additional_data = AdditionalDataDict() else: self.additional_data = self.msg_obj.additional_data self.id_ = self.msg_obj.stanza.getID() @@ -627,18 +626,9 @@ class ConnectionTypeEvent(nec.NetworkIncomingEvent): class StanzaReceivedEvent(nec.NetworkIncomingEvent): name = 'stanza-received' - def init(self): - self.additional_data = {} - - def generate(self): - return True - class StanzaSentEvent(nec.NetworkIncomingEvent): name = 'stanza-sent' - def init(self): - self.additional_data = {} - class AgentRemovedEvent(nec.NetworkIncomingEvent): name = 'agent-removed' @@ -1159,7 +1149,7 @@ class MessageOutgoingEvent(nec.NetworkOutgoingEvent): name = 'message-outgoing' def init(self): - self.additional_data = {} + self.additional_data = AdditionalDataDict() self.message = None self.keyID = None self.type_ = 'chat' @@ -1212,7 +1202,7 @@ class GcMessageOutgoingEvent(nec.NetworkOutgoingEvent): name = 'gc-message-outgoing' def init(self): - self.additional_data = {} + self.additional_data = AdditionalDataDict() self.message = '' self.chatstate = None self.xhtml = None ===================================== gajim/common/events.py ===================================== @@ -81,7 +81,8 @@ class ChatEvent(Event): self.displaymarking = displaymarking self.sent_forwarded = sent_forwarded if additional_data is None: - additional_data = {} + from gajim.common.helpers import AdditionalDataDict + additional_data = AdditionalDataDict() self.additional_data = additional_data class NormalEvent(ChatEvent): ===================================== gajim/common/helpers.py ===================================== @@ -41,6 +41,7 @@ import time import logging import json import shutil +import collections from datetime import datetime, timedelta from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode @@ -1469,3 +1470,51 @@ def load_json(path, key=None, default=None): if key is None: return json_dict return json_dict.get(key, default) + +class AdditionalDataDict(collections.UserDict): + def __init__(self, initialdata=None): + collections.UserDict.__init__(self, initialdata) + + @staticmethod + def _get_path_childs(full_path): + path_childs = [full_path] + if ':' in full_path: + path_childs = full_path.split(':') + return path_childs + + def set_value(self, full_path, key, value): + path_childs = self._get_path_childs(full_path) + _dict = self.data + for path in path_childs: + try: + _dict = _dict[path] + except KeyError: + _dict[path] = {} + _dict = _dict[path] + _dict[key] = value + + def get_value(self, full_path, key, default=None): + path_childs = self._get_path_childs(full_path) + _dict = self.data + for path in path_childs: + try: + _dict = _dict[path] + except KeyError: + return default + try: + return _dict[key] + except KeyError: + return default + + def remove_value(self, full_path, key): + path_childs = self._get_path_childs(full_path) + _dict = self.data + for path in path_childs: + try: + _dict = _dict[path] + except KeyError: + return + try: + del _dict[key] + except KeyError: + return ===================================== gajim/common/logger.py ===================================== @@ -41,6 +41,7 @@ from gi.repository import GLib from gajim.common import exceptions from gajim.common import app from gajim.common import configpaths +from gajim.common.helpers import AdditionalDataDict from gajim.common.i18n import _ from gajim.common.const import ( JIDConstant, KindConstant, ShowConstant, TypeConstant, @@ -265,8 +266,9 @@ class Logger: Row = namedtuple("Row", fields) named_row = Row(*row) if 'additional_data' in fields: + _dict = json.loads(named_row.additional_data or '{}') named_row = named_row._replace( - additional_data=json.loads(named_row.additional_data or '{}')) + additional_data=AdditionalDataDict(_dict)) # if an alias `account` for the field `account_id` is used for the # query, the account_id is converted to the account jid @@ -1355,7 +1357,8 @@ class Logger: if not kwargs['additional_data']: del kwargs['additional_data'] else: - kwargs['additional_data'] = json.dumps(kwargs["additional_data"]) + serialized_dict = json.dumps(kwargs["additional_data"].data) + kwargs['additional_data'] = serialized_dict sql = ''' INSERT INTO logs (account_id, jid_id, time, kind, {columns}) ===================================== gajim/common/modules/httpupload.py ===================================== @@ -118,10 +118,7 @@ class HTTPUpload: # to distinguish HTTP File Upload Link from pasted URL oob = event.msg_iq.addChild('x', namespace=nbxmpp.NS_X_OOB) oob.addChild('url').setData(message) - if 'gajim' in event.additional_data: - event.additional_data['gajim']['oob_url'] = message - else: - event.additional_data['gajim'] = {'oob_url': message} + event.additional_data.set_value('gajim', 'oob_url', message) def check_file_before_transfer(self, path, encryption, contact, session, groupchat=False): ===================================== gajim/common/modules/mam.py ===================================== @@ -27,6 +27,7 @@ from gajim.common.const import KindConstant from gajim.common.const import SyncThreshold from gajim.common.caps_cache import muc_caps_cache from gajim.common.helpers import get_sync_threshold +from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.misc import parse_delay from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_correction @@ -178,7 +179,7 @@ class MAM: event_attrs.update( {'conn': self._con, - 'additional_data': {}, + 'additional_data': AdditionalDataDict(), 'encrypted': False, 'timestamp': timestamp, 'user_timestamp': user_timestamp, @@ -192,6 +193,7 @@ class MAM: 'archive_jid': archive_jid, 'msgtxt': msgtxt, 'message': message, + 'stanza': message, 'namespace': namespace, }) @@ -251,7 +253,7 @@ class MAM: log.debug(event.msgtxt) event.correct_id = parse_correction(event.message) - parse_oob(event.message, event.additional_data) + parse_oob(event) with_ = event.with_.getStripped() if event.muc_pm: ===================================== gajim/common/modules/message.py ===================================== @@ -22,7 +22,9 @@ import nbxmpp from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ -from gajim.common.nec import NetworkIncomingEvent, NetworkEvent +from gajim.common.nec import NetworkIncomingEvent +from gajim.common.nec import NetworkEvent +from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.carbons import parse_carbon @@ -189,7 +191,7 @@ class Message: 'account': self._account, 'id_': id_, 'encrypted': False, - 'additional_data': {}, + 'additional_data': AdditionalDataDict(), 'forwarded': forwarded, 'sent': sent, 'fjid': fjid, @@ -244,7 +246,7 @@ class Message: 'timestamp': timestamp, 'delayed': delayed, } - parse_oob(event.stanza, event.additional_data) + parse_oob(event) for name, value in event_attr.items(): setattr(event, name, value) ===================================== gajim/common/modules/misc.py ===================================== @@ -81,27 +81,18 @@ def parse_delay(stanza, epoch=True, convert='utc'): # XEP-0066: Out of Band Data -def parse_oob(stanza, dict_=None, key='gajim'): - oob_node = stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) +def parse_oob(event): + oob_node = event.stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) if oob_node is None: return - result = {} + url = oob_node.getTagData('url') if url is not None: - result['oob_url'] = url + event.additional_data.set_value('gajim', 'oob_url', url) + desc = oob_node.getTagData('desc') if desc is not None: - result['oob_desc'] = desc - - if dict_ is None: - return result - - if key in dict_: - dict_[key] += result - else: - dict_[key] = result - - return dict_ + event.additional_data.set_value('gajim', 'oob_desc', desc) # XEP-0308: Last Message Correction ===================================== 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/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -30,6 +30,7 @@ from gajim.common.protocol.bytestream import ConnectionSocks5BytestreamZeroconf from gajim.common.zeroconf.zeroconf import Constant from gajim.common import connection_handlers from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.nec import NetworkIncomingEvent, NetworkEvent from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.misc import parse_eme @@ -118,7 +119,7 @@ connection_handlers.ConnectionJingle): 'account': self.name, 'id_': id_, 'encrypted': False, - 'additional_data': {}, + 'additional_data': AdditionalDataDict(), 'forwarded': False, 'sent': False, 'timestamp': time.time(), @@ -165,7 +166,7 @@ connection_handlers.ConnectionJingle): 'stanza_id': event.unique_id } - parse_oob(event.stanza, event.additional_data) + parse_oob(event) for name, value in event_attr.items(): setattr(event, name, value) ===================================== gajim/conversation_textview.py ===================================== @@ -39,6 +39,7 @@ from gajim.common import app from gajim.common import helpers from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.fuzzyclock import FuzzyClock from gajim.common.const import StyleAttr @@ -660,7 +661,7 @@ class ConversationTextview(GObject.GObject): if not otext: return if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() buffer_ = self.tv.get_buffer() if other_tags: insert_tags_func = buffer_.insert_with_tags_by_name @@ -680,13 +681,10 @@ class ConversationTextview(GObject.GObject): specials_limit = 100 # add oob text to the end - try: - gajim_data = additional_data['gajim'] - oob_url = gajim_data['oob_url'] - except KeyError: - pass - else: - oob_desc = additional_data['gajim'].get('oob_desc', 'URL:') + + oob_url = additional_data.get_value('gajim', 'oob_url') + if oob_url is not None: + oob_desc = additional_data.get_value('gajim', 'oob_desc', 'URL:') if oob_url != otext: otext += '\n{} {}'.format(oob_desc, oob_url) @@ -733,7 +731,7 @@ class ConversationTextview(GObject.GObject): (emots, links, formatting) """ if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() # PluginSystem: adding GUI extension point for ConversationTextview self.plugin_modified = False @@ -935,7 +933,7 @@ class ConversationTextview(GObject.GObject): Print 'chat' type messages """ if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() buffer_ = self.tv.get_buffer() buffer_.begin_user_action() insert_mark = None @@ -1166,14 +1164,11 @@ class ConversationTextview(GObject.GObject): @staticmethod def _get_encryption_details(additional_data): - encrypted = additional_data.get('encrypted') - if encrypted is None: - return - - name = encrypted.get('name') + name = additional_data.get_value('encrypted', 'name') if name is None: return - fingerprint = encrypted.get('fingerprint') + + fingerprint = additional_data.get_value('encrypted', 'fingerprint') return name, fingerprint def print_time(self, text, kind, tim, simple, direction_mark, other_tags_for_time, iter_): @@ -1254,7 +1249,7 @@ class ConversationTextview(GObject.GObject): if text_tags is None: text_tags = [] if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() buffer_ = self.tv.get_buffer() if not mark: iter_ = buffer_.get_end_iter() ===================================== gajim/groupchat_control.py ===================================== @@ -52,6 +52,7 @@ 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.helpers import AdditionalDataDict from gajim.common.modules import dataforms from gajim.common import ged from gajim.common import i18n @@ -1228,7 +1229,7 @@ class GroupchatControl(ChatControlBase): def print_old_conversation(self, text, contact='', tim=None, xhtml=None, displaymarking=None, msg_stanza_id=None, encrypted=None, additional_data=None): if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() if contact: if contact == self.nick: # it's us @@ -1259,7 +1260,7 @@ class GroupchatControl(ChatControlBase): If contact is not set: it's a message from the server or help. """ if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() other_tags_for_name = [] other_tags_for_text = [] if contact: ===================================== gajim/session.py ===================================== @@ -26,6 +26,7 @@ from gajim.common import events from gajim.common import app from gajim.common import contacts from gajim.common import ged +from gajim.common.helpers import AdditionalDataDict from gajim.common.const import KindConstant from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.util import get_show_in_roster @@ -276,7 +277,7 @@ class ChatControlSession: fjid = jid if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() # Try to catch the contact with correct resource if resource: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/91ebe37359419c97f1a0c995c1e9e62a3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/91ebe37359419c97f1a0c995c1e9e62a3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AccountsWindow: Fix back button
by Philipp Hörist 27 Nov '18

27 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 91ebe373 by Philipp Hörist at 2018-11-27T20:04:13Z AccountsWindow: Fix back button - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -80,6 +80,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() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/91ebe37359419c97f1a0c995c1e9e62a3b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/91ebe37359419c97f1a0c995c1e9e62a3b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Dont inherit from object
by Philipp Hörist 27 Nov '18

27 Nov '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 07355321 by Philipp Hörist at 2018-11-27T19:16:24Z Dont inherit from object This is only needed for python2 compatibility - - - - - 10 changed files: - nbxmpp/bosh.py - nbxmpp/client_nb.py - nbxmpp/dispatcher_nb.py - nbxmpp/idlequeue.py - nbxmpp/plugin.py - nbxmpp/protocol.py - nbxmpp/proxy_connectors.py - nbxmpp/simplexml.py - nbxmpp/stringprepare.py - nbxmpp/tls_nb.py Changes: ===================================== nbxmpp/bosh.py ===================================== @@ -493,7 +493,7 @@ def get_rand_number(): return int(binascii.hexlify(os.urandom(6)), 16) -class AckChecker(object): +class AckChecker: """ Class for generating rids and generating and checking acknowledgements in BOSH messages @@ -536,7 +536,7 @@ class AckChecker(object): return self.rid -class KeyStack(object): +class KeyStack: """ Class implementing key sequences for BOSH messages """ ===================================== nbxmpp/client_nb.py ===================================== @@ -34,7 +34,7 @@ from .const import Event log = logging.getLogger('nbxmpp.client_nb') -class NonBlockingClient(object): +class NonBlockingClient: """ Client class is XMPP connection mountpoint. Objects for authentication, network communication, roster, xml parsing ... are plugged to client object. ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -41,7 +41,7 @@ DEFAULT_TIMEOUT_SECONDS = 25 XML_DECLARATION = '<?xml version=\'1.0\'?>' # FIXME: ugly -class Dispatcher(object): +class Dispatcher: """ Why is this here - I needed to redefine Dispatcher for BOSH and easiest way was to inherit original Dispatcher (now renamed to XMPPDispatcher). Trouble ===================================== nbxmpp/idlequeue.py ===================================== @@ -63,7 +63,7 @@ def get_idlequeue(): return SelectIdleQueue() -class IdleObject(object): +class IdleObject: """ Idle listener interface. Listed methods are called by IdleQueue. """ @@ -203,7 +203,7 @@ class IdleCommand(IdleObject): self._return_result() -class IdleQueue(object): +class IdleQueue: """ IdleQueue provide three distinct time based features. Uses select.poll() ===================================== nbxmpp/plugin.py ===================================== @@ -20,7 +20,7 @@ import logging log = logging.getLogger('nbxmpp.plugin') -class PlugIn(object): +class PlugIn: """ Abstract xmpppy plugin infrastructure code, providing plugging in/out and debugging functionality ===================================== nbxmpp/protocol.py ===================================== @@ -638,7 +638,7 @@ stream_exceptions = {'bad-format': BadFormat, 'xml-not-well-formed': XMLNotWellFormed} -class JID(object): +class JID: """ JID can be built from string, modified, compared, serialised into string """ ===================================== nbxmpp/proxy_connectors.py ===================================== @@ -30,7 +30,7 @@ from base64 import b64encode log = logging.getLogger('nbxmpp.proxy_connectors') -class ProxyConnector(object): +class ProxyConnector: """ Interface for proxy-connecting object - when tunnneling XMPP over proxies, some connecting process usually has to be done before opening stream. Proxy ===================================== nbxmpp/simplexml.py ===================================== @@ -32,7 +32,7 @@ def XMLescape(txt): # replace also FORM FEED and ESC, because they are not valid XML chars return txt.replace("&", "&").replace("<", "<").replace(">", ">").replace('"', """).replace('\x0C', "").replace('\x1B', "") -class Node(object): +class Node: """ Node class describes syntax of separate XML Node. It have a constructor that permits node creation from set of "namespace name", attributes and payload @@ -471,7 +471,7 @@ class Node(object): raise AttributeError -class T(object): +class T: """ Auxiliary class used to quick access to node's child nodes """ @@ -506,7 +506,7 @@ class NT(T): return self.node.addChild(attr, payload=[val]) -class NodeBuilder(object): +class NodeBuilder: """ Builds a Node class minidom from data parsed to it. This class used for two purposes: ===================================== nbxmpp/stringprepare.py ===================================== @@ -26,7 +26,7 @@ import unicodedata from encodings import idna -class ILookupTable(object): +class ILookupTable: """ Interface for character lookup classes """ @@ -38,7 +38,7 @@ class ILookupTable(object): pass -class IMappingTable(object): +class IMappingTable: """ Interface for character mapping classes """ @@ -50,14 +50,14 @@ class IMappingTable(object): pass -class LookupTableFromFunction(object): +class LookupTableFromFunction: __implements__ = ILookupTable def __init__(self, in_table_function): self.lookup = in_table_function -class LookupTable(object): +class LookupTable: __implements__ = ILookupTable def __init__(self, table): @@ -67,14 +67,14 @@ class LookupTable(object): return c in self._table -class MappingTableFromFunction(object): +class MappingTableFromFunction: __implements__ = IMappingTable def __init__(self, map_table_function): self.map = map_table_function -class EmptyMappingTable(object): +class EmptyMappingTable: __implements__ = IMappingTable def __init__(self, in_table_function): @@ -87,7 +87,7 @@ class EmptyMappingTable(object): return c -class Profile(object): +class Profile: def __init__(self, mappings=None, normalize=True, prohibiteds=None, check_unassigneds=True, check_bidi=True): if mappings is None: @@ -161,7 +161,7 @@ class Profile(object): raise UnicodeError("Violation of BIDI Requirement 3") -class NamePrep(object): +class NamePrep: """ Implements preparation of internationalized domain names ===================================== nbxmpp/tls_nb.py ===================================== @@ -52,7 +52,7 @@ def gattr(obj, attr, default=None): return default -class SSLWrapper(object): +class SSLWrapper: """ Abstract SSLWrapper base class """ View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/073553215d153ff1f3991a2234… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/073553215d153ff1f3991a2234… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Replace ustr() by str()
by Philipp Hörist 27 Nov '18

27 Nov '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 43e0a537 by André Apitzsch at 2018-11-26T22:46:24Z Replace ustr() by str() - - - - - 2c7a3e2c by Philipp Hörist at 2018-11-27T19:11:33Z Merge branch 'ustr' into 'master' Replace ustr() by str() See merge request gajim/python-nbxmpp!22 - - - - - 3 changed files: - nbxmpp/c14n.py - nbxmpp/simplexml.py - nbxmpp/transports_nb.py Changes: ===================================== nbxmpp/c14n.py ===================================== @@ -22,8 +22,6 @@ XML canonicalisation methods (for XEP-0116) """ -from .simplexml import ustr - def c14n(node, is_buggy): s = "<" + node.name if node.namespace: @@ -34,7 +32,7 @@ def c14n(node, is_buggy): for key in sorted_attrs: if not is_buggy and key == 'xmlns': continue - val = ustr(node.attrs[key]) + val = str(node.attrs[key]) # like XMLescape() but with whitespace and without > s += ' %s="%s"' % (key, normalise_attr(val)) s += ">" ===================================== nbxmpp/simplexml.py ===================================== @@ -32,23 +32,6 @@ def XMLescape(txt): # replace also FORM FEED and ESC, because they are not valid XML chars return txt.replace("&", "&").replace("<", "<").replace(">", ">").replace('"', """).replace('\x0C', "").replace('\x1B', "") -ENCODING='utf-8' - -def ustr(what): - """ - Converts object "what" to unicode string using it's own __str__ method if - accessible or unicode method otherwise - """ - if isinstance(what, str): - return what - try: - r = what.__str__() - except AttributeError: - r = str(what) - if not isinstance(r, str): - return str(r, ENCODING) - return r - class Node(object): """ Node class describes syntax of separate XML Node. It have a constructor that @@ -134,7 +117,7 @@ class Node(object): if isinstance(i, Node): self.addChild(node=i) else: - self.data.append(ustr(i)) + self.data.append(str(i)) def lookup_nsp(self, pfx=''): ns = self.nsd.get(pfx, None) @@ -159,7 +142,7 @@ class Node(object): if 'xmlns' not in self.attrs: s += ' xmlns="%s"' % self.namespace for key in self.attrs.keys(): - val = ustr(self.attrs[key]) + val = str(self.attrs[key]) s += ' %s="%s"' % (key, XMLescape(val)) s += ">" @@ -218,7 +201,7 @@ class Node(object): """ Add some CDATA to node """ - self.data.append(ustr(data)) + self.data.append(str(data)) def clearData(self): """ @@ -379,7 +362,7 @@ class Node(object): """ Set node's CDATA to provided string. Resets all previous CDATA! """ - self.data = [ustr(data)] + self.data = [str(data)] def setName(self, val): """ @@ -441,9 +424,9 @@ class Node(object): (optionally) attributes "attrs" and sets it's CDATA to string "val" """ try: - self.getTag(tag, attrs).setData(ustr(val)) + self.getTag(tag, attrs).setData(str(val)) except Exception: - self.addChild(tag, attrs, payload = [ustr(val)]) + self.addChild(tag, attrs, payload = [str(val)]) def has_attr(self, key): """ ===================================== nbxmpp/transports_nb.py ===================================== @@ -38,7 +38,6 @@ try: except ImportError: from urlparse import urlparse -from .simplexml import ustr from .plugin import PlugIn from .idlequeue import IdleObject from . import proxy_connectors @@ -544,7 +543,7 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): if isinstance(stanza, str): stanza = stanza.encode('utf-8') elif not isinstance(stanza, str): - stanza = ustr(stanza).encode('utf-8') + stanza = str(stanza).encode('utf-8') return stanza def _plug_idle(self, writable, readable): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/397382139300c7b992934c6c3… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/397382139300c7b992934c6c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix connection resume
by Philipp Hörist 27 Nov '18

27 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f1ab9fb6 by Philipp Hörist at 2018-11-27T18:23:34Z Fix connection resume Fixes #9458 - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -670,7 +670,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.old_show = app.SHOW_LIST[self.connected] self.connected = 0 if not self.on_purpose: - if not self.connection.resume_supported: + if not self._sm_resume_data: app.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f1ab9fb6838f2a8a36370e404937c746b0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f1ab9fb6838f2a8a36370e404937c746b0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix sm resume
by Philipp Hörist 27 Nov '18

27 Nov '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 39738213 by Philipp Hörist at 2018-11-27T17:52:42Z Fix sm resume - - - - - 2 changed files: - nbxmpp/client_nb.py - nbxmpp/smacks.py Changes: ===================================== nbxmpp/client_nb.py ===================================== @@ -586,10 +586,9 @@ class NonBlockingClient(object): elif self.SASL.startsasl == 'success': self.connected += '+sasl' self.Dispatcher.Event(Realm.CONNECTING, Event.AUTH_SUCCESSFUL) + self._owner.Smacks.register_handlers() def bind(self): - self._owner.Smacks.register_handlers() - # Check if we can resume if self._owner.Smacks.resume_supported: self._owner.Smacks.resume_request() ===================================== nbxmpp/smacks.py ===================================== @@ -279,7 +279,7 @@ class Smacks(PlugIn): self._owner.Dispatcher.Event(Realm.CONNECTING, Event.RESUME_FAILED) # We failed while resuming self.resume_supported = False - self._owner.start_bind() + self._owner.bind() self._reset_state() def _reset_state(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/397382139300c7b992934c6c3e… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/397382139300c7b992934c6c3e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix receipts for chat
by Philipp Hörist 27 Nov '18

27 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f942e2c7 by Andrey Gursky at 2018-11-27T01:17:25Z Fix receipts for chat This is a regression from e3050697 - - - - - 1 changed file: - gajim/common/modules/receipts.py Changes: ===================================== 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 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f942e2c70faf2229a59a24b8293712ac79… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f942e2c70faf2229a59a24b8293712ac79… 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