Commits June 2018

commits@gajim.org

1 participants
47 discussions

[Git][gajim/gajim][master] Fix updating room avatar correctly
by Philipp Hörist 30 Jun '18

30 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9c6a8df6 by Philipp Hörist at 2018-06-30T20:02:16+02:00 Fix updating room avatar correctly - - - - - 1 changed file: - gajim/common/modules/vcard_avatars.py Changes: ===================================== gajim/common/modules/vcard_avatars.py ===================================== --- a/gajim/common/modules/vcard_avatars.py +++ b/gajim/common/modules/vcard_avatars.py @@ -62,7 +62,7 @@ class VCardAvatars: # Check if presence is from a MUC service contact = app.contacts.get_groupchat_contact(self._account, str(jid)) if contact is not None: - self._update_received(jid, avatar_sha) + self._update_received(jid, avatar_sha, room=True) elif stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER): show = stanza.getShow() type_ = stanza.getType() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9c6a8df65848c621dba17556cc70763755… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9c6a8df65848c621dba17556cc70763755… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix logging arguments
by Philipp Hörist 30 Jun '18

30 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3b147a8c by Philipp Hörist at 2018-06-30T19:41:03+02:00 Fix logging arguments - - - - - 1 changed file: - gajim/common/modules/vcard_temp.py Changes: ===================================== gajim/common/modules/vcard_temp.py ===================================== --- a/gajim/common/modules/vcard_temp.py +++ b/gajim/common/modules/vcard_temp.py @@ -122,7 +122,7 @@ class VCardTemp: photo.addChild('TYPE', payload='image/png') photo.addChild('BINVAL', payload=data) - log.info('Upload avatar: %s %s', room_jid) + log.info('Upload avatar: %s', room_jid) self._con.connection.SendAndCallForResponse( iq, self._upload_room_avatar_result) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3b147a8c7fca06fa1a3b87a92d7164a7e1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3b147a8c7fca06fa1a3b87a92d7164a7e1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor VCard code into own modules
by Philipp Hörist 30 Jun '18

30 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8b800f46 by Philipp Hörist at 2018-06-30T19:32:36+02:00 Refactor VCard code into own modules - - - - - 14 changed files: - gajim/common/app.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/const.py - gajim/common/helpers.py - + gajim/common/modules/vcard_avatars.py - + gajim/common/modules/vcard_temp.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/groupchat_control.py - gajim/profile_window.py - gajim/remote_control.py - gajim/vcard.py - test/lib/gajim_mocks.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -397,6 +397,9 @@ def account_is_connected(account): else: return False +def is_invisible(account): + return SHOW_LIST[connections[account].connected] == 'invisible' + def account_is_disconnected(account): return not account_is_connected(account) ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -71,6 +71,8 @@ from gajim.common.modules.annotations import Annotations from gajim.common.modules.roster_item_exchange import RosterItemExchange from gajim.common.modules.last_activity import LastActivity from gajim.common.modules.http_auth import HTTPAuth +from gajim.common.modules.vcard_temp import VCardTemp +from gajim.common.modules.vcard_avatars import VCardAvatars from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact from gajim.gtkgui_helpers import get_action @@ -666,6 +668,8 @@ class Connection(CommonConnection, ConnectionHandlers): self.register_module('RosterItemExchange', RosterItemExchange, self) self.register_module('LastActivity', LastActivity, self) self.register_module('HTTPAuth', HTTPAuth, self) + self.register_module('VCardTemp', VCardTemp, self) + self.register_module('VCardAvatars', VCardAvatars, self) app.ged.register_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) @@ -756,7 +760,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.connected = 0 self.time_to_reconnect = None self.privacy_rules_supported = False - self.avatar_presence_sent = False + self.get_module('VCardAvatars').avatar_advertised = False if on_purpose: self.sm = Smacks(self) if self.connection: @@ -1768,7 +1772,7 @@ class Connection(CommonConnection, ConnectionHandlers): show='invisible')) if initial: # ask our VCard - self.request_vcard(self._on_own_avatar_received) + self.get_module('VCardTemp').request_vcard() # Get bookmarks from private namespace self.get_bookmarks() ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -283,388 +283,6 @@ class ConnectionDisco: app.nec.push_incoming_event(AgentInfoReceivedEvent(None, conn=self, stanza=iq_obj)) -class ConnectionVcard: - def __init__(self): - self.own_vcard = None - self.room_jids = [] - self.avatar_presence_sent = False - self._requested_shas = {} - - app.ged.register_event_handler('presence-received', ged.GUI2, - self._vcard_presence_received) - app.ged.register_event_handler('gc-presence-received', ged.GUI2, - self._vcard_gc_presence_received) - app.ged.register_event_handler('room-avatar-received', ged.GUI2, - self._vcard_presence_received) - - def _vcard_presence_received(self, obj): - if obj.conn.name != self.name: - return - - if obj.avatar_sha is None: - # No Avatar is advertised - return - - room_avatar = False - if isinstance(obj, RoomAvatarReceivedEvent): - room_avatar = True - - if self.get_own_jid().bareMatch(obj.jid): - app.log('avatar').info('Update (vCard): %s %s', - obj.jid, obj.avatar_sha) - current_sha = app.config.get_per( - 'accounts', self.name, 'avatar_sha') - if obj.avatar_sha != current_sha: - app.log('avatar').info( - 'Request (vCard): %s', obj.jid) - self.request_vcard(self._on_own_avatar_received) - else: - app.log('avatar').info( - 'Avatar already known (vCard): %s %s', - obj.jid, obj.avatar_sha) - return - - if obj.avatar_sha == '': - # Empty <photo/> tag, means no avatar is advertised - app.log('avatar').info( - '%s has no avatar published (vCard)', obj.jid) - - # Remove avatar - app.log('avatar').debug('Remove: %s', obj.jid) - app.contacts.set_avatar(self.name, obj.jid, None) - own_jid = self.get_own_jid().getStripped() - if not room_avatar: - app.logger.set_avatar_sha(own_jid, obj.jid, None) - app.interface.update_avatar( - self.name, obj.jid, room_avatar=room_avatar) - else: - app.log('avatar').info( - 'Update (vCard): %s %s', obj.jid, obj.avatar_sha) - current_sha = app.contacts.get_avatar_sha(self.name, obj.jid) - - if obj.avatar_sha == current_sha: - app.log('avatar').info( - 'Avatar already known (vCard): %s %s', - obj.jid, obj.avatar_sha) - return - - if room_avatar: - # We dont save the room avatar hash in our DB, so check - # if we previously downloaded it - if app.interface.avatar_exists(obj.avatar_sha): - app.contacts.set_avatar(self.name, obj.jid, obj.avatar_sha) - app.interface.update_avatar( - self.name, obj.jid, room_avatar=room_avatar) - elif obj.jid not in self._requested_shas: - app.log('avatar').info( - 'Request (vCard): %s', obj.jid) - self._requested_shas[obj.jid] = obj.avatar_sha - self.request_vcard(self._on_room_avatar_received, obj.jid) - return - - if obj.jid not in self._requested_shas: - app.log('avatar').info( - 'Request (vCard): %s', obj.jid) - self._requested_shas[obj.jid] = obj.avatar_sha - self.request_vcard(self._on_avatar_received, obj.jid) - - - def _vcard_gc_presence_received(self, obj): - if obj.conn.name != self.name: - return - - server = app.get_server_from_jid(obj.room_jid) - if server.startswith('irc') or obj.avatar_sha is None: - return - - if obj.show == 'offline': - return - - gc_contact = app.contacts.get_gc_contact( - self.name, obj.room_jid, obj.nick) - - if gc_contact is None: - app.log('avatar').error('no gc contact found: %s', obj.nick) - return - - if obj.avatar_sha == '': - # Empty <photo/> tag, means no avatar is advertised, remove avatar - app.log('avatar').info( - '%s has no avatar published (vCard)', obj.nick) - app.log('avatar').debug('Remove: %s', obj.nick) - gc_contact.avatar_sha = None - app.interface.update_avatar(contact=gc_contact) - else: - app.log('avatar').info( - 'Update (vCard): %s %s', obj.nick, obj.avatar_sha) - path = os.path.join(configpaths.get('AVATAR'), obj.avatar_sha) - if not os.path.isfile(path): - if obj.fjid not in self._requested_shas: - app.log('avatar').info( - 'Request (vCard): %s', obj.nick) - self._requested_shas[obj.fjid] = obj.avatar_sha - obj.conn.request_vcard( - self._on_avatar_received, obj.fjid, room=True) - return - - if gc_contact.avatar_sha != obj.avatar_sha: - app.log('avatar').info( - '%s changed his Avatar (vCard): %s', - obj.nick, obj.avatar_sha) - gc_contact.avatar_sha = obj.avatar_sha - app.interface.update_avatar(contact=gc_contact) - else: - app.log('avatar').info( - 'Avatar already known (vCard): %s', obj.nick) - - def send_avatar_presence(self): - show = helpers.get_xmpp_show(app.SHOW_LIST[self.connected]) - p = nbxmpp.Presence(typ=None, priority=self.priority, - show=show, status=self.status) - p = self.add_sha(p) - self.connection.send(p) - app.interface.update_avatar(self.name, self.get_own_jid().getStripped()) - - def _node_to_dict(self, node): - dict_ = {} - for info in node.getChildren(): - name = info.getName() - if name in ('ADR', 'TEL', 'EMAIL'): # we can have several - dict_.setdefault(name, []) - entry = {} - for c in info.getChildren(): - entry[c.getName()] = c.getData() - dict_[name].append(entry) - elif info.getChildren() == []: - dict_[name] = info.getData() - else: - dict_[name] = {} - for c in info.getChildren(): - dict_[name][c.getName()] = c.getData() - return dict_ - - def request_vcard(self, callback, jid=None, room=False): - """ - Request the VCARD - """ - if not self.connection or self.connected < 2: - return - - if room: - room_jid = app.get_room_from_fjid(jid) - if room_jid not in self.room_jids: - self.room_jids.append(room_jid) - - iq = nbxmpp.Iq(typ='get') - if jid: - iq.setTo(jid) - iq.setQuery('vCard').setNamespace(nbxmpp.NS_VCARD) - - self.connection.SendAndCallForResponse( - iq, self._parse_vcard, {'callback': callback}) - - def send_vcard(self, vcard, sha): - if not self.connection or self.connected < 2: - return - iq = nbxmpp.Iq(typ='set') - iq2 = iq.setTag(nbxmpp.NS_VCARD + ' vCard') - for i in vcard: - if i == 'jid': - continue - if isinstance(vcard[i], dict): - iq3 = iq2.addChild(i) - for j in vcard[i]: - iq3.addChild(j).setData(vcard[i][j]) - elif isinstance(vcard[i], list): - for j in vcard[i]: - iq3 = iq2.addChild(i) - for k in j: - iq3.addChild(k).setData(j[k]) - else: - iq2.addChild(i).setData(vcard[i]) - - self.connection.SendAndCallForResponse( - iq, self._avatar_publish_result, {'sha': sha}) - - def upload_room_avatar(self, room_jid, data): - iq = nbxmpp.Iq(typ='set', to=room_jid) - vcard = iq.addChild('vCard', namespace=nbxmpp.NS_VCARD) - photo = vcard.addChild('PHOTO') - photo.addChild('TYPE', payload='image/png') - photo.addChild('BINVAL', payload=data) - - self.connection.SendAndCallForResponse( - iq, self._upload_room_avatar_result) - - def _upload_room_avatar_result(self, 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): - if stanza.getType() == 'result': - current_sha = app.config.get_per( - 'accounts', self.name, 'avatar_sha') - if (current_sha != sha and - app.SHOW_LIST[self.connected] != 'invisible'): - if not self.connection or self.connected < 2: - return - app.config.set_per( - 'accounts', self.name, 'avatar_sha', sha or '') - own_jid = self.get_own_jid().getStripped() - app.contacts.set_avatar(self.name, own_jid, sha) - self.send_avatar_presence() - app.log('avatar').info('%s: Published: %s', self.name, sha) - app.nec.push_incoming_event( - VcardPublishedEvent(None, conn=self)) - - elif stanza.getType() == 'error': - app.nec.push_incoming_event( - VcardNotPublishedEvent(None, conn=self)) - - def _get_vcard_photo(self, vcard, jid): - try: - photo = vcard['PHOTO']['BINVAL'] - except (KeyError, AttributeError, TypeError): - avatar_sha = None - photo_decoded = None - else: - if photo == '': - avatar_sha = None - photo_decoded = None - else: - try: - photo_decoded = base64.b64decode(photo.encode('utf-8')) - except binascii.Error as error: - app.log('avatar').warning('Invalid avatar for %s: %s', - jid, error) - return None, None - avatar_sha = hashlib.sha1(photo_decoded).hexdigest() - - return avatar_sha, photo_decoded - - def _parse_vcard(self, con, stanza, callback): - frm_jid = stanza.getFrom() - room = False - if frm_jid is None: - frm_jid = self.get_own_jid() - elif frm_jid.getStripped() in self.room_jids: - room = True - - resource = frm_jid.getResource() - jid = frm_jid.getStripped() - - stanza_error = stanza.getError() - if stanza_error in ('service-unavailable', 'item-not-found', - 'not-allowed'): - app.log('avatar').info('vCard not available: %s %s', - frm_jid, stanza_error) - callback(jid, resource, room, {}) - return - - vcard_node = stanza.getTag('vCard', namespace=nbxmpp.NS_VCARD) - if vcard_node is None: - app.log('avatar').info('vCard not available: %s', frm_jid) - app.log('avatar').debug(stanza) - return - vcard = self._node_to_dict(vcard_node) - - if self.get_own_jid().bareMatch(jid): - if 'NICKNAME' in vcard: - app.nicks[self.name] = vcard['NICKNAME'] - elif 'FN' in vcard: - app.nicks[self.name] = vcard['FN'] - - app.nec.push_incoming_event( - VcardReceivedEvent(None, conn=self, vcard_dict=vcard)) - - callback(jid, resource, room, vcard) - - def _on_own_avatar_received(self, jid, resource, room, vcard): - - avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid) - - app.log('avatar').info( - 'Received own (vCard): %s', avatar_sha) - - self.own_vcard = vcard - if avatar_sha is None: - app.log('avatar').info('No avatar found (vCard)') - app.config.set_per('accounts', self.name, 'avatar_sha', '') - self.send_avatar_presence() - return - - current_sha = app.config.get_per('accounts', self.name, 'avatar_sha') - if current_sha == avatar_sha: - path = os.path.join(configpaths.get('AVATAR'), current_sha) - if not os.path.isfile(path): - app.log('avatar').info( - 'Caching (vCard): %s', current_sha) - app.interface.save_avatar(photo_decoded) - if self.avatar_presence_sent: - app.log('avatar').debug('Avatar already advertised') - return - else: - app.interface.save_avatar(photo_decoded) - - app.config.set_per('accounts', self.name, 'avatar_sha', avatar_sha) - if app.SHOW_LIST[self.connected] == 'invisible': - app.log('avatar').info( - 'We are invisible, not publishing avatar') - return - - self.send_avatar_presence() - self.avatar_presence_sent = True - - def _on_room_avatar_received(self, jid, resource, room, vcard): - avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid) - expected_avatar_sha = self._requested_shas[jid] - if expected_avatar_sha != avatar_sha: - app.log('avatar').warning( - 'Avatar mismatch (vCard): %s %s', jid, avatar_sha) - return - - app.interface.save_avatar(photo_decoded) - self._requested_shas.pop(jid) - - app.log('avatar').info('Received (vCard): %s %s', jid, avatar_sha) - app.contacts.set_avatar(self.name, jid, avatar_sha) - app.interface.update_avatar(self.name, jid, room_avatar=True) - - def _on_avatar_received(self, jid, resource, room, vcard): - """ - Called when we receive a vCard Parse the vCard and trigger Events - """ - request_jid = jid - if room: - request_jid = '%s/%s' % (jid, resource) - - avatar_sha, photo_decoded = self._get_vcard_photo(vcard, request_jid) - expected_avatar_sha = self._requested_shas[request_jid] - if expected_avatar_sha != avatar_sha: - app.log('avatar').warning( - 'Avatar mismatch (vCard): %s %s', request_jid, avatar_sha) - return - - app.interface.save_avatar(photo_decoded) - self._requested_shas.pop(request_jid) - - # Received vCard from a contact - if room: - app.log('avatar').info( - 'Received (vCard): %s %s', resource, avatar_sha) - contact = app.contacts.get_gc_contact(self.name, jid, resource) - if contact is not None: - contact.avatar_sha = avatar_sha - app.interface.update_avatar(contact=contact) - else: - app.log('avatar').info('Received (vCard): %s %s', jid, avatar_sha) - own_jid = self.get_own_jid().getStripped() - app.logger.set_avatar_sha(own_jid, jid, avatar_sha) - app.contacts.set_avatar(self.name, jid, avatar_sha) - app.interface.update_avatar(self.name, jid) - class ConnectionPEP(object): @@ -1296,13 +914,12 @@ class ConnectionHandlersBase: return sess class ConnectionHandlers(ConnectionArchive313, -ConnectionVcard, ConnectionSocks5Bytestream, ConnectionDisco, +ConnectionSocks5Bytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub, ConnectionPEP, ConnectionCaps, ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream, ConnectionHTTPUpload): def __init__(self): ConnectionArchive313.__init__(self) - ConnectionVcard.__init__(self) ConnectionSocks5Bytestream.__init__(self) ConnectionIBBytestream.__init__(self) ConnectionCommands.__init__(self) @@ -1398,11 +1015,7 @@ ConnectionHTTPUpload): app.ged.remove_event_handler('blocking', ged.CORE, self._nec_blocking) def add_sha(self, p, send_caps=True): - c = p.setTag('x', namespace=nbxmpp.NS_VCARD_UPDATE) - sha = app.config.get_per('accounts', self.name, 'avatar_sha') - app.log('avatar').info( - '%s: Send avatar presence: %s', self.name, sha or 'empty') - c.setTagData('photo', sha) + p = self.get_module('VCardAvatars').add_update_node(p) if send_caps: return self._add_caps(p) return p @@ -1925,7 +1538,7 @@ ConnectionHTTPUpload): show=show)) if self.vcard_supported: # ask our VCard - self.request_vcard(self._on_own_avatar_received) + self.get_module('VCardTemp').request_vcard() # Get bookmarks from private namespace self.get_bookmarks() ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -550,16 +550,6 @@ PresenceHelperEvent): tim = helpers.datetime_tuple(time_str) self.idle_time = timegm(tim) - # Check if presence is from the room itself, used when the room - # sends a avatar hash - contact = app.contacts.get_groupchat_contact(self.conn.name, self.fjid) - if contact: - app.nec.push_incoming_event( - RoomAvatarReceivedEvent( - None, conn=self.conn, stanza=self.stanza, - contact=contact, jid=self.jid)) - return - xtags = self.stanza.getTags('x') for x in xtags: namespace = x.getNamespace() @@ -567,9 +557,6 @@ PresenceHelperEvent): self.is_gc = True elif namespace == nbxmpp.NS_SIGNED: sig_tag = x - elif namespace == nbxmpp.NS_VCARD_UPDATE: - self.avatar_sha = x.getTagData('photo') - self.contact_nickname = x.getTagData('nickname') elif namespace == nbxmpp.NS_DELAY and not self.timestamp: # XEP-0091 self._generate_timestamp(self.stanza.timestamp) @@ -1770,14 +1757,6 @@ class ConnectionTypeEvent(nec.NetworkIncomingEvent): name = 'connection-type' base_network_events = [] -class VcardPublishedEvent(nec.NetworkIncomingEvent): - name = 'vcard-published' - base_network_events = [] - -class VcardNotPublishedEvent(nec.NetworkIncomingEvent): - name = 'vcard-not-published' - base_network_events = [] - class StanzaReceivedEvent(nec.NetworkIncomingEvent): name = 'stanza-received' base_network_events = [] @@ -1967,13 +1946,6 @@ class NonAnonymousServerErrorEvent(nec.NetworkIncomingEvent): name = 'non-anonymous-server-error' base_network_events = [] -class VcardReceivedEvent(nec.NetworkIncomingEvent): - name = 'vcard-received' - base_network_events = [] - - def generate(self): - return True - class UpdateGCAvatarEvent(nec.NetworkIncomingEvent): name = 'update-gc-avatar' base_network_events = [] @@ -1995,19 +1967,6 @@ class UpdateRoomAvatarEvent(nec.NetworkIncomingEvent): def generate(self): return True -class RoomAvatarReceivedEvent(nec.NetworkIncomingEvent): - name = 'room-avatar-received' - base_network_events = [] - - def generate(self): - vcard = self.stanza.getTag('x', namespace=nbxmpp.NS_VCARD_UPDATE) - if vcard is None: - app.log('avatar').info( - '%s has no avatar published (vCard)', self.jid) - return - self.avatar_sha = vcard.getTagData('photo') - return True - class PEPConfigReceivedEvent(nec.NetworkIncomingEvent): name = 'pep-config-received' base_network_events = [] ===================================== gajim/common/const.py ===================================== --- a/gajim/common/const.py +++ b/gajim/common/const.py @@ -113,6 +113,12 @@ class IdleState(IntEnum): AWAY = 2 AWAKE = 3 +@unique +class RequestAvatar(IntEnum): + SELF = 0 + ROOM = 1 + USER = 2 + SSLError = { 2: _("Unable to get issuer certificate"), 3: _("Unable to get certificate CRL"), ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1398,15 +1398,7 @@ def get_subscription_request_msg(account=None): s = _('I would like to add you to my contact list.') if account: s = _('Hello, I am $name.') + ' ' + s - our_jid = app.get_jid_from_account(account) - vcard = app.connections[account].own_vcard - name = '' - if vcard: - if 'N' in vcard: - if 'GIVEN' in vcard['N'] and 'FAMILY' in vcard['N']: - name = vcard['N']['GIVEN'] + ' ' + vcard['N']['FAMILY'] - if not name and 'FN' in vcard: - name = vcard['FN'] + name = app.connections[account].get_module('VCardTemp').get_vard_name() nick = app.nicks[account] if name and nick: name += ' (%s)' % nick ===================================== gajim/common/modules/vcard_avatars.py ===================================== --- /dev/null +++ b/gajim/common/modules/vcard_avatars.py @@ -0,0 +1,192 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# XEP-0153: vCard-Based Avatars + +import os +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common import helpers +from gajim.common import configpaths +from gajim.common.const import RequestAvatar + +log = logging.getLogger('gajim.c.m.vcard.avatars') + + +class VCardAvatars: + def __init__(self, con): + self._con = con + self._account = con.name + self._requested_shas = [] + + self.handlers = [ + ('presence', self._presence_received, '', nbxmpp.NS_VCARD_UPDATE), + ] + + self.avatar_advertised = False + + def _presence_received(self, con, stanza): + update = stanza.getTag('x', namespace=nbxmpp.NS_VCARD_UPDATE) + if update is None: + return + + jid = stanza.getFrom() + + avatar_sha = update.getTagData('photo') + if avatar_sha is None: + log.info('%s is not ready to promote an avatar', jid) + # Empty update element, ignore + return + + if self._con.get_own_jid().bareMatch(jid): + if self._con.get_own_jid() == jid: + # Reflection of our own presence + return + self._self_update_received(jid, avatar_sha) + return + + # Check if presence is from a MUC service + contact = app.contacts.get_groupchat_contact(self._account, str(jid)) + if contact is not None: + self._update_received(jid, avatar_sha) + elif stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER): + show = stanza.getShow() + type_ = stanza.getType() + self._gc_update_received(jid, avatar_sha, show, type_) + else: + self._update_received(jid, avatar_sha) + + def _self_update_received(self, jid, avatar_sha): + jid = jid.getStripped() + full_jid = jid + if avatar_sha == '': + # Empty <photo/> tag, means no avatar is advertised + log.info('%s has no avatar published', full_jid) + return + + log.info('Update: %s %s', jid, avatar_sha) + current_sha = app.config.get_per( + 'accounts', self._account, 'avatar_sha') + + if avatar_sha != current_sha: + log.info('Request : %s', jid) + self._con.get_module('VCardTemp').request_vcard(RequestAvatar.SELF) + else: + log.info('Avatar already known: %s %s', + jid, avatar_sha) + + def _update_received(self, jid, avatar_sha, room=False): + jid = jid.getStripped() + full_jid = jid + if avatar_sha == '': + # Empty <photo/> tag, means no avatar is advertised + log.info('%s has no avatar published', full_jid) + + # Remove avatar + log.debug('Remove: %s', jid) + app.contacts.set_avatar(self._account, jid, None) + acc_jid = self._con.get_own_jid().getStripped() + if not room: + app.logger.set_avatar_sha(acc_jid, jid, None) + app.interface.update_avatar( + self._account, jid, room_avatar=room) + else: + log.info('Update: %s %s', full_jid, avatar_sha) + current_sha = app.contacts.get_avatar_sha(self._account, jid) + + if avatar_sha == current_sha: + log.info('Avatar already known: %s %s', jid, avatar_sha) + return + + if room: + # We dont save the room avatar hash in our DB, so check + # if we previously downloaded it + if app.interface.avatar_exists(avatar_sha): + app.contacts.set_avatar(self._account, jid, avatar_sha) + app.interface.update_avatar( + self._account, jid, room_avatar=room) + return + + if avatar_sha not in self._requested_shas: + self._requested_shas.append(avatar_sha) + if room: + self._con.get_module('VCardTemp').request_vcard( + RequestAvatar.ROOM, jid, sha=avatar_sha) + else: + self._con.get_module('VCardTemp').request_vcard( + RequestAvatar.USER, jid, sha=avatar_sha) + + def _gc_update_received(self, jid, avatar_sha, show, type_): + if show == 'offline' or type_ == 'unavailable': + return + + nick = jid.getResource() + + gc_contact = app.contacts.get_gc_contact( + self._account, jid.getStripped(), nick) + + if gc_contact is None: + log.error('no gc contact found: %s', nick) + return + + if avatar_sha == '': + # Empty <photo/> tag, means no avatar is advertised, remove avatar + log.info('%s has no avatar published', nick) + log.debug('Remove: %s', nick) + gc_contact.avatar_sha = None + app.interface.update_avatar(contact=gc_contact) + else: + log.info('Update: %s %s', nick, avatar_sha) + path = os.path.join(configpaths.get('AVATAR'), avatar_sha) + if not os.path.isfile(path): + if avatar_sha not in self._requested_shas: + app.log('avatar').info('Request: %s', nick) + self._requested_shas.append(avatar_sha) + self._con.get_module('VCardTemp').request_vcard( + RequestAvatar.USER, str(jid), + room=True, sha=avatar_sha) + return + + if gc_contact.avatar_sha != avatar_sha: + log.info('%s changed his Avatar: %s', nick, avatar_sha) + gc_contact.avatar_sha = avatar_sha + app.interface.update_avatar(contact=gc_contact) + else: + log.info('Avatar already known: %s', nick) + + def send_avatar_presence(self, force=False): + if self.avatar_advertised and not force: + log.debug('Avatar already advertised') + return + show = helpers.get_xmpp_show(app.SHOW_LIST[self._con.connected]) + pres = nbxmpp.Presence(typ=None, priority=self._con.priority, + show=show, status=self._con.status) + pres = self._con.add_sha(pres) + self._con.connection.send(pres) + self.avatar_advertised = True + app.interface.update_avatar(self._account, + self._con.get_own_jid().getStripped()) + + def add_update_node(self, node): + update = node.setTag('x', namespace=nbxmpp.NS_VCARD_UPDATE) + if self._con.get_module('VCardTemp').own_vcard_received: + sha = app.config.get_per('accounts', self._account, 'avatar_sha') + own_jid = self._con.get_own_jid() + log.info('Send avatar presence to: %s %s', + node.getTo() or own_jid, sha or 'no sha advertised') + update.setTagData('photo', sha) + return node ===================================== gajim/common/modules/vcard_temp.py ===================================== --- /dev/null +++ b/gajim/common/modules/vcard_temp.py @@ -0,0 +1,308 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# XEP-0054: vcard-temp + +import os +import hashlib +import binascii +import base64 +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common import configpaths +from gajim.common.const import RequestAvatar +from gajim.common.nec import NetworkIncomingEvent +from gajim.common.connection_handlers_events import InformationEvent + +log = logging.getLogger('gajim.c.m.vcard') + + +class VCardTemp: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [] + + self._own_vcard = None + self.own_vcard_received = False + self.room_jids = [] + + def _node_to_dict(self, node): + dict_ = {} + for info in node.getChildren(): + name = info.getName() + if name in ('ADR', 'TEL', 'EMAIL'): # we can have several + dict_.setdefault(name, []) + entry = {} + for c in info.getChildren(): + entry[c.getName()] = c.getData() + dict_[name].append(entry) + elif info.getChildren() == []: + dict_[name] = info.getData() + else: + dict_[name] = {} + for c in info.getChildren(): + dict_[name][c.getName()] = c.getData() + return dict_ + + def request_vcard(self, callback=RequestAvatar.SELF, jid=None, + room=False, sha=None): + if not app.account_is_connected(self._account): + return + + if isinstance(callback, RequestAvatar): + if callback == RequestAvatar.SELF: + callback = self._on_own_avatar_received + elif callback == RequestAvatar.ROOM: + callback = self._on_room_avatar_received + elif callback == RequestAvatar.USER: + callback = self._on_avatar_received + + if room: + room_jid = app.get_room_from_fjid(jid) + if room_jid not in self.room_jids: + self.room_jids.append(room_jid) + + iq = nbxmpp.Iq(typ='get') + if jid: + iq.setTo(jid) + iq.setQuery('vCard').setNamespace(nbxmpp.NS_VCARD) + + own_jid = self._con.get_own_jid().getStripped() + log.info('Request: %s, expected sha: %s', jid or own_jid, sha) + + self._con.connection.SendAndCallForResponse( + iq, self._parse_vcard, {'callback': callback, 'expected_sha': sha}) + + def send_vcard(self, vcard, sha): + if not app.account_is_connected(self._account): + return + + iq = nbxmpp.Iq(typ='set') + iq2 = iq.setTag(nbxmpp.NS_VCARD + ' vCard') + for i in vcard: + if i == 'jid': + continue + if isinstance(vcard[i], dict): + iq3 = iq2.addChild(i) + for j in vcard[i]: + iq3.addChild(j).setData(vcard[i][j]) + elif isinstance(vcard[i], list): + for j in vcard[i]: + iq3 = iq2.addChild(i) + for k in j: + iq3.addChild(k).setData(j[k]) + else: + iq2.addChild(i).setData(vcard[i]) + + log.info('Upload avatar: %s %s', self._account, sha) + + self._con.connection.SendAndCallForResponse( + iq, self._avatar_publish_result, {'sha': sha}) + + def upload_room_avatar(self, room_jid, data): + iq = nbxmpp.Iq(typ='set', to=room_jid) + vcard = iq.addChild('vCard', namespace=nbxmpp.NS_VCARD) + photo = vcard.addChild('PHOTO') + photo.addChild('TYPE', payload='image/png') + photo.addChild('BINVAL', payload=data) + + log.info('Upload avatar: %s %s', room_jid) + self._con.connection.SendAndCallForResponse( + iq, self._upload_room_avatar_result) + + def _upload_room_avatar_result(self, 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): + if stanza.getType() == 'result': + current_sha = app.config.get_per( + 'accounts', self._account, 'avatar_sha') + if (current_sha != sha and not app.is_invisible(self._account)): + if not app.account_is_connected(self._account): + return + app.config.set_per( + 'accounts', self._account, 'avatar_sha', sha or '') + own_jid = self._con.get_own_jid().getStripped() + app.contacts.set_avatar(self._account, own_jid, sha) + self._con.get_module('VCardAvatars').send_avatar_presence( + force=True) + log.info('%s: Published: %s', self._account, sha) + app.nec.push_incoming_event( + VcardPublishedEvent(None, conn=self._con)) + + elif stanza.getType() == 'error': + app.nec.push_incoming_event( + VcardNotPublishedEvent(None, conn=self._con)) + + def _get_vcard_photo(self, vcard, jid): + try: + photo = vcard['PHOTO']['BINVAL'] + except (KeyError, AttributeError, TypeError): + avatar_sha = None + photo_decoded = None + else: + if photo == '': + avatar_sha = None + photo_decoded = None + else: + try: + photo_decoded = base64.b64decode(photo.encode('utf-8')) + except binascii.Error as error: + log.warning('Invalid avatar for %s: %s', jid, error) + return None, None + avatar_sha = hashlib.sha1(photo_decoded).hexdigest() + + return avatar_sha, photo_decoded + + def _parse_vcard(self, con, stanza, callback, expected_sha): + frm_jid = stanza.getFrom() + room = False + if frm_jid is None: + frm_jid = self._con.get_own_jid() + elif frm_jid.getStripped() in self.room_jids: + room = True + + resource = frm_jid.getResource() + jid = frm_jid.getStripped() + + stanza_error = stanza.getError() + if stanza_error in ('service-unavailable', 'item-not-found', + 'not-allowed'): + log.info('vCard not available: %s %s', frm_jid, stanza_error) + callback(jid, resource, room, {}, expected_sha) + return + + vcard_node = stanza.getTag('vCard', namespace=nbxmpp.NS_VCARD) + if vcard_node is None: + log.info('vCard not available: %s', frm_jid) + log.debug(stanza) + return + vcard = self._node_to_dict(vcard_node) + + if self._con.get_own_jid().bareMatch(jid): + if 'NICKNAME' in vcard: + app.nicks[self._account] = vcard['NICKNAME'] + elif 'FN' in vcard: + app.nicks[self._account] = vcard['FN'] + + app.nec.push_incoming_event( + VcardReceivedEvent(None, conn=self._con, vcard_dict=vcard)) + + callback(jid, resource, room, vcard, expected_sha) + + def _on_own_avatar_received(self, jid, resource, room, vcard, *args): + avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid) + + log.info('Received own vcard, avatar sha is: %s', avatar_sha) + + self._own_vcard = vcard + self.own_vcard_received = True + if avatar_sha is None: + log.info('No avatar found') + app.config.set_per('accounts', self._account, 'avatar_sha', '') + self._con.get_module('VCardAvatars').send_avatar_presence(force=True) + return + + current_sha = app.config.get_per('accounts', self._account, 'avatar_sha') + if current_sha == avatar_sha: + path = os.path.join(configpaths.get('AVATAR'), current_sha) + if not os.path.isfile(path): + log.info('Caching: %s', current_sha) + app.interface.save_avatar(photo_decoded) + self._con.get_module('VCardAvatars').send_avatar_presence() + else: + app.interface.save_avatar(photo_decoded) + + app.config.set_per('accounts', self._account, 'avatar_sha', avatar_sha) + if app.is_invisible(self._account): + log.info('We are invisible, not advertising avatar') + return + + self._con.get_module('VCardAvatars').send_avatar_presence(force=True) + + def _on_room_avatar_received(self, jid, resource, room, vcard, + expected_sha): + avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid) + if expected_sha != avatar_sha: + log.warning('Avatar mismatch: %s %s', jid, avatar_sha) + return + + app.interface.save_avatar(photo_decoded) + + log.info('Received: %s %s', jid, avatar_sha) + app.contacts.set_avatar(self._account, jid, avatar_sha) + app.interface.update_avatar(self._account, jid, room_avatar=True) + + def _on_avatar_received(self, jid, resource, room, vcard, expected_sha): + request_jid = jid + if room: + request_jid = '%s/%s' % (jid, resource) + + avatar_sha, photo_decoded = self._get_vcard_photo(vcard, request_jid) + if expected_sha != avatar_sha: + log.warning('Received: avatar mismatch: %s %s', + request_jid, avatar_sha) + return + + app.interface.save_avatar(photo_decoded) + + # Received vCard from a contact + if room: + log.info('Received: %s %s', resource, avatar_sha) + contact = app.contacts.get_gc_contact(self._account, jid, resource) + if contact is not None: + contact.avatar_sha = avatar_sha + app.interface.update_avatar(contact=contact) + else: + log.info('Received: %s %s', jid, avatar_sha) + own_jid = self._con.get_own_jid().getStripped() + app.logger.set_avatar_sha(own_jid, jid, avatar_sha) + app.contacts.set_avatar(self._account, jid, avatar_sha) + app.interface.update_avatar(self._account, jid) + + def get_vard_name(self): + name = '' + vcard = self._own_vcard + if not vcard: + return name + + if 'N' in vcard: + if 'GIVEN' in vcard['N'] and 'FAMILY' in vcard['N']: + name = vcard['N']['GIVEN'] + ' ' + vcard['N']['FAMILY'] + if not name and 'FN' in vcard: + name = vcard['FN'] + return name + + +class VcardPublishedEvent(NetworkIncomingEvent): + name = 'vcard-published' + base_network_events = [] + + +class VcardNotPublishedEvent(NetworkIncomingEvent): + name = 'vcard-not-published' + base_network_events = [] + + +class VcardReceivedEvent(NetworkIncomingEvent): + name = 'vcard-received' + base_network_events = [] ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_handlers_zeroconf.py +++ b/gajim/common/zeroconf/connection_handlers_zeroconf.py @@ -40,19 +40,13 @@ AGENT_REMOVED = 'agent_removed' from gajim.common import connection_handlers -class ConnectionVcard(connection_handlers.ConnectionVcard): +class ConnectionVcard: def add_sha(self, p, *args): return p def add_caps(self, p): return p - def request_vcard(self, *args): - pass - - def send_vcard(self, *args): - pass - class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionSocks5BytestreamZeroconf, ConnectionCommands, ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -762,8 +762,8 @@ class GroupchatControl(ChatControlBase): publish = app.interface.get_avatar(sha, publish=True) avatar = base64.b64encode(publish).decode('utf-8') - - app.connections[self.account].upload_room_avatar( + con = app.connections[self.account] + con.get_module('VCardTemp').upload_room_avatar( self.room_jid, avatar) AvatarChooserDialog(_on_accept, ===================================== gajim/profile_window.py ===================================== --- a/gajim/profile_window.py +++ b/gajim/profile_window.py @@ -77,7 +77,7 @@ class ProfileWindow: self._nec_vcard_not_published) self.window.show_all() self.xml.get_object('ok_button').grab_focus() - app.connections[account].request_vcard( + app.connections[account].get_module('VCardTemp').request_vcard( self._nec_vcard_received, self.jid) def on_information_notebook_switch_page(self, widget, page, page_num): @@ -261,7 +261,7 @@ class ProfileWindow: self.progressbar.set_fraction(0) self.update_progressbar_timeout_id = None - def _nec_vcard_received(self, jid, resource, room, vcard_): + def _nec_vcard_received(self, jid, resource, room, vcard_, *args): self.set_values(vcard_) def add_to_vcard(self, vcard_, entry, txt): @@ -339,7 +339,8 @@ class ProfileWindow: app.connections[self.account].retract_nickname() nick = app.config.get_per('accounts', self.account, 'name') app.nicks[self.account] = nick - app.connections[self.account].send_vcard(vcard_, sha) + app.connections[self.account].get_module('VCardTemp').send_vcard( + vcard_, sha) self.message_id = self.statusbar.push(self.context_id, _('Sending profile…')) self.progressbar.show() ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -840,10 +840,12 @@ class SignalObject(dbus.service.Object): if avatar_mime_type: vcard['PHOTO']['TYPE'] = avatar_mime_type if account: - app.connections[account].send_vcard(vcard, sha) + app.connections[account].get_module('VCardTemp').send_vcard( + vcard, sha) else: for acc in app.connections: - app.connections[acc].send_vcard(vcard, sha) + app.connections[acc].get_module('VCardTemp').send_vcard( + vcard, sha) @dbus.service.method(INTERFACE, in_signature='ssss', out_signature='') def join_room(self, room_jid, nick, password, account): ===================================== gajim/vcard.py ===================================== --- a/gajim/vcard.py +++ b/gajim/vcard.py @@ -268,7 +268,7 @@ class VcardWindow: widget.set_text('') self.xml.get_object('DESC_textview').get_buffer().set_text('') - def _nec_vcard_received(self, jid, resource, room, vcard): + def _nec_vcard_received(self, jid, resource, room, vcard, *args): self.clear_values() self._set_values(vcard, jid) @@ -477,10 +477,13 @@ class VcardWindow: self.fill_status_label() if self.gc_contact: - con.request_vcard(self._nec_vcard_received, - self.gc_contact.get_full_jid(), room=True) + con.get_module('VCardTemp').request_vcard( + self._nec_vcard_received, + self.gc_contact.get_full_jid(), + room=True) else: - con.request_vcard(self._nec_vcard_received, self.contact.jid) + con.get_module('VCardTemp').request_vcard( + self._nec_vcard_received, self.contact.jid) def on_close_button_clicked(self, widget): self.window.destroy() ===================================== test/lib/gajim_mocks.py ===================================== --- a/test/lib/gajim_mocks.py +++ b/test/lib/gajim_mocks.py @@ -47,9 +47,6 @@ class MockConnection(Mock, ConnectionHandlers): app.connections[account] = self - def request_vcard(self, *args): - pass - class MockWindow(Mock): def __init__(self, *args): Mock.__init__(self, *args) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8b800f46464571f00dae498da406e5fb8f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8b800f46464571f00dae498da406e5fb8f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused method
by Philipp Hörist 30 Jun '18

30 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 71a82b5c by Philipp Hörist at 2018-06-30T13:11:27+02:00 Remove unused method - - - - - 1 changed file: - gajim/config.py Changes: ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -2340,10 +2340,6 @@ class AccountCreationWizardWindow: self._nec_acc_is_not_ok) del app.interface.instances['account_creation_wizard'] - def on_register_server_features_button_clicked(self, widget): - helpers.launch_browser_mailer('url', - 'http://www.jabber.org/network/oldnetwork.shtml') - def on_save_password_checkbutton_toggled(self, widget): self.xml.get_object('password_entry').grab_focus() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/71a82b5c3e7de0ef144497113d947605df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/71a82b5c3e7de0ef144497113d947605df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Call notify check methods with JID arg
by Philipp Hörist 30 Jun '18

30 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5bc9822c by Philipp Hörist at 2018-06-30T11:02:30+02:00 Call notify check methods with JID arg For subscription requests we dont have a contact obj - - - - - 4 changed files: - gajim/chat_control_base.py - gajim/notify.py - gajim/session.py - test/lib/notify.py Changes: ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -1022,9 +1022,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): event_type = events.PrintedPmEvent event = 'message_received' show_in_roster = notify.get_show_in_roster(event, - self.account, self.contact, self.session) + self.account, self.contact.jid, self.session) show_in_systray = notify.get_show_in_systray(event, - self.account, self.contact, event_type.type_) + self.account, self.contact.jid, event_type.type_) event = event_type(text, subject, self, msg_log_id, show_in_roster=show_in_roster, ===================================== gajim/notify.py ===================================== --- a/gajim/notify.py +++ b/gajim/notify.py @@ -38,7 +38,7 @@ from gajim.common import helpers from gajim.common import ged -def get_show_in_roster(event, account, contact, session=None): +def get_show_in_roster(event, account, jid, session=None): """ Return True if this event must be shown in roster, else False """ @@ -50,14 +50,14 @@ def get_show_in_roster(event, account, contact, session=None): return True -def get_show_in_systray(event, account, contact, type_=None): +def get_show_in_systray(event, account, jid, type_=None): """ Return True if this event must be shown in systray, else False """ notify = app.config.get('notify_on_all_muc_messages') notify_for_jid = app.config.get_per( - 'rooms', contact.jid, 'notify_on_all_messages') + 'rooms', jid, 'notify_on_all_messages') if type_ == 'printed_gc_msg' and not notify and not notify_for_jid: # it's not an highlighted message, don't show in systray ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -280,9 +280,9 @@ class ChatControlSession(object): else: # Everything else obj.show_in_roster = notify.get_show_in_roster(event_type, - self.conn.name, contact, self) + self.conn.name, contact.jid, self) obj.show_in_systray = notify.get_show_in_systray(event_type, - self.conn.name, contact) + self.conn.name, contact.jid) if obj.mtype == 'normal' and obj.popup: do_event = False else: @@ -388,9 +388,9 @@ class ChatControlSession(object): event_type = 'single_message_received' show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, - contact, self) + contact.jid, self) show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, - contact) + contact.jid) event = event_t(msg, subject, msg_type, tim, encrypted, resource, msg_log_id, xhtml=xhtml, session=self, form_node=form_node, ===================================== test/lib/notify.py ===================================== --- a/test/lib/notify.py +++ b/test/lib/notify.py @@ -27,8 +27,8 @@ def notify(event, jid, account, parameters, advanced_notif_num = None): def get_advanced_notification(event, account, contact): return None -def get_show_in_roster(event, account, contact, session = None): +def get_show_in_roster(event, account, jid, session=None): return True -def get_show_in_systray(event, account, contact, type_ = None): +def get_show_in_systray(event, account, jid, type_=None): return True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5bc9822ceccdcaf5b67a21ebd0be6f1a71… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5bc9822ceccdcaf5b67a21ebd0be6f1a71… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Spellcheck
by Philipp Hörist 28 Jun '18

28 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7fa4c9e1 by Alexander Krotov at 2018-06-28T23:37:34+02:00 Spellcheck - - - - - 24 changed files: - gajim/adhoc_commands.py - gajim/advanced_configuration_window.py - gajim/chat_control.py - gajim/common/caps_cache.py - gajim/common/contacts.py - gajim/config.py - gajim/conversation_textview.py - gajim/dataforms_widget.py - gajim/dev/ipython_view.py - gajim/dialog_messages.py - gajim/disco.py - gajim/filetransfers_window.py - gajim/gajim_remote.py - gajim/gajim_themes_window.py - gajim/groupchat_control.py - gajim/gui_interface.py - gajim/history_sync.py - gajim/history_window.py - gajim/htmltextview.py - gajim/logind_listener.py - gajim/message_control.py - gajim/message_window.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== gajim/adhoc_commands.py ===================================== --- a/gajim/adhoc_commands.py +++ b/gajim/adhoc_commands.py @@ -478,7 +478,7 @@ class CommandWindow: def on_check_commands_2_button_clicked(self, widget): self.stage1() -# stage 5: an error has occured +# stage 5: an error has occurred def stage5(self, error=None, errorid=None, senderror=False): """ Display the error message. Wait for user to close the window ===================================== gajim/advanced_configuration_window.py ===================================== --- a/gajim/advanced_configuration_window.py +++ b/gajim/advanced_configuration_window.py @@ -134,7 +134,7 @@ class AdvancedConfigurationWindow(object): def cb_value_column_data(self, col, cell, model, iter_, data): """ - Check if it's boolen or holds password stuff and if yes make the + Check if it's boolean or holds password stuff and if yes make the cellrenderertext not editable, else - it's editable """ optname = model[iter_][Column.PREFERENCE_NAME] ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -929,9 +929,9 @@ class ChatControl(ChatControlBase): status and error is mainly that with error, msg count as a new message (in systray and in control). If frm is set to info: it's a information message. - If frm is set to print_queue: it is incomming from queue. + If frm is set to print_queue: it is incoming from queue. If frm is set to another value: it's an outgoing message. - If frm is not set: it's an incomming message. + If frm is not set: it's an incoming message. """ contact = self.contact ===================================== gajim/common/caps_cache.py ===================================== --- a/gajim/common/caps_cache.py +++ b/gajim/common/caps_cache.py @@ -171,7 +171,7 @@ class AbstractClientCaps(object): def _discover(self, connection, jid): """ - To be implemented by subclassess + To be implemented by subclasses """ raise NotImplementedError @@ -180,7 +180,7 @@ class AbstractClientCaps(object): def _lookup_in_cache(self, caps_cache): """ - To be implemented by subclassess + To be implemented by subclasses """ raise NotImplementedError @@ -189,7 +189,7 @@ class AbstractClientCaps(object): def _is_hash_valid(self, identities, features, dataforms): """ - To be implemented by subclassess + To be implemented by subclasses """ raise NotImplementedError @@ -217,7 +217,7 @@ class ClientCaps(AbstractClientCaps): class OldClientCaps(AbstractClientCaps): """ - Old XEP-115 implemtation. Kept around for background competability + Old XEP-115 implementation. Kept around for background compatibility """ def __init__(self, caps_hash, node): AbstractClientCaps.__init__(self, caps_hash, node) @@ -453,7 +453,7 @@ class MucCapsCache: data.append(dataforms.ExtendForm(node=child)) if nbxmpp.NS_MUC not in features: - # Not a MUC, dont cache info + # Not a MUC, don't cache info return self.cache[jid] = self.DiscoInfo(identities, features, data) ===================================== gajim/common/contacts.py ===================================== --- a/gajim/common/contacts.py +++ b/gajim/common/contacts.py @@ -475,7 +475,7 @@ class Contacts(): contacts = self._contacts[contact.jid] # We had only one that was offline, remove it if len(contacts) == 1 and contacts[0].show == 'offline': - # Do not use self.remove_contact: it deteles + # Do not use self.remove_contact: it deletes # self._contacts[account][contact.jid] contacts.remove(contacts[0]) # If same JID with same resource already exists, use the new one @@ -868,7 +868,7 @@ class MetacontactManager(): def _get_metacontacts_big_brother(self, family): """ - Which of the family will be the big brother under wich all others will be + Which of the family will be the big brother under which all others will be ? """ return max(family, key=self._metacontact_key) ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -531,7 +531,7 @@ class PreferencesWindow: returns "mixed" """ if len(app.connections) == 0: - # a non existant key return default value + # a non existent key return default value return app.config.get_per('accounts', '__default__', opt) val = None for account in app.connections: @@ -2025,7 +2025,7 @@ class ManageBookmarksWindow: def check_valid_bookmark(self): """ - Check if all neccessary fields are entered correctly + Check if all necessary fields are entered correctly """ (model, iter_) = self.selection.get_selected() ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -184,7 +184,7 @@ class ConversationTextview(GObject.GObject): # no need to inherit TextView, use it as atrribute is safer self.tv = HtmlTextView() # we have to override HtmlTextView Event handlers - # because we dont inherit + # because we don't inherit self.tv.hyperlink_handler = self.hyperlink_handler self.tv.connect_tooltip(self.query_tooltip) @@ -391,7 +391,7 @@ class ConversationTextview(GObject.GObject): allowed = False if not allowed: - log.debug('Message correctiong not allowed') + log.debug('Message correction not allowed') return None end_mark, index = self.get_end_mark(correct_id, start_mark) @@ -619,9 +619,9 @@ class ConversationTextview(GObject.GObject): self.emit('quote', self.selected_phrase) def on_textview_button_press_event(self, widget, event): - # If we clicked on a taged text do NOT open the standard popup menu + # If we clicked on a tagged text do NOT open the standard popup menu # if normal text check if we have sth selected - self.selected_phrase = '' # do not move belove event button check! + self.selected_phrase = '' # do not move below event button check! if event.button != 3: # if not right click return False @@ -744,7 +744,7 @@ class ConversationTextview(GObject.GObject): def hyperlink_handler(self, texttag, widget, event, iter_, kind): if event.type == Gdk.EventType.BUTTON_PRESS: begin_iter = iter_.copy() - # we get the begining of the tag + # we get the beginning of the tag while not begin_iter.begins_tag(texttag): begin_iter.backward_char() end_iter = iter_.copy() ===================================== gajim/dataforms_widget.py ===================================== --- a/gajim/dataforms_widget.py +++ b/gajim/dataforms_widget.py @@ -20,7 +20,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -''' This module contains widget that can display data form (JEP-0004). +''' This module contains widget that can display data form (XEP-0004). Words single and multiple refers here to types of data forms: single means these with one record of data (without <reported/> element), multiple - these which may contain more data (with <reported/> element).''' ===================================== gajim/dev/ipython_view.py ===================================== --- a/gajim/dev/ipython_view.py +++ b/gajim/dev/ipython_view.py @@ -303,7 +303,7 @@ class IterableIPShell: def complete(self, line): """ - Returns an auto completed line and/or posibilities for completion + Returns an auto completed line and/or possibilities for completion @param line: Given line so far. @type line: string @@ -537,10 +537,10 @@ class ConsoleView(Gtk.TextView): def onKeyPress(self, widget, event): """ Key press callback used for correcting behavior for console-like - interfaces. For example 'home' should go to prompt, not to begining of + interfaces. For example 'home' should go to prompt, not to beginning of line - @param widget: Widget that key press accored in. + @param widget: Widget that key press occurred in. @type widget: Gtk.Widget @param event: Event object @type event: Gdk.Event @@ -617,7 +617,7 @@ class IPythonView(ConsoleView, IterableIPShell): """ Custom raw_input() replacement. Get's current line from console buffer - @param prompt: Prompt to print. Here for compatability as replacement. + @param prompt: Prompt to print. Here for compatibility as replacement. @type prompt: string @return: The current command line text. @@ -633,7 +633,7 @@ class IPythonView(ConsoleView, IterableIPShell): Key press callback with plenty of shell goodness, like history, autocompletions, etc - @param widget: Widget that key press occured in. + @param widget: Widget that key press occurred in. @type widget: Gtk.Widget @param event: Event object. @type event: Gdk.Event ===================================== gajim/dialog_messages.py ===================================== --- a/gajim/dialog_messages.py +++ b/gajim/dialog_messages.py @@ -170,7 +170,7 @@ messages = { 'httpupload-encryption-not-available': Message( _('Encryption Error'), - _('For the choosen encryption there is no encryption method available'), + _('For the chosen encryption there is no encryption method available'), ErrorDialog), 'avatar-upload-error': Message( ===================================== gajim/disco.py ===================================== --- a/gajim/disco.py +++ b/gajim/disco.py @@ -362,7 +362,7 @@ class ServicesCache: # NS_BROWSE is deprecated, but we check for it anyways. # Some services list it in features and respond to # NS_DISCO_ITEMS anyways. - # Allow browsing for unknown types aswell. + # Allow browsing for unknown types as well. if (not features and not identities) or \ nbxmpp.NS_DISCO_ITEMS in features or nbxmpp.NS_BROWSE in features: return ToplevelAgentBrowser @@ -1217,7 +1217,7 @@ class ToplevelAgentBrowser(AgentBrowser): # fetching or error cell.set_property('foreground_set', True) else: - # Normal/succes + # Normal/success cell.set_property('foreground_set', False) else: theme = app.config.get('roster_theme') ===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -898,13 +898,13 @@ class FileTransfersWindow: def on_file_transfers_dialog_delete_event(self, widget, event): self.window.hide() - return True # do NOT destory window + return True # do NOT destroy window def on_close_button_clicked(self, widget): self.window.hide() def show_context_menu(self, event, iter_): - # change the sensitive propery of the buttons and menuitems + # change the sensitive property of the buttons and menuitems if iter_: path = self.model.get_path(iter_) self.set_buttons_sensitive(path, True) ===================================== gajim/gajim_remote.py ===================================== --- a/gajim/gajim_remote.py +++ b/gajim/gajim_remote.py @@ -333,7 +333,7 @@ class GajimRemote: def init_connection(self): """ - Create the onnection to the session dbus, or exit if it is not possible + Create the connection to the session dbus, or exit if it is not possible """ try: self.sbus = dbus.SessionBus() @@ -397,7 +397,7 @@ class GajimRemote: def print_info(self, level, prop_dict, encode_return = False): """ - Return formated string from data structure + Return formatted string from data structure """ if prop_dict is None or not isinstance(prop_dict, (dict, list, tuple)): return '' ===================================== gajim/gajim_themes_window.py ===================================== --- a/gajim/gajim_themes_window.py +++ b/gajim/gajim_themes_window.py @@ -217,7 +217,7 @@ class GajimThemesWindow: self.background_checkbutton.set_active(state) self.background_colorbutton.set_sensitive(state) - # get the font name before we set widgets and it will not be overriden + # get the font name before we set widgets and it will not be overridden font_name = app.config.get_per('themes', theme, option + 'font') font_attrs = app.config.get_per('themes', theme, option + 'fontattrs') self._set_font_widgets(font_attrs) ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -836,7 +836,7 @@ class GroupchatControl(ChatControlBase): if rend[0] not in ('avatar', 'icon'): col.add_attribute(rend[1], rend[3], rend[4]) col.set_cell_data_func(rend[1], rend[5], rend[6]) - # set renderers propertys + # set renderers properties for renderer in self.renderers_propertys.keys(): renderer.set_property(self.renderers_propertys[renderer][0], self.renderers_propertys[renderer][1]) ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -824,7 +824,7 @@ class Interface: def handle_event_bookmarks(self, obj): # ('BOOKMARKS', account, [{name,jid,autojoin,password,nick}, {}]) # We received a bookmark item from the server (JEP48) - # Auto join GC windows if neccessary + # Auto join GC windows if necessary gui_menu_builder.build_bookmark_menu(obj.conn.name) invisible_show = app.SHOW_LIST.index('invisible') @@ -1204,7 +1204,7 @@ class Interface: proposed_resource = conn.server_resource if proposed_resource.startswith('gajim.'): - # Dont notify the user about resource change if he didnt set + # Dont notify the user about resource change if he didn't set # a custom resource on_ok('gajim.$rand') return ===================================== gajim/history_sync.py ===================================== --- a/gajim/history_sync.py +++ b/gajim/history_sync.py @@ -287,7 +287,7 @@ class SummaryPage(Gtk.Box): def finished(self): received = self.assistant.download_history.received finished = _(''' - Finshed synchronising your History. + Finished synchronising your History. {received} Messages downloaded. '''.format(received=received)) self.label.set_text(finished) ===================================== gajim/history_window.py ===================================== --- a/gajim/history_window.py +++ b/gajim/history_window.py @@ -196,7 +196,7 @@ class HistoryWindow: info_completion = info_name info_jid = contact.jid else: - # Corrensponding account is offline, we know nothing + # Corresponding account is offline, we know nothing info_name = completed.split('@')[0] info_completion = completed info_jid = completed ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -184,9 +184,9 @@ LIST_ELEMS = set( 'dl, ol, ul'.split(', ')) for name in BLOCK_HEAD: num = eval(name[1]) header_size = (num-1) // 2 - weigth = (num - 1) % 2 + weight = (num - 1) % 2 element_styles[name] = '; font-size: %s; %s' % ( ('large', 'medium', 'small')[header_size], - ('font-weight: bold', 'font-style: oblique')[weigth],) + ('font-weight: bold', 'font-style: oblique')[weight],) def _parse_css_color(color): if color.startswith('rgb(') and color.endswith(')'): @@ -970,7 +970,7 @@ class HtmlTextView(Gtk.TextView): def hyperlink_handler(self, texttag, widget, event, iter_, kind): if event.type == Gdk.EventType.BUTTON_PRESS: begin_iter = iter_.copy() - # we get the begining of the tag + # we get the beginning of the tag while not begin_iter.begins_tag(texttag): begin_iter.backward_char() end_iter = iter_.copy() @@ -1084,7 +1084,7 @@ if __name__ == '__main__': from gajim.conversation_textview import ConversationTextview from gajim.gui_interface import Interface from gajim.common import app, logger, caps_cache - # TODO: dont call Logger() it will create the DB + # TODO: don't call Logger() it will create the DB # maybe mock this object for tests # app.logger = logger.Logger() # caps_cache.initialize(app.logger) ===================================== gajim/logind_listener.py ===================================== --- a/gajim/logind_listener.py +++ b/gajim/logind_listener.py @@ -67,7 +67,7 @@ def signal_received(connection, sender_name, object_path, # something is wrong, the system is suspending but we don't have # a lock file log.warning("System suspend detected, but we don't seem to be holding " - "a file descriptor for sleep inihibitor") + "a file descriptor for sleep inhibitor") def get_inhibitor(connection): @@ -76,7 +76,7 @@ def get_inhibitor(connection): global fd if fd is not None: - # someting is wrong, we haven't closed the previous file descriptor + # something is wrong, we haven't closed the previous file descriptor # and we ask for yet another one log.warning('We are about to ask for a sleep inhibitor, but we seem ' 'to be holding one already') ===================================== gajim/message_control.py ===================================== --- a/gajim/message_control.py +++ b/gajim/message_control.py @@ -94,7 +94,7 @@ class MessageControl(object): def safe_shutdown(self): """ - Called to check if control can be closed without loosing data. + Called to check if control can be closed without losing data. returns True if control can be closed safely else False Derived classes MAY implement this. ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -71,7 +71,7 @@ class MessageWindow(object): # If None, the window is not tied to any specific type self.type_ = type_ # dict { handler id: widget}. Keeps callbacks, which - # lead to cylcular references + # lead to circular references self.handlers = {} # Don't show warning dialogs when we want to delete the window self.dont_warn_on_delete = False @@ -398,7 +398,7 @@ class MessageWindow(object): self.remove_tab(control, self.CLOSE_CTRL_KEY) return True elif keyval == Gdk.KEY_w: # CTRL + w - # CTRL + w removes latest word before sursor when User uses emacs + # CTRL + w removes latest word before cursor when User uses emacs # theme if not Gtk.Settings.get_default().get_property( 'gtk-key-theme-name') == 'Emacs': ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -506,7 +506,7 @@ class SignalObject(dbus.service.Object): elif first_connected_acct is None: first_connected_acct = acct - # if jid is not a conntact, open-chat with first connected account + # if jid is not a contact, open-chat with first connected account if connected_account is None and first_connected_acct: connected_account = first_connected_acct ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -553,7 +553,7 @@ class RosterWindow: family, account)[0] # Family might has changed (actual big brother not on top). - # Remove childs first then big brother + # Remove children first then big brother family_in_roster = False for data in nearby_family: _account = data['account'] @@ -786,7 +786,7 @@ class RosterWindow: # Remove contact before redrawing, otherwise the old # numbers will still be show if not maximize: - # Dont remove contact when we maximize a room + # Don't remove contact when we maximize a room app.contacts.remove_jid(account, jid, remove_meta=True) if iters: rest_of_family = [data for data in family @@ -1006,10 +1006,10 @@ class RosterWindow: app.to_be_removed[account].remove(jid) family = app.contacts.get_metacontacts_family(account, jid) if family: - # Peform delayed recalibration + # Perform delayed recalibration self._recalibrate_metacontact_family(family, account) self.draw_contact(jid, account) - # Hide Group if all childs are hidden + # Hide Group if all children are hidden contact = app.contacts.get_contact(account, jid) if not contact: return @@ -1242,7 +1242,7 @@ class RosterWindow: status = helpers.reduce_chars_newlines(status, max_lines = 1) # escape markup entities and make them small - # italic and fg color color is calcuted to be + # italic and fg color color is calculated to be # always readable color = gtkgui_helpers.get_fade_color(self.tree, selected, focus) @@ -1811,7 +1811,7 @@ class RosterWindow: ################################################################################ ### FIXME: Methods that don't belong to roster window... -### ... atleast not in there current form +### ... at least not in there current form ################################################################################ def fire_up_unread_messages_events(self, account): @@ -1846,7 +1846,7 @@ class RosterWindow: """ Fill app.contacts and app.groups """ - # FIXME: This function needs to be splitted + # FIXME: This function needs to be split # Most of the logic SHOULD NOT be done at GUI level if account not in app.contacts.get_accounts(): app.contacts.add_account(account) @@ -3004,7 +3004,7 @@ class RosterWindow: def on_disconnect(self, widget, jid, account): """ - When disconnect menuitem is activated: disconect from room + When disconnect menuitem is activated: disconnect from room """ if jid in app.interface.minimized_controls[account]: ctrl = app.interface.minimized_controls[account][jid] @@ -4165,7 +4165,7 @@ class RosterWindow: # We have got little brothers. Readd them all self._remove_metacontact_family(old_family, account_source) else: - # We are only a litle brother. Simply remove us from our big + # We are only a little brother. Simply remove us from our big # brother if self._get_contact_iter(c_source.jid, account_source): # When we have been in the group before. @@ -4294,7 +4294,7 @@ class RosterWindow: return data = selection.get_data().decode() if not data: - return # prevents tb when several entrys are dragged + return # prevents tb when several entries are dragged model = treeview.get_model() path_dest, position = drop_info @@ -5419,7 +5419,7 @@ class RosterWindow: def add_history_manager_menuitem(self, menu): """ - Add a seperator and History Manager menuitem BELOW for account menuitems + Add a separator and History Manager menuitem BELOW for account menuitems """ item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) @@ -5518,7 +5518,7 @@ class RosterWindow: if rend[0] != 'avatar': col.add_attribute(rend[1], rend[3], rend[4]) col.set_cell_data_func(rend[1], rend[5], rend[6]) - # set renderers propertys + # set renderers properties for renderer in self.renderers_propertys.keys(): renderer.set_property(self.renderers_propertys[renderer][0], self.renderers_propertys[renderer][1]) @@ -5660,7 +5660,7 @@ class RosterWindow: # no need of this variable self.have_new_chat_accel = False # Is the "Ctrl+N" shown ? self.regroup = app.config.get('mergeaccounts') - self.clicked_path = None # Used remember on wich row we clicked + self.clicked_path = None # Used remember on which row we clicked if len(app.connections) < 2: # Do not merge accounts if only one exists self.regroup = False @@ -5805,7 +5805,7 @@ class RosterWindow: self.tree.set_tooltip_window(tooltips.RosterTooltip(self.window)) self.current_tooltip = None self.tree.connect('query-tooltip', self.query_tooltip) - # Workaroung: For strange reasons signal is behaving like row-changed + # Workaround: For strange reasons signal is behaving like row-changed self._toggeling_row = False self.setup_and_draw_roster() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7fa4c9e1c2cdc751d7eeeec511e45b8012… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7fa4c9e1c2cdc751d7eeeec511e45b8012… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Change data_form_window.ui to avoid "Overriding tab label for notebook" warning
by Philipp Hörist 28 Jun '18

28 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2e58ffdd by Alexander Krotov at 2018-06-28T23:26:15+02:00 Change data_form_window.ui to avoid "Overriding tab label for notebook" warning - - - - - 1 changed file: - gajim/data/gui/data_form_window.ui Changes: ===================================== gajim/data/gui/data_form_window.ui ===================================== --- a/gajim/data/gui/data_form_window.ui +++ b/gajim/data/gui/data_form_window.ui @@ -51,28 +51,6 @@ <property name="tab_expand">True</property> </packing> </child> - <child type="tab"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child type="tab"> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> <child> <object class="GtkBox" id="multiple_form_hbox"> <property name="visible">True</property> @@ -235,29 +213,6 @@ <property name="position">2</property> </packing> </child> - <child type="tab"> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child type="tab"> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="position">3</property> - <property name="tab_fill">False</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2e58ffdd496740869deef4e85c9fe86351… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2e58ffdd496740869deef4e85c9fe86351… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Remove DIGEST-MD5 from the default auth mechs
by Philipp Hörist 28 Jun '18

28 Jun '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 9073bb42 by Philipp Hörist at 2018-06-28T19:21:47+02:00 Remove DIGEST-MD5 from the default auth mechs https://tools.ietf.org/html/rfc6331 - - - - - 1 changed file: - nbxmpp/auth_nb.py Changes: ===================================== nbxmpp/auth_nb.py ===================================== --- a/nbxmpp/auth_nb.py +++ b/nbxmpp/auth_nb.py @@ -96,7 +96,7 @@ def _scram_parse(chatter): SASL_AUTHENTICATION_MECHANISMS = \ set(['ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', - 'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2']) + 'PLAIN', 'X-MESSENGER-OAUTH2']) class SASL(PlugIn): """ View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/9073bb428557225040e4ad6fef… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/9073bb428557225040e4ad6fef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Raise default TLS encryption
by Philipp Hörist 28 Jun '18

28 Jun '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 526ea0e8 by Philipp Hörist at 2018-06-28T18:46:20+02:00 Raise default TLS encryption RC4-SHA is insecure and TLS1.2 should be on almost all xmpp servers - - - - - 1 changed file: - nbxmpp/tls_nb.py Changes: ===================================== nbxmpp/tls_nb.py ===================================== --- a/nbxmpp/tls_nb.py +++ b/nbxmpp/tls_nb.py @@ -269,11 +269,11 @@ class NonBlockingTLS(PlugIn): self.cacerts = cacerts self.mycerts = mycerts if cipher_list is None: - self.cipher_list = b'HIGH:!aNULL:RC4-SHA' + self.cipher_list = b'HIGH:!aNULL' else: self.cipher_list = cipher_list.encode('ascii') if tls_version is None: - self.tls_version = '1.0' + self.tls_version = '1.2' else: self.tls_version = tls_version self.alpn = alpn View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/526ea0e8897942db4a8f10c305… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/526ea0e8897942db4a8f10c305… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove RC4-SHA because it is insecure
by Philipp Hörist 28 Jun '18

28 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b0ce012c by Philipp Hörist at 2018-06-28T18:43:15+02:00 Remove RC4-SHA because it is insecure Newer openssl version would not use this even if it was stated in our cipher string - - - - - 1 changed file: - gajim/common/config.py Changes: ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -340,7 +340,7 @@ class Config: 'keyname': [ opt_str, '', '', True ], 'allow_plaintext_connection': [ opt_bool, False, _('Allow plaintext connections')], 'tls_version': [ opt_str, '1.2', '' ], - 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], + 'cipher_list': [ opt_str, 'HIGH:!aNULL', '' ], 'authentication_mechanisms': [ opt_str, '', _('List (space separated) of authentication mechanisms to try. Can contain ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, PLAIN, X-MESSENGER-OAUTH2 or XEP-0078') ], 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b0ce012ce3e1f417c9cf4c5bf2d7dc57ec… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b0ce012ce3e1f417c9cf4c5bf2d7dc57ec… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2018