Commits June 2017

commits@gajim.org

1 participants
45 discussions

[Git][gajim/gajim][master] 9 commits: Synchronise hashes support with XEP-0300 in Jingle
by Yann Leboulanger 16 Jun '17

16 Jun '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 2b9f9f3b by Emmanuel Gil Peyrot at 2017-06-14T20:26:37+01:00 Synchronise hashes support with XEP-0300 in Jingle - - - - - 71f0e40c by Emmanuel Gil Peyrot at 2017-06-14T20:26:37+01:00 Update JingleFT to its latest experimental version - - - - - 8356256f by Emmanuel Gil Peyrot at 2017-06-14T20:29:52+01:00 Update to XEP-0300 version 0.5 (:2 namespace). - - - - - 09e6cfbb by Emmanuel Gil Peyrot at 2017-06-14T20:31:29+01:00 Update to XEP-0234 version 0.18.0 (:5 namespace). - - - - - 785a0b61 by Emmanuel Gil Peyrot at 2017-06-14T20:47:41+01:00 Update to XEP-0300 version 0.5 (:2 namespace). - - - - - aad5c160 by Emmanuel Gil Peyrot at 2017-06-14T20:47:41+01:00 Update to XEP-0234 version 0.18.0 (:5 namespace). - - - - - 5606e5b9 by Yann Leboulanger at 2017-06-14T22:32:21+02:00 Merge branch 'jingleft' of https://dev.gajim.org/linkmauve/gajim into HEAD - - - - - 7f4e9306 by Yann Leboulanger at 2017-06-16T21:15:24+02:00 do not decode received data via IBB before writing them to a file - - - - - 46506150 by Yann Leboulanger at 2017-06-16T21:19:38+02:00 Merge branch 'jingleft' into 'master' Update JingleFT support, and fix sending files See merge request !89 - - - - - 14 changed files: - src/chat_control.py - src/common/caps_cache.py - src/common/connection_handlers.py - src/common/connection_handlers_events.py - src/common/gajim.py - src/common/helpers.py - src/common/jingle.py - src/common/jingle_content.py - src/common/jingle_ft.py - src/common/jingle_session.py - src/common/protocol/bytestream.py - src/filetransfers_window.py - src/gui_interface.py - src/gui_menu_builder.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -51,7 +51,7 @@ from common.logger import KindConstant from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from nbxmpp.protocol import NS_ESESSION from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO -from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER +from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER_5 from nbxmpp.protocol import NS_CHATSTATES from common.connection_handlers_events import MessageOutgoingEvent from common.exceptions import GajimGeneralException @@ -387,7 +387,7 @@ class ChatControl(ChatControlBase): # Send file if ((self.contact.supports(NS_FILE) or \ - self.contact.supports(NS_JINGLE_FILE_TRANSFER)) and \ + self.contact.supports(NS_JINGLE_FILE_TRANSFER_5)) and \ (self.type_id == 'chat' or self.gc_contact.resource)) and \ self.contact.show != 'offline': self._send_file_button.set_sensitive(True) @@ -395,7 +395,7 @@ class ChatControl(ChatControlBase): else: self._send_file_button.set_sensitive(False) if not (self.contact.supports(NS_FILE) or self.contact.supports( - NS_JINGLE_FILE_TRANSFER)): + NS_JINGLE_FILE_TRANSFER_5)): self._send_file_button.set_tooltip_text(_( "This contact does not support file transfer.")) else: ===================================== src/common/caps_cache.py ===================================== --- a/src/common/caps_cache.py +++ b/src/common/caps_cache.py @@ -39,11 +39,11 @@ log = logging.getLogger('gajim.c.caps_cache') from nbxmpp import (NS_XHTML_IM, NS_ESESSION, NS_CHATSTATES, NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, - NS_JINGLE_FILE_TRANSFER) + NS_JINGLE_FILE_TRANSFER_5) # Features where we cannot safely assume that the other side supports them FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_ESESSION, NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, - NS_JINGLE_FILE_TRANSFER] + NS_JINGLE_FILE_TRANSFER_5] # Query entry status codes NEW = 0 ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -187,7 +187,7 @@ class ConnectionDisco: query.setAttr('node', 'http://gajim.org#' + gajim.version.split('-', 1)[ 0]) for f in (nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, - nbxmpp.NS_COMMANDS, nbxmpp.NS_JINGLE_FILE_TRANSFER, + nbxmpp.NS_COMMANDS, nbxmpp.NS_JINGLE_FILE_TRANSFER_5, nbxmpp.NS_JINGLE_XTLS, nbxmpp.NS_PUBKEY_PUBKEY, nbxmpp.NS_PUBKEY_REVOKE, nbxmpp.NS_PUBKEY_ATTEST): feature = nbxmpp.Node('feature') ===================================== src/common/connection_handlers_events.py ===================================== --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -2306,12 +2306,12 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.file_props.session_type = 'jingle' self.file_props.stream_methods = nbxmpp.NS_BYTESTREAM desc = self.jingle_content.getTag('description') - if desc.getTag('offer'): - file_tag = desc.getTag('offer').getTag('file') + if self.jingle_content.getAttr('creator') == 'initiator': + file_tag = desc.getTag('file') self.file_props.sender = self.fjid self.file_props.receiver = self.conn._ft_get_our_jid() else: - file_tag = desc.getTag('request').getTag('file') + file_tag = desc.getTag('file') h = file_tag.getTag('hash') h = h.getData() if h else None n = file_tag.getTag('name') ===================================== src/common/gajim.py ===================================== --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -253,7 +253,7 @@ gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_REGISTER, nbxmpp.NS_VERSION, nbxmpp.NS_DATA, nbxmpp.NS_ENCRYPTED, 'msglog', 'sslc2s', 'stringprep', nbxmpp.NS_PING, nbxmpp.NS_TIME_REVISED, nbxmpp.NS_SSN, nbxmpp.NS_MOOD, nbxmpp.NS_ACTIVITY, nbxmpp.NS_NICK, - nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES, + nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES_2, nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, nbxmpp.NS_HASHES_SHA256, nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE] ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -1289,7 +1289,7 @@ def update_optional_features(account = None): gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_RTP_VIDEO) gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_ICE_UDP) gajim.gajim_optional_features[a].append( - nbxmpp.NS_JINGLE_FILE_TRANSFER) + nbxmpp.NS_JINGLE_FILE_TRANSFER_5) gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_XTLS) gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_BYTESTREAM) gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_IBB) ===================================== src/common/jingle.py ===================================== --- a/src/common/jingle.py +++ b/src/common/jingle.py @@ -172,15 +172,19 @@ class ConnectionJingle(object): return c.transport.sid def __hash_support(self, contact): - if contact.supports(nbxmpp.NS_HASHES): - if contact.supports(nbxmpp.NS_HASHES_SHA512): + if contact.supports(nbxmpp.NS_HASHES_2): + if contact.supports(nbxmpp.NS_HASHES_BLAKE2B_512): + return 'blake2b-512' + elif contact.supports(nbxmpp.NS_HASHES_BLAKE2B_256): + return 'blake2b-256' + elif contact.supports(nbxmpp.NS_HASHES_SHA3_512): + return 'sha3-512' + elif contact.supports(nbxmpp.NS_HASHES_SHA3_256): + return 'sha3-256' + elif contact.supports(nbxmpp.NS_HASHES_SHA512): return 'sha-512' elif contact.supports(nbxmpp.NS_HASHES_SHA256): return 'sha-256' - elif contact.supports(nbxmpp.NS_HASHES_SHA1): - return 'sha-1' - elif contact.supports(nbxmpp.NS_HASHES_MD5): - return 'md5' return None def iter_jingle_sessions(self, jid, sid=None, media=None): ===================================== src/common/jingle_content.py ===================================== --- a/src/common/jingle_content.py +++ b/src/common/jingle_content.py @@ -175,12 +175,8 @@ class JingleContent: def _fill_content(self, content): description_node = nbxmpp.simplexml.Node( - tag=nbxmpp.NS_JINGLE_FILE_TRANSFER + ' description') - if self.session.werequest: - simode = nbxmpp.simplexml.Node(tag='request') - else: - simode = nbxmpp.simplexml.Node(tag='offer') - file_tag = simode.setTag('file') + tag=nbxmpp.NS_JINGLE_FILE_TRANSFER_5 + ' description') + file_tag = description_node.setTag('file') if self.file_props.name: node = nbxmpp.simplexml.Node(tag='name') node.addData(self.file_props.name) @@ -196,7 +192,7 @@ class JingleContent: if self.file_props.type_ == 'r': if self.file_props.hash_: file_tag.addChild('hash', attrs={'algo': self.file_props.algo}, - namespace=nbxmpp.NS_HASHES, + namespace=nbxmpp.NS_HASHES_2, payload=self.file_props.hash_) else: # if the file is less than 10 mb, then it is small @@ -217,7 +213,6 @@ class JingleContent: desc = file_tag.setTag('desc') if self.file_props.desc: desc.setData(self.file_props.desc) - description_node.addChild(node=simode) if self.use_security: security = nbxmpp.simplexml.Node( tag=nbxmpp.NS_JINGLE_XTLS + ' security') ===================================== src/common/jingle_ft.py ===================================== --- a/src/common/jingle_ft.py +++ b/src/common/jingle_ft.py @@ -155,7 +155,7 @@ class JingleFileTransfer(JingleContent): checksum = nbxmpp.Node(tag='checksum', payload=[nbxmpp.Node(tag='file', payload=[self._compute_hash()])]) - checksum.setNamespace(nbxmpp.NS_JINGLE_FILE_TRANSFER) + checksum.setNamespace(nbxmpp.NS_JINGLE_FILE_TRANSFER_5) self.session.__session_info(checksum) pjid = gajim.get_jid_without_resource(self.session.peerjid) file_info = {'name' : self.file_props.name, @@ -176,7 +176,7 @@ class JingleFileTransfer(JingleContent): except IOError: # can't open file return - h = nbxmpp.Hashes() + h = nbxmpp.Hashes2() hash_ = h.calculateHash(self.file_props.algo, file_) file_.close() # DEBUG @@ -410,4 +410,4 @@ class JingleFileTransfer(JingleContent): def get_content(desc): return JingleFileTransfer -contents[nbxmpp.NS_JINGLE_FILE_TRANSFER] = get_content +contents[nbxmpp.NS_JINGLE_FILE_TRANSFER_5] = get_content ===================================== src/common/jingle_session.py ===================================== --- a/src/common/jingle_session.py +++ b/src/common/jingle_session.py @@ -444,9 +444,9 @@ class JingleSession: for child in payload: if child.getName() == 'checksum': hash_ = child.getTag('file').getTag(name='hash', - namespace=nbxmpp.NS_HASHES) + namespace=nbxmpp.NS_HASHES_2) algo = hash_.getAttr('algo') - if algo in nbxmpp.Hashes.supported: + if algo in nbxmpp.Hashes2.supported: file_props = FilesProp.getFileProp(self.connection.name, self.sid) file_props.algo = algo ===================================== src/common/protocol/bytestream.py ===================================== --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -926,10 +926,10 @@ class ConnectionIBBytestream(ConnectionBytestream): log.debug('ReceiveHandler called sid->%s seq->%s' % (sid, seq)) try: seq = int(seq) - data = base64.b64decode(data.encode('utf-8')).decode('utf-8') + data = base64.b64decode(data.encode('utf-8')) except Exception: seq = '' - data = '' + data = b'' err = None file_props = FilesProp.getFilePropByTransportSid(self.name, sid) if file_props is None: ===================================== src/filetransfers_window.py ===================================== --- a/src/filetransfers_window.py +++ b/src/filetransfers_window.py @@ -40,7 +40,7 @@ from common import helpers from common.file_props import FilesProp from common.protocol.bytestream import (is_transfer_active, is_transfer_paused, is_transfer_stopped) -from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER +from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 import logging log = logging.getLogger('gajim.filetransfer_window') @@ -357,7 +357,7 @@ class FileTransfersWindow: file_path, file_name, file_desc) if file_props is None: return False - if contact.supports(NS_JINGLE_FILE_TRANSFER): + if contact.supports(NS_JINGLE_FILE_TRANSFER_5): log.info("contact %s supports jingle file transfer"%(contact.get_full_jid())) gajim.connections[account].start_file_transfer(contact.get_full_jid(), file_props) ===================================== src/gui_interface.py ===================================== --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -73,7 +73,7 @@ from session import ChatControlSession from common import sleepy from nbxmpp import idlequeue -from nbxmpp import Hashes +from nbxmpp import Hashes2 from common.zeroconf import connection_zeroconf from common import resolver from common import caps_cache @@ -988,7 +988,7 @@ class Interface: session = gajim.connections[account].get_jingle_session(jid=None, sid=file_props.sid) ft_win = self.instances['file_transfers'] - h = Hashes() + h = Hashes2() try: file_ = open(file_props.file_name, 'rb') except: ===================================== src/gui_menu_builder.py ===================================== --- a/src/gui_menu_builder.py +++ b/src/gui_menu_builder.py @@ -27,7 +27,7 @@ from common import gajim from common import helpers from common import i18n from nbxmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC, NS_ESESSION -from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER, NS_CONFERENCE +from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5, NS_CONFERENCE from gtkgui_helpers import get_action def build_resources_submenu(contacts, account, action, room_jid=None, @@ -260,7 +260,7 @@ control=None, gc_contact=None, is_anonymous=True): else: start_chat_menuitem.connect('activate', gajim.interface.on_open_chat_window, contact, account) - if contact.supports(NS_FILE) or contact.supports(NS_JINGLE_FILE_TRANSFER): + if contact.supports(NS_FILE) or contact.supports(NS_JINGLE_FILE_TRANSFER_5): send_file_menuitem.set_sensitive(True) send_file_menuitem.connect('activate', roster.on_send_file_menuitem_activate, contact, account) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/44430988a5d04cc763a10b1a6008a4430…

1 0

[Git][gajim/gajim][master] update dep list
by Yann Leboulanger 14 Jun '17

14 Jun '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 44430988 by Yann Leboulanger at 2017-06-14T21:39:12+02:00 update dep list - - - - - 1 changed file: - README Changes: ===================================== README ===================================== --- a/README +++ b/README @@ -16,6 +16,7 @@ <ul> <li>python3.4 or higher</li> <li>python3-gi</li> +<li>python3-gi-cairo</li> <li>gir1.2-gtk-3.0</li> <li>python-nbxmpp</li> </ul> @@ -43,6 +44,8 @@ <h2>Compile-time Requirements</h2> <ul> <li>intltool (>= 0.40.1)</li> +<li>pkg-config</li> +<li>libtool</li> </ul> NOTE: If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/44430988a5d04cc763a10b1a6008a4430d…

1 0

[Git][gajim/python-nbxmpp][master] 4 commits: Fix the namespace of the XEP-0300 hashes
by Yann Leboulanger 14 Jun '17

14 Jun '17

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: f3e5659c by Emmanuel Gil Peyrot at 2017-06-14T20:20:39+01:00 Fix the namespace of the XEP-0300 hashes It was taken from a wrong example instead of from the registry. - - - - - 997b3516 by Emmanuel Gil Peyrot at 2017-06-14T20:22:03+01:00 Update JingleFT and Hashes to their latest experimental version - - - - - cbc2bae8 by Emmanuel Gil Peyrot at 2017-06-14T20:22:03+01:00 Update hash calculation to the latest recommendation - - - - - ce015edb by Yann Leboulanger at 2017-06-14T21:27:19+02:00 Merge branch 'jingleft' into 'master' Update JingleFT and Hashes to their latest experimental version See merge request !7 - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== --- a/nbxmpp/protocol.py +++ b/nbxmpp/protocol.py @@ -24,6 +24,7 @@ from .simplexml import Node, NodeBuilder import time import string import hashlib +from base64 import b64encode def ascii_upper(s): return s.upper() @@ -95,7 +96,8 @@ NS_JINGLE_ERRORS = 'urn:xmpp:jingle:errors:1' # XEP-0166 NS_JINGLE_RTP = 'urn:xmpp:jingle:apps:rtp:1' # XEP-0167 NS_JINGLE_RTP_AUDIO = 'urn:xmpp:jingle:apps:rtp:audio' # XEP-0167 NS_JINGLE_RTP_VIDEO = 'urn:xmpp:jingle:apps:rtp:video' # XEP-0167 -NS_JINGLE_FILE_TRANSFER ='urn:xmpp:jingle:apps:file-transfer:3' # XEP-0234 +NS_JINGLE_FILE_TRANSFER = 'urn:xmpp:jingle:apps:file-transfer:3' # XEP-0234 +NS_JINGLE_FILE_TRANSFER_5 = 'urn:xmpp:jingle:apps:file-transfer:5' # XEP-0234 NS_JINGLE_XTLS='urn:xmpp:jingle:security:xtls:0' # XTLS: EXPERIMENTAL security layer of jingle NS_JINGLE_RAW_UDP = 'urn:xmpp:jingle:transports:raw-udp:1' # XEP-0177 NS_JINGLE_ICE_UDP = 'urn:xmpp:jingle:transports:ice-udp:1' # XEP-0176 @@ -173,10 +175,15 @@ NS_PUBKEY_REVOKE = 'urn:xmpp:revoke:2' NS_PUBKEY_ATTEST = 'urn:xmpp:attest:2' NS_STREAM_MGMT = 'urn:xmpp:sm:3' # XEP-198 NS_HASHES = 'urn:xmpp:hashes:1' # XEP-300 -NS_HASHES_MD5 = 'urn:xmpp:hash-function-textual-names:md5' -NS_HASHES_SHA1 = 'urn:xmpp:hash-function-textual-names:sha-1' -NS_HASHES_SHA256 = 'urn:xmpp:hash-function-textual-names:sha-256' -NS_HASHES_SHA512 = 'urn:xmpp:hash-function-textual-names:sha-512' +NS_HASHES_2 = 'urn:xmpp:hashes:2' # XEP-300 +NS_HASHES_MD5 = 'urn:xmpp:hash-function-text-names:md5' +NS_HASHES_SHA1 = 'urn:xmpp:hash-function-text-names:sha-1' +NS_HASHES_SHA256 = 'urn:xmpp:hash-function-text-names:sha-256' +NS_HASHES_SHA512 = 'urn:xmpp:hash-function-text-names:sha-512' +NS_HASHES_SHA3_256 = 'urn:xmpp:hash-function-text-names:sha3-256' +NS_HASHES_SHA3_512 = 'urn:xmpp:hash-function-text-names:sha3-512' +NS_HASHES_BLAKE2B_256 = 'urn:xmpp:hash-function-text-names:id-blake2b256' +NS_HASHES_BLAKE2B_512 = 'urn:xmpp:hash-function-text-names:id-blake2b512' #xmpp_stream_error_conditions = ''' #bad-format -- -- -- The entity has sent XML that cannot be processed. @@ -1347,6 +1354,62 @@ class Hashes(Node): hash_ = hl.hexdigest() return hash_ +class Hashes2(Node): + """ + Hash elements for various XEPs as defined in XEP-300 + """ + + """ + RECOMENDED HASH USE: + Algorithm Support + MD2 MUST NOT + MD4 MUST NOT + MD5 MUST NOT + SHA-1 SHOULD NOT + SHA-256 MUST + SHA-512 SHOULD + SHA3-256 MUST + SHA3-512 SHOULD + BLAKE2b256 MUST + BLAKE2b512 SHOULD + """ + + supported = ('sha-256', 'sha-512', 'sha3-256', 'sha3-512', 'blake2b-256', 'blake2b-512') + + def __init__(self, nsp=NS_HASHES): + Node.__init__(self, None, {}, [], None, None, False, None) + self.setNamespace(nsp) + self.setName('hash') + + def calculateHash(self, algo, file_string): + """ + Calculate the hash and add it. It is preferable doing it here + instead of doing it all over the place in Gajim. + """ + hl = None + hash_ = None + if algo == 'sha-256': + hl = hashlib.sha256() + elif algo == 'sha-512': + hl = hashlib.sha512() + elif algo == 'sha3-256': + hl = hashlib.sha3_256() + elif algo == 'sha3-512': + hl = hashlib.sha3_512() + elif algo == 'blake2b-256': + hl = hashlib.blake2b(digest_size=32) + elif algo == 'blake2b-512': + hl = hashlib.blake2b(digest_size=64) + # file_string can be a string or a file + if hl is not None: + if isinstance(file_string, bytes): + hl.update(file_string) + else: # if it is a file + for line in file_string: + hl.update(line) + hash_ = b64encode(hl.digest()).decode('ascii') + return hash_ + def addHash(self, hash_, algo): self.setAttr('algo', algo) self.setData(hash_) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/5300788382de00698213167ad…

1 0

[Git][gajim/gajim][master] fix a test. Fixes #8660
by Yann Leboulanger 14 Jun '17

14 Jun '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 0d3ce37b by Yann Leboulanger at 2017-06-14T20:25:06+02:00 fix a test. Fixes #8660 - - - - - 1 changed file: - test/lib/gajim_mocks.py Changes: ===================================== test/lib/gajim_mocks.py ===================================== --- a/test/lib/gajim_mocks.py +++ b/test/lib/gajim_mocks.py @@ -24,6 +24,7 @@ class MockConnection(Mock, ConnectionHandlers): self.blocked_groups = {} self.sessions = {} self.nested_group_delimiter = '::' + self.server_resource = 'Gajim' gajim.interface.instances[account] = {'infos': {}, 'disco': {}, 'gc_config': {}, 'search': {}, 'sub_request': {}} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0d3ce37b2756876326431d83b4d322f9c3…

1 0

[Git][gajim/gajim][master] fix logging single messages. Fixes #8640
by Yann Leboulanger 14 Jun '17

14 Jun '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 388acfca by Yann Leboulanger at 2017-06-14T15:29:19+02:00 fix logging single messages. Fixes #8640 - - - - - 2 changed files: - src/common/connection.py - src/common/zeroconf/connection_zeroconf.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -413,14 +413,14 @@ class CommonConnection: gajim.nec.push_incoming_event( StanzaMessageOutgoingEvent(None, **vars(obj))) - def log_message(self, obj): + def log_message(self, obj, jid): if not obj.is_loggable: return if obj.forward_from or not obj.session or not obj.session.is_loggable(): return - if not gajim.config.should_log(self.name, obj.jid): + if not gajim.config.should_log(self.name, jid): return if obj.xhtml and gajim.config.get('log_xhtml_messages'): @@ -437,7 +437,7 @@ class CommonConnection: kind = 'single_msg_sent' gajim.logger.write( - kind, obj.jid, message, subject=obj.subject, + kind, jid, message, subject=obj.subject, additional_data=obj.additional_data) def ack_subscribed(self, jid): @@ -2058,9 +2058,9 @@ class Connection(CommonConnection, ConnectionHandlers): for j in obj.jid: if obj.session is None: obj.session = self.get_or_create_session(j, '') - self.log_message(obj) + self.log_message(obj, j) else: - self.log_message(obj) + self.log_message(obj, obj.jid) def send_contacts(self, contacts, fjid, type_='message'): """ ===================================== src/common/zeroconf/connection_zeroconf.py ===================================== --- a/src/common/zeroconf/connection_zeroconf.py +++ b/src/common/zeroconf/connection_zeroconf.py @@ -342,7 +342,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): if obj.callback: obj.callback(obj.msg_iq, *obj.callback_args) - self.log_message(obj) + self.log_message(obj, obj.jid) def on_send_not_ok(reason): reason += ' ' + _('Your message could not be sent.') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/388acfca5a672a004e205d2c8083ab55bb…

1 0

[Git][gajim/gajim][master] 2 commits: fix frong commit from 2fbadc91
by Yann Leboulanger 14 Jun '17

14 Jun '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 2c24c5a1 by Yann Leboulanger at 2017-06-14T15:09:29+02:00 fix frong commit from 2fbadc91 - - - - - 4f7b7288 by Yann Leboulanger at 2017-06-14T15:10:26+02:00 Merge branch 'master' of dev.gajim.org:gajim/gajim - - - - - 1 changed file: - src/roster_window.py Changes: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -3279,7 +3279,7 @@ class RosterWindow: type_ = model[list_of_paths[0]][Column.TYPE] account = model[list_of_paths[0]][Column.ACCOUNT] if type_ in ('account', 'group', 'self_contact') or \ - account == gajim.ZEROCONF_ACConstant.NAME: + account == gajim.ZEROCONF_ACC_NAME: return list_ = [] for path in list_of_paths: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9dc389cc32f8bc8f51c694f54b5a4785c…

1 0

[Git][gajim/gajim][master] Show warning icon when encryption is disabled
by Philipp Hörist 12 Jun '17

12 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9dc389cc by Philipp Hörist at 2017-06-13T00:02:44+02:00 Show warning icon when encryption is disabled 'channel-insecure-symbolic' icon if no encryption is selected 'channel-secure-symbolic' if an encryption is selected - - - - - 4 changed files: - src/chat_control.py - src/chat_control_base.py - src/groupchat_control.py - src/gtkgui_helpers.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -287,6 +287,7 @@ class ChatControl(ChatControlBase): self.encryption_menu = self.xml.get_object('encryption_menu') self.encryption_menu.set_menu_model( gui_menu_builder.get_encryption_menu(self.contact, self.type_id)) + self.set_encryption_menu_icon() # restore previous conversation self.restore_conversation() self.msg_textview.grab_focus() ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -36,6 +36,7 @@ from gi.repository import GObject from gi.repository import GLib from gi.repository import Gio import gtkgui_helpers +from gtkgui_helpers import Color import message_control import dialogs import history_window @@ -442,6 +443,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.terminate_esessions() action.set_state(param) self.set_encryption_state(encryption) + self.set_encryption_menu_icon() self.set_lock_image() def set_encryption_state(self, encryption): @@ -455,6 +457,19 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): state = gajim.config.get_per('encryption', config_key, 'encryption') return state or None + def set_encryption_menu_icon(self): + for child in self.encryption_menu.get_children(): + if isinstance(child, Gtk.Image): + image = child + break + + if not self.encryption: + icon = gtkgui_helpers.get_icon_pixmap( + 'channel-insecure-symbolic', color=[Color.BLACK]) + else: + icon = gtkgui_helpers.get_icon_pixmap('channel-secure-symbolic') + image.set_from_pixbuf(icon) + def set_speller(self): # now set the one the user selected per_type = 'contacts' ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -493,6 +493,7 @@ class GroupchatControl(ChatControlBase): self.encryption_menu = self.xml.get_object('encryption_menu') self.encryption_menu.set_menu_model( gui_menu_builder.get_encryption_menu(self.contact, self.type_id)) + self.set_encryption_menu_icon() gajim.ged.register_event_handler('gc-presence-received', ged.GUI1, self._nec_gc_presence_received) ===================================== src/gtkgui_helpers.py ===================================== --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -53,9 +53,16 @@ from common import configpaths gtk_icon_theme = Gtk.IconTheme.get_default() gtk_icon_theme.append_search_path(gajim.ICONS_DIR) -def get_icon_pixmap(icon_name, size=16, quiet=False): +class Color: + BLACK = Gdk.RGBA(red=0, green=0, blue=0, alpha=1) + +def get_icon_pixmap(icon_name, size=16, color=None, quiet=False): try: - return gtk_icon_theme.load_icon(icon_name, size, 0) + iconinfo = gtk_icon_theme.lookup_icon(icon_name, size, 0) + if color: + pixbuf, was_symbolic = iconinfo.load_symbolic(*color) + return pixbuf + return iconinfo.load_icon() except GLib.GError as e: if not quiet: log.error('Unable to load icon %s: %s' % (icon_name, str(e))) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9dc389cc32f8bc8f51c694f54b5a4785c0…

1 0

[Git][gajim/gajim][master] Fix Layout issues with long status messages
by Philipp Hörist 12 Jun '17

12 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f7754487 by Philipp Hörist at 2017-06-12T22:20:03+02:00 Fix Layout issues with long status messages Fixes #8652 - - - - - 4 changed files: - data/gui/tooltip_gc_contact.ui - data/gui/vcard_information_window.ui - src/tooltips.py - src/vcard.py Changes: ===================================== data/gui/tooltip_gc_contact.ui ===================================== --- a/data/gui/tooltip_gc_contact.ui +++ b/data/gui/tooltip_gc_contact.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkGrid" id="tooltip_grid"> @@ -10,8 +10,8 @@ <object class="GtkLabel" id="nick"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> - <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -26,10 +26,11 @@ <object class="GtkLabel" id="status"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> <property name="wrap">True</property> + <property name="wrap_mode">word-char</property> <property name="max_width_chars">40</property> - <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> </attributes> @@ -44,9 +45,9 @@ <object class="GtkLabel" id="jid_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> <property name="label" translatable="yes">Jabber ID:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -69,9 +70,9 @@ <object class="GtkLabel" id="resource_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> <property name="label" translatable="yes">Resource:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -82,8 +83,8 @@ <object class="GtkLabel" id="affiliation"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -95,8 +96,8 @@ <object class="GtkLabel" id="user_show"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -108,6 +109,7 @@ <object class="GtkLabel" id="fillelement"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="vexpand">True</property> </object> <packing> @@ -120,8 +122,8 @@ <object class="GtkLabel" id="resource"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="hexpand">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -132,8 +134,8 @@ <object class="GtkLabel" id="jid"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="hexpand">True</property> - <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> ===================================== data/gui/vcard_information_window.ui ===================================== --- a/data/gui/vcard_information_window.ui +++ b/data/gui/vcard_information_window.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkWindow" id="vcard_information_window"> <property name="can_focus">False</property> <property name="border_width">12</property> @@ -20,8 +20,8 @@ <object class="GtkLabel" id="nickname_label"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="halign">start</property> <property name="selectable">True</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -50,9 +50,10 @@ <object class="GtkLabel" id="JabberID_Label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes">Jabber ID:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -63,10 +64,10 @@ <object class="GtkLabel" id="Resource_Label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes">Resource:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -77,10 +78,10 @@ <object class="GtkLabel" id="Status_Label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes">Status:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -91,10 +92,10 @@ <object class="GtkLabel" id="Client_Label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes">Client:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -105,10 +106,10 @@ <object class="GtkLabel" id="System_Label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes">System:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -119,10 +120,10 @@ <object class="GtkLabel" id="Time_Label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes">Contact time:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -133,10 +134,11 @@ <object class="GtkLabel" id="jid_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> <property name="hexpand">True</property> - <property name="xpad">5</property> <property name="selectable">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -153,11 +155,11 @@ <object class="GtkLabel" id="resource_prio_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> <property name="hexpand">True</property> - <property name="xpad">5</property> <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> </child> </object> @@ -167,37 +169,14 @@ </packing> </child> <child> - <object class="GtkEventBox" id="status_label_eventbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="visible_window">False</property> - <child> - <object class="GtkLabel" id="status_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xpad">5</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> <object class="GtkLabel" id="client_name_version_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> <property name="hexpand">True</property> - <property name="xpad">5</property> <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -208,12 +187,12 @@ <object class="GtkLabel" id="os_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> <property name="hexpand">True</property> - <property name="xpad">5</property> <property name="wrap">True</property> <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -224,11 +203,11 @@ <object class="GtkLabel" id="time_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> <property name="hexpand">True</property> - <property name="xpad">5</property> <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -240,10 +219,8 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="halign">start</property> - <property name="ypad">5</property> <property name="label" translatable="yes">User avatar:</property> <property name="use_markup">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -251,35 +228,11 @@ </packing> </child> <child> - <object class="GtkEventBox" id="PHOTO_eventbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="visible_window">False</property> - <signal name="button-press-event" handler="on_PHOTO_eventbox_button_press_event" swapped="no"/> - <child> - <object class="GtkImage" id="PHOTO_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="stock">gtk-missing-image</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - <property name="height">7</property> - </packing> - </child> - <child> <object class="GtkLabel" id="custom_avatar_label"> <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="label" translatable="yes">Configured avatar:</property> <property name="use_markup">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -291,7 +244,8 @@ <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> - <property name="xalign">0</property> + <property name="halign">start</property> + <property name="valign">start</property> <property name="stock">gtk-missing-image</property> </object> <packing> @@ -304,9 +258,10 @@ <object class="GtkLabel" id="ask_title_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes" comments="Given Name">Ask:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -314,56 +269,86 @@ </packing> </child> <child> - <object class="GtkEventBox" id="ask_label_eventbox"> + <object class="GtkLabel" id="subscription_title_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="visible_window">False</property> - <child> - <object class="GtkLabel" id="ask_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xpad">5</property> - <property name="xalign">0</property> - </object> - </child> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="label" translatable="yes" comments="Family Name">Subscription:</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="status_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> + <property name="wrap">True</property> + <property name="wrap_mode">word-char</property> + <property name="selectable">True</property> + <property name="width_chars">20</property> + <property name="max_width_chars">30</property> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">7</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkLabel" id="subscription_title_label"> + <object class="GtkLabel" id="subscription_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" comments="Family Name">Subscription:</property> - <property name="use_markup">True</property> - <property name="xalign">1</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">1</property> <property name="top_attach">6</property> </packing> </child> <child> - <object class="GtkEventBox" id="subscription_label_eventbox"> + <object class="GtkLabel" id="ask_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkEventBox" id="PHOTO_eventbox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="visible_window">False</property> + <signal name="button-press-event" handler="on_PHOTO_eventbox_button_press_event" swapped="no"/> <child> - <object class="GtkLabel" id="subscription_label"> - <property name="visible">True</property> + <object class="GtkImage" id="PHOTO_image"> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xpad">5</property> - <property name="xalign">0</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="stock">gtk-missing-image</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + <property name="height">7</property> </packing> </child> </object> @@ -373,8 +358,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Contact</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="tab_fill">False</property> @@ -952,8 +935,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Personal Info</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="position">1</property> @@ -1353,8 +1334,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Work</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="position">2</property> @@ -1387,8 +1366,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes" comments=""About" is the text of a tab of vcard window">About</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="position">3</property> ===================================== src/tooltips.py ===================================== --- a/src/tooltips.py +++ b/src/tooltips.py @@ -31,6 +31,7 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib +from gi.repository import Pango import os import time from datetime import datetime @@ -207,6 +208,7 @@ class StatusTable: self.table.insert_row(self.current_row) self.text_label = Gtk.Label() self.text_label.set_line_wrap(True) + self.text_label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) self.text_label.set_max_width_chars(35) self.text_label.set_halign(Gtk.Align.START) self.text_label.set_valign(Gtk.Align.START) ===================================== src/vcard.py ===================================== --- a/src/vcard.py +++ b/src/vcard.py @@ -404,11 +404,8 @@ class VcardWindow: if self.contact.status: stats += ': ' + self.contact.status status_label = self.xml.get_object('status_label') - status_label.set_max_width_chars(15) status_label.set_text(stats) - - status_label_eventbox = self.xml.get_object('status_label_eventbox') - status_label_eventbox.set_tooltip_text(stats) + status_label.set_tooltip_text(stats) def fill_jabber_page(self): self.xml.get_object('nickname_label').set_markup( @@ -430,7 +427,6 @@ class VcardWindow: else: uf_sub = helpers.get_uf_sub(self.contact.sub) subscription_label.set_text(uf_sub) - eb = self.xml.get_object('subscription_label_eventbox') if self.contact.sub == 'from': tt_text = _("This contact is interested in your presence information, but you are not interested in their presence") elif self.contact.sub == 'to': @@ -439,16 +435,15 @@ class VcardWindow: tt_text = _("The contact and you want to exchange presence information") else: # None tt_text = _("You and the contact have a mutual disinterest in each-others presence information") - eb.set_tooltip_text(tt_text) + subscription_label.set_tooltip_text(tt_text) uf_ask = helpers.get_uf_ask(self.contact.ask) ask_label.set_text(uf_ask) - eb = self.xml.get_object('ask_label_eventbox') if self.contact.ask == 'subscribe': tt_text = _("You are waiting contact's answer about your subscription request") else: tt_text = _("There is no pending subscription request.") - eb.set_tooltip_text(tt_text) + ask_label.set_tooltip_text(tt_text) resources = '%s (%s)' % (self.contact.resource, str( self.contact.priority)) @@ -613,11 +608,8 @@ class ZeroconfVcardWindow: if self.contact.status: stats += ': ' + self.contact.status status_label = self.xml.get_object('status_label') - status_label.set_max_width_chars(15) status_label.set_text(stats) - - status_label_eventbox = self.xml.get_object('status_label_eventbox') - status_label_eventbox.set_tooltip_text(stats) + status_label.set_tooltip_text(stats) def fill_contact_page(self): self.xml.get_object('nickname_label').set_markup( View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f7754487ccee4f4a1e797225041f53966f…

1 0

[Git][gajim/gajim][gajim_0.16] Update servers.xml
by Philipp Hörist 11 Jun '17

11 Jun '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: d3914584 by Nulll at 2017-06-11T23:01:44+02:00 Update servers.xml - - - - - 1 changed file: - data/other/servers.xml Changes: ===================================== data/other/servers.xml ===================================== --- a/data/other/servers.xml +++ b/data/other/servers.xml @@ -8,6 +8,7 @@ --> <query xmlns:reg="urn:xmpp:vcard:registration:1"> <item jid="0nl1ne.at" /> + <item jid="404.city" /> <item jid="brauchen.info" /> <item jid="chatme.im" /> <item jid="climm.org" /> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d391458417b037f7d07cb19b378b161783…

1 0

[Git][gajim/gajim][master] 2 commits: Update servers.xml
by Philipp Hörist 11 Jun '17

11 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 22096d58 by Nulll at 2017-05-29T18:23:49+02:00 Update servers.xml - - - - - f419127b by Philipp Hörist at 2017-06-11T22:59:25+02:00 Merge branch 'patch-1' into 'master' Update servers.xml See merge request !101 - - - - - 1 changed file: - data/other/servers.xml Changes: ===================================== data/other/servers.xml ===================================== --- a/data/other/servers.xml +++ b/data/other/servers.xml @@ -8,6 +8,7 @@ --> <query xmlns:reg="urn:xmpp:vcard:registration:1"> <item jid="0nl1ne.at" /> + <item jid="404.city" /> <item jid="brauchen.info" /> <item jid="chatme.im" /> <item jid="climm.org" /> View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/209fa4c92634cdd86ee6ae25b34c3ab63…

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 2017