Commits June 2012

commits@gajim.org

4 participants
49 discussions

gajim: don't try to connect twice when we get see-other-host. se...
by Yann Leboulanger 21 Jun '12

21 Jun '12

changeset e5d66fcb024f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e5d66fcb024f description: don't try to connect twice when we get see-other-host. see #7179 diffstat: src/common/xmpp/client_nb.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 31c666671ead -r e5d66fcb024f src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Tue Jun 19 22:45:19 2012 +0400 +++ b/src/common/xmpp/client_nb.py Thu Jun 21 14:10:01 2012 +0200 @@ -354,6 +354,7 @@ self.Dispatcher.ProcessNonBlocking(data) if self.got_see_other_host: log.info('got see-other-host') + self.onreceive(None) self.on_stream_error_cb(self, self.got_see_other_host) elif not self.got_features: self._xmpp_connect_machine(

1 0

gajim: fix sockes5 transfer
by Yann Leboulanger 20 Jun '12

20 Jun '12

changeset 2657d405cfe0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2657d405cfe0 description: fix sockes5 transfer diffstat: src/common/file_props.py | 1 + src/common/protocol/bytestream.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diffs (23 lines): diff -r 08cab8eb40d4 -r 2657d405cfe0 src/common/file_props.py --- a/src/common/file_props.py Wed Jun 20 23:58:08 2012 +0200 +++ b/src/common/file_props.py Wed Jun 20 23:58:23 2012 +0200 @@ -135,6 +135,7 @@ self.startexmpp = None self.session_type = None self.request_id = None + self.proxyhosts = None def getsid(self): # Getter of the property sid diff -r 08cab8eb40d4 -r 2657d405cfe0 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Wed Jun 20 23:58:08 2012 +0200 +++ b/src/common/protocol/bytestream.py Wed Jun 20 23:58:23 2012 +0200 @@ -735,7 +735,7 @@ if file_props.stopped: self.remove_transfer(file_props) else: - gajim.socks5queue.send_file(file_props, self.name, 'client') + gajim.socks5queue.send_file(file_props, self.name, 'server') raise xmpp.NodeProcessed

1 0

gajim: fix indentation
by Yann Leboulanger 20 Jun '12

20 Jun '12

changeset 08cab8eb40d4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=08cab8eb40d4 description: fix indentation diffstat: src/common/socks5.py | 58 ++++++++++++++++++++++++++-------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diffs (210 lines): diff -r 01b7185e8e8a -r 08cab8eb40d4 src/common/socks5.py --- a/src/common/socks5.py Wed Jun 20 23:16:18 2012 +0200 +++ b/src/common/socks5.py Wed Jun 20 23:58:08 2012 +0200 @@ -100,7 +100,7 @@ # There is already a listener, we update the file's information # on the new connection. self.listener.file_props = file_props - + self.connected += 1 return self.listener @@ -116,13 +116,13 @@ return 0 streamhost['state'] = 1 self.on_success[file_props.sid](streamhost) - return 1 + return 1 def connect_to_hosts(self, account, sid, on_success=None, on_failure=None, fingerprint=None, receiving=True): self.on_success[sid] = on_success self.on_failure[sid] = on_failure - file_props = FilesProp.getFileProp(account, sid) + file_props = FilesProp.getFileProp(account, sid) file_props.failure_cb = on_failure if not file_props.streamhosts: @@ -151,8 +151,8 @@ file_props.proxy_sender = streamhost['target'] file_props.proxy_receiver = streamhost['initiator'] socks5obj = Socks5SenderClient(self.idlequeue, idx, - self, _sock=None,host=str(streamhost['host']), - port=int(streamhost['port']),fingerprint=fp, + self, _sock=None,host=str(streamhost['host']), + port=int(streamhost['port']),fingerprint=fp, connected=False, file_props=file_props) socks5obj.streamhost = streamhost self.add_sockobj(account, socks5obj, type='sender') @@ -302,20 +302,20 @@ def send_file(self, file_props, account, mode): for key in self.senders.keys(): - if self.senders == {}: - # Python acts very weird with this. When there is no keys - # in the dictionary It says that it has a key. - # Maybe it is my machine. Without this there is a KeyError - # traceback. - return - if file_props.name in key and file_props.sid in key \ + if self.senders == {}: + # Python acts very weird with this. When there is no keys + # in the dictionary It says that it has a key. + # Maybe it is my machine. Without this there is a KeyError + # traceback. + return + if file_props.name in key and file_props.sid in key \ and self.senders[key].mode == mode: log.info("socks5: sending file") sender = self.senders[key] file_props.streamhost_used = True sender.account = account - + sender.file_props = file_props result = sender.send_file() self.process_result(result, sender) @@ -323,7 +323,7 @@ def remove_file_props(self, account, sid): fp = FilesProp.getFileProp(account, sid) if not fp: - log.warning('trying to remove a file props that doesnt exist ' + + log.warning('trying to remove a file props that doesnt exist ' + 'from account ' + str(account) + ' and sid ' + str(sid)) return if sid in self.on_success: @@ -415,7 +415,7 @@ del(self.readers[key]) if not remove_all: break - + def remove_sender(self, idx, do_disconnect=True, remove_all=False): """ Remove sender from the list of senders and decrease the number of active @@ -484,7 +484,7 @@ for ai in self.ais: try: self._sock = socket.socket(*ai[:3]) - + if not self.fingerprint is None: self._sock = OpenSSL.SSL.Connection( jingle_xtls.get_context('client'), self._sock) @@ -696,7 +696,7 @@ """ Read file contents from socket and write them to file """ - + if self.file_props is None or not self.file_props.file_name: self.file_props.error = -2 return None @@ -894,7 +894,7 @@ """ Get sha of sid + Initiator jid + Target jid """ - + if self.file_props.is_a_proxy: self.file_props.is_a_proxy = None # Is this necesary? return hashlib.sha1('%s%s%s' % (self.sid, @@ -902,7 +902,7 @@ self.file_props.proxy_receiver)).hexdigest() return hashlib.sha1('%s%s%s' % (self.sid, self.initiator, self.target)).\ hexdigest() - + class Socks5Sender(IdleObject): """ @@ -928,7 +928,7 @@ jingle_xtls.get_context('server'), _sock) else: self._sock.setblocking(False) - + self.fd = _sock.fileno() self._recv = _sock.recv self._send = _sock.send @@ -1022,7 +1022,7 @@ self.file_props.continue_cb = self.continue_paused_transfer self.file_props.stalled = False self.file_props.received_len = 0 - + def receive_file(self): """ @@ -1079,7 +1079,7 @@ def __init__(self, idlequeue, host, port, initiator, target, sid): Socks5.__init__(self, idlequeue, host, port, initiator, target, sid) - + self.mode = 'server' def main(self): @@ -1183,7 +1183,7 @@ def __init__(self, idlequeue, host, port, initiator, target, sid): Socks5.__init__(self, idlequeue, host, port, initiator, target, sid) - + self.mode = 'client' def main(self, timeout=0): @@ -1334,7 +1334,7 @@ Socks5Client.__init__(self, idlequeue, host, port, None, None, file_props.sid) - Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, + Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, host, port, fingerprint , connected, file_props) @@ -1342,14 +1342,14 @@ class Socks5SenderServer(Socks5Server, Socks5Sender): - + def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, port=None, fingerprint = None, connected=True, file_props={}): Socks5Server.__init__(self, idlequeue, host, port, None, None, file_props.sid) - Socks5Sender.__init__(self,idlequeue, sock_hash, parent, _sock, + Socks5Sender.__init__(self,idlequeue, sock_hash, parent, _sock, host, port, fingerprint , connected, file_props) @@ -1359,14 +1359,14 @@ def __init__(self, idlequeue, streamhost, sid, file_props = None, fingerprint=None): Socks5Client.__init__(self, idlequeue, streamhost['host'], - int(streamhost['port']), streamhost['initiator'], + int(streamhost['port']), streamhost['initiator'], streamhost['target'], sid) Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, fingerprint) - + class Socks5ReceiverServer(Socks5Server, Socks5Receiver): @@ -1374,7 +1374,7 @@ fingerprint=None): Socks5Server.__init__(self, idlequeue, streamhost['host'], - int(streamhost['port']), streamhost['initiator'], + int(streamhost['port']), streamhost['initiator'], streamhost['target'], sid) Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props,

1 0

gajim: fix typo
by Yann Leboulanger 20 Jun '12

20 Jun '12

changeset 01b7185e8e8a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=01b7185e8e8a description: fix typo remove "fast" support try to connect to streamhosts when we get them diffstat: src/common/protocol/bytestream.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diffs (41 lines): diff -r 9d43ef511f51 -r 01b7185e8e8a src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Jun 14 19:46:17 2012 +0200 +++ b/src/common/protocol/bytestream.py Wed Jun 20 23:16:18 2012 +0200 @@ -639,7 +639,6 @@ streamhosts.append(host_dict) file_props = FilesProp.getFilePropBySid(sid) if file_props is not None: - file_props.fast = streamhosts if file_props.type_ == 's': # FIXME: remove fast xmlns # only psi do this if file_props.streamhosts: @@ -648,7 +647,7 @@ file_props.streamhosts = streamhosts gajim.socks5queue.connect_to_hosts(self.name, sid, self.send_success_connect_reply, None) - raise xmpp.NodeProcessed + raise xmpp.NodeProcessed else: log.warn('Gajim got streamhosts for unknown transfer. Ignoring it.') raise xmpp.NodeProcessed @@ -685,7 +684,7 @@ except Exception: # this bytestream result is not what we need pass id_ = real_id[3:] - file_props = FilesProp.getFileProp(con.name, id_) + file_props = FilesProp.getFileProp(self.name, id_) if file_props is None: raise xmpp.NodeProcessed if streamhost is None: @@ -737,11 +736,6 @@ self.remove_transfer(file_props) else: gajim.socks5queue.send_file(file_props, self.name, 'client') - if file_props.fast: - fasts = file_props.fast - if len(fasts) > 0: - self._connect_error(frm, fasts[0]['id'], file_props.sid, - code=406) raise xmpp.NodeProcessed

1 0

gajim: fix typo
by Fomin Denis 19 Jun '12

19 Jun '12

changeset 41acee25913c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=41acee25913c description: fix typo diffstat: src/tooltips.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (21 lines): diff -r 0def65e3600a -r 41acee25913c src/tooltips.py --- a/src/tooltips.py Tue Jun 19 20:50:34 2012 +0200 +++ b/src/tooltips.py Tue Jun 19 22:45:19 2012 +0400 @@ -207,13 +207,13 @@ formatted = "%s" color = None if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")): - color = gajim.conig.get('tooltip_affiliation_none_color') + color = gajim.config.get('tooltip_affiliation_none_color') elif affiliation.startswith(_("Member")): - color = gajim.conig.get('tooltip_affiliation_member_color') + color = gajim.config.get('tooltip_affiliation_member_color') elif affiliation.startswith(_("Administrator")): - color = gajim.conig.get('tooltip_affiliation_administrator_color') + color = gajim.config.get('tooltip_affiliation_administrator_color') elif affiliation.startswith(_("Owner")): - color = gajim.conig.get('tooltip_affiliation_owner_color') + color = gajim.config.get('tooltip_affiliation_owner_color') if color: affiliation = formatted % (color, affiliation) return affiliation

1 0

gajim: 0.15.1 changelog
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 0def65e3600a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0def65e3600a description: 0.15.1 changelog diffstat: ChangeLog | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 73d9c50e6736 -r 0def65e3600a ChangeLog --- a/ChangeLog Tue Jun 19 19:19:24 2012 +0200 +++ b/ChangeLog Tue Jun 19 20:50:34 2012 +0200 @@ -1,3 +1,11 @@ +Gajim 0.15.1 () + + * improve performences + * Fix roster filter with unicode chars + * Fix connection to msn jabber server + * Fix some GPG issues + * Fix other small issues + Gajim 0.15 (18 March 2012) * Plugin system

1 0

gajim: fix typo
by Fomin Denis 19 Jun '12

19 Jun '12

changeset 31c666671ead in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=31c666671ead description: fix typo diffstat: src/tooltips.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (21 lines): diff -r dd85d8b743c2 -r 31c666671ead src/tooltips.py --- a/src/tooltips.py Tue Jun 19 19:19:24 2012 +0200 +++ b/src/tooltips.py Tue Jun 19 22:45:19 2012 +0400 @@ -207,13 +207,13 @@ formatted = "%s" color = None if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")): - color = gajim.conig.get('tooltip_affiliation_none_color') + color = gajim.config.get('tooltip_affiliation_none_color') elif affiliation.startswith(_("Member")): - color = gajim.conig.get('tooltip_affiliation_member_color') + color = gajim.config.get('tooltip_affiliation_member_color') elif affiliation.startswith(_("Administrator")): - color = gajim.conig.get('tooltip_affiliation_administrator_color') + color = gajim.config.get('tooltip_affiliation_administrator_color') elif affiliation.startswith(_("Owner")): - color = gajim.conig.get('tooltip_affiliation_owner_color') + color = gajim.config.get('tooltip_affiliation_owner_color') if color: affiliation = formatted % (color, affiliation) return affiliation

1 0

gajim: current version is 0.15.0.1
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 02abfa8a4a5f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=02abfa8a4a5f description: current version is 0.15.0.1 diffstat: autogen.sh | 7 +------ src/common/defs.py | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diffs (34 lines): diff -r 9939e4c2a4b8 -r 02abfa8a4a5f autogen.sh --- a/autogen.sh Sat Jun 16 22:58:46 2012 +0200 +++ b/autogen.sh Sun Jun 17 22:11:17 2012 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15" + gajimversion="0.15.0.1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" @@ -10,11 +10,6 @@ AM_ARGS="--add-missing --gnu --copy -Wno-portability" CONF_ARGS="" - if test x`uname -s 2>/dev/null` = 'xDarwin' -a -f /Library/Frameworks/GTK+.framework/Versions/Current/env; then - . /Library/Frameworks/GTK+.framework/Versions/Current/env - AM_ARGS="${AM_ARGS} --ignore-deps" - CONF_ARGS="${CONF_ARGS} --disable-idle --without-x" - fi echo "[encoding: UTF-8]" > po/POTFILES.in \ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ diff -r 9939e4c2a4b8 -r 02abfa8a4a5f src/common/defs.py --- a/src/common/defs.py Sat Jun 16 22:58:46 2012 +0200 +++ b/src/common/defs.py Sun Jun 17 22:11:17 2012 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15' +version = '0.15.0.1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: correctly handle see-other-host (earlier in the connectio...
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 73d9c50e6736 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=73d9c50e6736 description: correctly handle see-other-host (earlier in the connection process). Fixes #7179 diffstat: src/common/connection.py | 5 +++++ src/common/connection_handlers.py | 3 +-- src/common/connection_handlers_events.py | 6 ++++-- src/common/resolver.py | 2 ++ src/common/xmpp/client_nb.py | 11 ++++++++--- src/common/xmpp/dispatcher_nb.py | 3 +++ 6 files changed, 23 insertions(+), 7 deletions(-) diffs (132 lines): diff -r 02abfa8a4a5f -r 73d9c50e6736 src/common/connection.py --- a/src/common/connection.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/connection.py Tue Jun 19 19:19:24 2012 +0200 @@ -1139,6 +1139,10 @@ self._disconnectedReconnCB() def connect_to_next_type(self, retry=False): + if self.redirected: + self.disconnect(on_purpose=True) + self.connect() + return if len(self._connection_types): self._current_type = self._connection_types.pop(0) if self.last_connection: @@ -1199,6 +1203,7 @@ on_connect=self.on_connect_success, on_proxy_failure=self.on_proxy_failure, on_connect_failure=self.connect_to_next_type, + on_stream_error_cb=self._StreamCB, proxy=self._proxy, secure_tuple = secure_tuple) diff -r 02abfa8a4a5f -r 73d9c50e6736 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/connection_handlers.py Tue Jun 19 19:19:24 2012 +0200 @@ -1254,6 +1254,7 @@ PrivateStorageRosternotesReceivedEvent) gajim.nec.register_incoming_event(RosternotesReceivedEvent) gajim.nec.register_incoming_event(StreamConflictReceivedEvent) + gajim.nec.register_incoming_event(StreamOtherHostReceivedEvent) gajim.nec.register_incoming_event(MessageReceivedEvent) gajim.nec.register_incoming_event(ArchivingErrorReceivedEvent) gajim.nec.register_incoming_event( @@ -1988,8 +1989,6 @@ if obj.conn.name != self.name: return self.redirected = obj.redirected - self.disconnect(on_purpose=True) - self.connect() def _StreamCB(self, con, iq_obj): log.debug('StreamCB') diff -r 02abfa8a4a5f -r 73d9c50e6736 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/connection_handlers_events.py Tue Jun 19 19:19:24 2012 +0200 @@ -689,8 +689,10 @@ base_network_events = ['stream-received'] def generate(self): - other_host = obj.getTag('see-other-host') - if other_host and self.conn.last_connection_type in ('ssl', 'tls'): + self.conn = self.base_event.conn + self.stanza = self.base_event.stanza + other_host = self.stanza.getTag('see-other-host') + if other_host and self.conn._current_type in ('ssl', 'tls'): host = other_host.getData() if ':' in host: host_l = host.split(':', 1) diff -r 02abfa8a4a5f -r 73d9c50e6736 src/common/resolver.py --- a/src/common/resolver.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/resolver.py Tue Jun 19 19:19:24 2012 +0200 @@ -63,6 +63,7 @@ self.handlers = {} def resolve(self, host, on_ready, type='srv'): + host = host.lower() log.debug('resolve %s type=%s' % (host, type)) assert(type in ['srv', 'txt']) if not host: @@ -88,6 +89,7 @@ def _on_ready(self, host, type, result_list): # practically it is impossible to be the opposite, but who knows :) + host = host.lower() log.debug('Resolving result for %s: %s' % (host, result_list)) if not self.resolved_hosts.has_key(host+type): self.resolved_hosts[host+type] = result_list diff -r 02abfa8a4a5f -r 73d9c50e6736 src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/xmpp/client_nb.py Tue Jun 19 19:19:24 2012 +0200 @@ -67,6 +67,7 @@ self.on_connect_failure = None self.proxy = None self.got_features = False + self.got_see_other_host = None self.stream_started = False self.disconnecting = False self.protocol_type = 'XMPP' @@ -138,8 +139,8 @@ self.disconnecting = False def connect(self, on_connect, on_connect_failure, hostname=None, port=5222, - on_proxy_failure=None, proxy=None, secure_tuple=('plain', None, - None)): + on_proxy_failure=None, on_stream_error_cb=None, proxy=None, + secure_tuple=('plain', None, None)): """ Open XMPP connection (open XML streams in both directions) @@ -161,6 +162,7 @@ self.on_connect = on_connect self.on_connect_failure=on_connect_failure self.on_proxy_failure = on_proxy_failure + self.on_stream_error_cb = on_stream_error_cb self.desired_security, self.cacerts, self.mycerts = secure_tuple self.Connection = None self.Port = port @@ -350,7 +352,10 @@ # sometimes <features> are received together with document # attributes and sometimes on next receive... self.Dispatcher.ProcessNonBlocking(data) - if not self.got_features: + if self.got_see_other_host: + log.info('got see-other-host') + self.on_stream_error_cb(self, self.got_see_other_host) + elif not self.got_features: self._xmpp_connect_machine( mode='FAILURE', data='Missing <features> in 1.0 stream') diff -r 02abfa8a4a5f -r 73d9c50e6736 src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/xmpp/dispatcher_nb.py Tue Jun 19 19:19:24 2012 +0200 @@ -415,6 +415,9 @@ if name == 'features': self._owner.got_features = True session.Stream.features = stanza + if name == 'error': + if stanza.getTag('see-other-host'): + self._owner.got_see_other_host = stanza xmlns = stanza.getNamespace()

1 0

gajim: make tooltip colors configurable. Fixes #7165
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 9939e4c2a4b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9939e4c2a4b8 description: make tooltip colors configurable. Fixes #7165 diffstat: src/common/config.py | 12 ++++++++++++ src/tooltips.py | 39 ++++++++++++++++++++++++--------------- 2 files changed, 36 insertions(+), 15 deletions(-) diffs (109 lines): diff -r 239ec662de5a -r 9939e4c2a4b8 src/common/config.py --- a/src/common/config.py Sat Jun 16 13:51:54 2012 +0200 +++ b/src/common/config.py Sat Jun 16 22:58:46 2012 +0200 @@ -213,6 +213,18 @@ 'roster_avatar_height': [opt_int, 32], 'tooltip_avatar_width': [opt_int, 125], 'tooltip_avatar_height': [opt_int, 125], + 'tooltip_status_online_color': [opt_color, '#73D216'], + 'tooltip_status_free_for_chat_color': [opt_color, '#3465A4'], + 'tooltip_status_away_color': [opt_color, '#EDD400'], + 'tooltip_status_busy_color': [opt_color, '#F57900'], + 'tooltip_status_na_color': [opt_color, '#CC0000'], + 'tooltip_status_offline_color': [opt_color, '#555753'], + 'tooltip_affiliation_none_color': [opt_color, '#555753'], + 'tooltip_affiliation_member_color': [opt_color, '#73D216'], + 'tooltip_affiliation_administrator_color': [opt_color, '#F57900'], + 'tooltip_affiliation_owner_color': [opt_color, '#CC0000'], + 'tooltip_account_name_color': [opt_color, '#888A85'], + 'tooltip_idle_color': [opt_color, '#888A85'], 'vcard_avatar_width': [opt_int, 200], 'vcard_avatar_height': [opt_int, 200], 'notification_preview_message': [opt_bool, True, _('Preview new messages in notification popup?')], diff -r 239ec662de5a -r 9939e4c2a4b8 src/tooltips.py --- a/src/tooltips.py Sat Jun 16 13:51:54 2012 +0200 +++ b/src/tooltips.py Sat Jun 16 22:58:46 2012 +0200 @@ -181,18 +181,21 @@ semantics. Color palette is the Tango. """ formatted = "%s" + color = None if status.startswith(Q_("?user status:Available")): - status = formatted % ('#73D216', status) + color = gajim.config.get('tooltip_status_online_color') elif status.startswith(_("Free for Chat")): - status = formatted % ('#3465A4', status) + color = gajim.config.get('tooltip_status_free_for_chat_color') elif status.startswith(_("Away")): - status = formatted % ('#EDD400', status) + color = gajim.config.get('tooltip_status_away_color') elif status.startswith(_("Busy")): - status = formatted % ('#F57900', status) + color = gajim.config.get('tooltip_status_busy_color') elif status.startswith(_("Not Available")): - status = formatted % ('#CC0000', status) + color = gajim.config.get('tooltip_status_na_color') elif status.startswith(_("Offline")): - status = formatted % ('#555753', status) + color = gajim.config.get('tooltip_status_offline_color') + if color: + status = formatted % (color, status) return status @staticmethod @@ -202,14 +205,17 @@ it's semantics. Color palette is the Tango. """ formatted = "%s" + color = None if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")): - affiliation = formatted % ('#555753', affiliation) + color = gajim.conig.get('tooltip_affiliation_none_color') elif affiliation.startswith(_("Member")): - affiliation = formatted % ('#73D216', affiliation) + color = gajim.conig.get('tooltip_affiliation_member_color') elif affiliation.startswith(_("Administrator")): - affiliation = formatted % ('#F57900', affiliation) + color = gajim.conig.get('tooltip_affiliation_administrator_color') elif affiliation.startswith(_("Owner")): - affiliation = formatted % ('#CC0000', affiliation) + color = gajim.conig.get('tooltip_affiliation_owner_color') + if color: + affiliation = formatted % (color, affiliation) return affiliation class StatusTable: @@ -493,9 +499,9 @@ gobject.markup_escape_text(prim_contact.get_shown_name())\ + '' if gajim.config.get('mergeaccounts'): - name_markup += u" (" + \ - gobject.markup_escape_text(prim_contact.account.name) \ - + ')' + name_markup += u" (%s)" % ( + gajim.config.get('tooltip_account_name_color'), + gobject.markup_escape_text(prim_contact.account.name)) if self.account and helpers.jid_is_blocked(self.account, prim_contact.jid): @@ -528,7 +534,8 @@ iconset = gajim.config.get('iconset') if not iconset: iconset = 'dcraven' - file_path = os.path.join(helpers.get_iconset_path(iconset), '16x16') + file_path = os.path.join(helpers.get_iconset_path(iconset), + '16x16') contact_keys = sorted(contacts_dict.keys()) contact_keys.reverse() @@ -641,7 +648,9 @@ # is no meaningful difference between last activity time and # current time. if diff.days > 0 or diff.seconds > 0: - cs = "%s" + cs = "" % gajim.config.get( + 'tooltip_idle_color') + cs += '%s' properties.append((str(), None)) properties.append(((cs % _("Idle since %s")) % formatted, None)) properties.append(((cs % _("Idle for %s")) % str(diff), None))

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 2012