Commits

commits@gajim.org

17632 discussions

gajim: minor fixes
by Jefry Lagrange 07 Apr '12

07 Apr '12

changeset 06bd222f8cc3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=06bd222f8cc3 description: minor fixes diffstat: src/common/jingle_ft.py | 24 ++++++++++-------------- src/common/jingle_ftstates.py | 2 +- src/common/xmpp/protocol.py | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diffs (88 lines): diff -r fb50d3e9179e -r 06bd222f8cc3 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Apr 04 21:04:23 2012 -0400 +++ b/src/common/jingle_ft.py Sat Apr 07 00:56:44 2012 -0400 @@ -33,17 +33,16 @@ STATE_NOT_STARTED = 0 STATE_INITIALIZED = 1 -STATE_ACCEPTED = 2 # We send the candidates and we are waiting for a reply -STATE_CAND_SENT = 3 +STATE_CAND_SENT = 2 # We received the candidates and we are waiting to reply -STATE_CAND_RECEIVED = 4 +STATE_CAND_RECEIVED = 3 # We have sent and received the candidates # This also includes any candidate-error received or sent -STATE_CAND_SENT_AND_RECEIVED = 5 -STATE_TRANSPORT_REPLACE = 6 +STATE_CAND_SENT_AND_RECEIVED = 4 +STATE_TRANSPORT_REPLACE = 5 # We are transfering the file -STATE_TRANSFERING = 7 +STATE_TRANSFERING = 6 class JingleFileTransfer(JingleContent): @@ -264,11 +263,9 @@ def __transport_setup(self, stanza=None, content=None, error=None, action=None): # Sets up a few transport specific things for the file transfer - # TODO: Do this inside of a state class - if self.transport.type == TransportType.SOCKS5: - self._listen_host() if self.transport.type == TransportType.IBB: + # No action required, just set the state to transfering self.state = STATE_TRANSFERING @@ -283,15 +280,14 @@ 'sendCand' : True} self.nominated_cand['our-cand'] = streamhost - if self.state == STATE_CAND_RECEIVED: - self.__state_changed(STATE_CAND_SENT_AND_RECEIVED, args) - else: - self.__state_changed(STATE_CAND_SENT, args) - + self.__sendCand(args) def _on_connect_error(self, sid): log.info('connect error, sid=' + sid) args = {'candError' : True} + self.__sendCand(args) + + def __sendCand(self, args): if self.state == STATE_CAND_RECEIVED: self.__state_changed(STATE_CAND_SENT_AND_RECEIVED, args) else: diff -r fb50d3e9179e -r 06bd222f8cc3 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Wed Apr 04 21:04:23 2012 -0400 +++ b/src/common/jingle_ftstates.py Sat Apr 07 00:56:44 2012 -0400 @@ -37,12 +37,12 @@ ''' def action(self, args=None): + self.jft._listen_host() if self.jft.weinitiate: # update connection's fileprops self.jft.session.connection.files_props[self.jft.file_props['sid']] = \ self.jft.file_props # Listen on configured port for file transfer - self.jft._listen_host() # TODO: Rename this to listen_host() else: # Add file_props to the queue if not gajim.socks5queue.get_file_props( diff -r fb50d3e9179e -r 06bd222f8cc3 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Wed Apr 04 21:04:23 2012 -0400 +++ b/src/common/xmpp/protocol.py Sat Apr 07 00:56:44 2012 -0400 @@ -90,7 +90,7 @@ 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:1' # XEP-0234 +NS_JINGLE_FILE_TRANSFER ='urn:xmpp:jingle:apps:file-transfer:3' # 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

1 0

gajim: refactoring: implemented state machine pattern
by Jefry Lagrange 05 Apr '12

05 Apr '12

changeset fb50d3e9179e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fb50d3e9179e description: refactoring: implemented state machine pattern diffstat: src/common/jingle_ft.py | 203 +++++++--------------------------- src/common/jingle_ftstates.py | 244 ++++++++++++++++++++++++++++++++++++++++++ src/common/jingle_session.py | 1 - 3 files changed, 288 insertions(+), 160 deletions(-) diffs (truncated from 579 to 300 lines): diff -r c75a03d9cdf9 -r fb50d3e9179e src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Mar 22 00:56:11 2012 -0400 +++ b/src/common/jingle_ft.py Wed Apr 04 21:04:23 2012 -0400 @@ -22,13 +22,13 @@ import gajim import xmpp from jingle_content import contents, JingleContent -from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5 -from jingle_transport import JingleTransportIBB, TransportType +from jingle_transport import * from common import helpers from common.socks5 import Socks5ReceiverClient, Socks5SenderClient from common.connection_handlers_events import FileRequestReceivedEvent import threading import logging +from jingle_ftstates import * log = logging.getLogger('gajim.c.jingle_ft') STATE_NOT_STARTED = 0 @@ -68,8 +68,6 @@ self.callbacks['transport-info'] += [self.__on_transport_info] self.callbacks['iq-result'] += [self.__on_iq_result] - self.state = STATE_NOT_STARTED - self.use_security = use_security self.file_props = file_props @@ -100,8 +98,21 @@ self.session = session self.media = 'file' self.nominated_cand = {} - - + + self.state = STATE_NOT_STARTED + self.states = {STATE_INITIALIZED : StateInitialized(self), + STATE_CAND_SENT : StateCandSent(self), + STATE_CAND_RECEIVED : StateCandReceived(self), + STATE_TRANSFERING : StateTransfering(self), + STATE_TRANSPORT_REPLACE : StateTransportReplace(self), + STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) + } + + def __state_changed(self, nextstate, args=None): + # Executes the next state action and sets the next state + st = self.states[nextstate] + st.action(args) + self.state = nextstate def __on_session_initiate(self, stanza, content, error, action): gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, @@ -148,7 +159,7 @@ response.delChild(response.getQuery()) con.connection.send(response) # We send the file - self.__start_IBB_transfer(con) + self.__state_changed(STATE_TRANSFERING) raise xmpp.NodeProcessed self.file_props['streamhosts'] = self.transport.remote_candidates @@ -170,12 +181,11 @@ fingerprint = 'client' if self.transport.type == TransportType.SOCKS5: gajim.socks5queue.connect_to_hosts(self.session.connection.name, - self.file_props['sid'], self.send_candidate_used, + self.file_props['sid'], self.on_connect, self._on_connect_error, fingerprint=fingerprint, receiving=False) - elif self.transport.type == TransportType.IBB: - self.state = STATE_TRANSFERING - self.__start_IBB_transfer(self.session.connection) + return + self.__state_changed(STATE_TRANSFERING) raise xmpp.NodeProcessed def __on_session_terminate(self, stanza, content, error, action): @@ -203,16 +213,16 @@ not self.nominated_cand['peer-cand']: if not self.weinitiate: return - self.session.transport_replace() + self.__state_changed(STATE_TRANSPORT_REPLACE) else: response = stanza.buildReply('result') response.delChild(response.getQuery()) self.session.connection.connection.send(response) - self.start_transfer() + self.__state_changed(STATE_TRANSFERING) raise xmpp.NodeProcessed else: - self.state = STATE_CAND_RECEIVED - + args = {'candError' : True} + self.__state_changed(STATE_CAND_RECEIVED, args) return if content.getTag('transport').getTag('activated'): @@ -222,73 +232,39 @@ self.session.connection.name, 'client') return - streamhost_cid = content.getTag('transport').getTag('candidate-used').\ - getAttr('cid') - streamhost_used = None - for cand in self.transport.candidates: - if cand['candidate_id'] == streamhost_cid: - streamhost_used = cand - break - if streamhost_used == None: - log.info("unknow streamhost") - return - # We save the candidate nominated by peer - self.nominated_cand['peer-cand'] = streamhost_used + args = {'content' : content, + 'sendCand' : False} if self.state == STATE_CAND_SENT: + self.__state_changed(STATE_CAND_SENT_AND_RECEIVED, args) response = stanza.buildReply('result') response.delChild(response.getQuery()) self.session.connection.connection.send(response) - self.start_transfer() + self.__state_changed(STATE_TRANSFERING) raise xmpp.NodeProcessed else: - self.state = STATE_CAND_RECEIVED + self.__state_changed(STATE_CAND_RECEIVED, args) def __on_iq_result(self, stanza, content, error, action): log.info("__on_iq_result") - if self.weinitiate and self.state == STATE_NOT_STARTED: - self.state = STATE_INITIALIZED - self.session.connection.files_props[self.file_props['sid']] = \ - self.file_props - # Listen on configured port for file transfer - self._listen_host() - - elif not self.weinitiate and self.state == STATE_NOT_STARTED: - # session-accept iq-result - if not self.negotiated: - return - self.state = STATE_ACCEPTED - if not gajim.socks5queue.get_file_props( - self.session.connection.name, self.file_props['sid']): - gajim.socks5queue.add_file_props(self.session.connection.name, - self.file_props) - fingerprint = None - if self.use_security: - fingerprint = 'client' - gajim.socks5queue.connect_to_hosts(self.session.connection.name, - self.file_props['sid'], self.send_candidate_used, - self._on_connect_error, fingerprint=fingerprint) + if self.state == STATE_NOT_STARTED: + self.__state_changed(STATE_INITIALIZED) elif self.state == STATE_CAND_SENT_AND_RECEIVED: if not self.nominated_cand['our-cand'] and \ not self.nominated_cand['peer-cand']: if not self.weinitiate: return - self.session.transport_replace() + self.__state_changed(STATE_TRANSPORT_REPLACE) return # initiate transfer - self.start_transfer() + self.__state_changed(STATE_TRANSFERING) - def __start_IBB_transfer(self, con): - con.files_props[self.file_props['sid']] = self.file_props - fp = open(self.file_props['file-name'], 'r') - con.OpenStream( self.transport.sid, self.session.peerjid, fp, - blocksize=4096) - def __transport_setup(self, stanza=None, content=None, error=None, action=None): # Sets up a few transport specific things for the file transfer + # TODO: Do this inside of a state class if self.transport.type == TransportType.SOCKS5: self._listen_host() @@ -296,48 +272,30 @@ self.state = STATE_TRANSFERING - def send_candidate_used(self, streamhost): + def on_connect(self, streamhost): """ send candidate-used stanza """ log.info('send_candidate_used') if streamhost is None: return + args = {'streamhost' : streamhost, + 'sendCand' : True} self.nominated_cand['our-cand'] = streamhost if self.state == STATE_CAND_RECEIVED: - self.state = STATE_CAND_SENT_AND_RECEIVED + self.__state_changed(STATE_CAND_SENT_AND_RECEIVED, args) else: - self.state = STATE_CAND_SENT - - content = xmpp.Node('content') - content.setAttr('creator', 'initiator') - content.setAttr('name', self.name) - - transport = xmpp.Node('transport') - transport.setNamespace(xmpp.NS_JINGLE_BYTESTREAM) - transport.setAttr('sid', self.transport.sid) - - candidateused = xmpp.Node('candidate-used') - candidateused.setAttr('cid', streamhost['cid']) - - transport.addChild(node=candidateused) - content.addChild(node=transport) - - self.session.send_transport_info(content) + self.__state_changed(STATE_CAND_SENT, args) def _on_connect_error(self, sid): - self.nominated_cand['our-cand'] = False - self.send_error_candidate() - + log.info('connect error, sid=' + sid) + args = {'candError' : True} if self.state == STATE_CAND_RECEIVED: - self.state = STATE_CAND_SENT_AND_RECEIVED + self.__state_changed(STATE_CAND_SENT_AND_RECEIVED, args) else: - self.state = STATE_CAND_SENT - - - log.info('connect error, sid=' + sid) + self.__state_changed(STATE_CAND_SENT, args) def _fill_content(self, content): description_node = xmpp.simplexml.Node( @@ -415,79 +373,6 @@ return self.weinitiate - def start_transfer(self): - - self.state = STATE_TRANSFERING - - # It tells wether we start the transfer as client or server - mode = None - - if self.isOurCandUsed(): - mode = 'client' - streamhost_used = self.nominated_cand['our-cand'] - else: - mode = 'server' - streamhost_used = self.nominated_cand['peer-cand'] - - if streamhost_used['type'] == 'proxy': - self.file_props['is_a_proxy'] = True - if self.weinitiate: - self.file_props['proxy_sender'] = streamhost_used['initiator'] - self.file_props['proxy_receiver'] = streamhost_used['target'] - else: - self.file_props['proxy_sender'] = streamhost_used['target'] - self.file_props['proxy_receiver'] = streamhost_used['initiator'] - - if not self.weinitiate and streamhost_used['type'] == 'proxy': - r = gajim.socks5queue.readers - for reader in r: - if r[reader].host == streamhost_used['host'] and \ - r[reader].connected: - return - - if self.weinitiate and streamhost_used['type'] == 'proxy': - s = gajim.socks5queue.senders - for sender in s: - if s[sender].host == streamhost_used['host'] and \ - s[sender].connected: - return - - if streamhost_used['type'] == 'proxy': - self.file_props['streamhost-used'] = True - streamhost_used['sid'] = self.file_props['sid'] - self.file_props['streamhosts'] = [] - self.file_props['streamhosts'].append(streamhost_used) - self.file_props['proxyhosts'] = [] - self.file_props['proxyhosts'].append(streamhost_used) - - if self.weinitiate: - gajim.socks5queue.idx += 1 - idx = gajim.socks5queue.idx - sockobj = Socks5SenderClient(gajim.idlequeue, idx, - gajim.socks5queue, _sock=None, - host=str(streamhost_used['host']), - port=int(streamhost_used['port']), fingerprint=None, - connected=False, file_props=self.file_props) - else: - sockobj = Socks5ReceiverClient(gajim.idlequeue, streamhost_used, - sid=self.file_props['sid'],

1 0

gajim: don't commit SQL request too fast to improve performences...
by Yann Leboulanger 03 Apr '12

03 Apr '12

changeset 8513eb020fa8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8513eb020fa8 description: don't commit SQL request too fast to improve performences. Fixes #6905 diffstat: src/common/logger.py | 49 ++++++++++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 19 deletions(-) diffs (121 lines): diff -r b509d1435857 -r 8513eb020fa8 src/common/logger.py --- a/src/common/logger.py Sun Apr 01 20:17:05 2012 +0200 +++ b/src/common/logger.py Tue Apr 03 19:38:15 2012 +0200 @@ -34,6 +34,7 @@ import datetime from gzip import GzipFile from cStringIO import StringIO +import gobject import exceptions import gajim @@ -106,6 +107,7 @@ def __init__(self): self.jids_already_in = [] # holds jids that we already have in DB self.con = None + self.commit_timout_id = None if not os.path.exists(LOG_DB_PATH): # this can happen only the first time (the time we create the db) @@ -163,15 +165,25 @@ self.open_db() self.get_jids_already_in_db() + def _really_commit(self): + try: + self.con.commit() + except sqlite.OperationalError, e: + print >> sys.stderr, str(e) + self.commit_timout_id = None + return False + + def _timeout_commit(self): + if self.commit_timout_id: + return + self.commit_timout_id = gobject.timeout_add(500, self._really_commit) + def simple_commit(self, sql_to_commit): """ Helper to commit """ self.cur.execute(sql_to_commit) - try: - self.con.commit() - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + self._timeout_commit() def get_jids_already_in_db(self): try: @@ -398,12 +410,14 @@ except sqlite.OperationalError, e: raise exceptions.PysqliteOperationalError(str(e)) message_id = None - try: - self.con.commit() - if write_unread: + if write_unread: + try: + self.con.commit() message_id = self.cur.lastrowid - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + except sqlite.OperationalError, e: + print >> sys.stderr, str(e) + else: + self._timeout_commit() if message_id: self.insert_unread_events(message_id, values[0]) return message_id @@ -922,10 +936,7 @@ VALUES (?, ?, ?, ?); ''', (hash_method, hash_, buffer(data), int(time.time()))) # (1) -- note above - try: - self.con.commit() - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + self._timeout_commit() def update_caps_time(self, method, hash_): sql = '''UPDATE caps_cache SET last_seen = %d @@ -963,9 +974,9 @@ # Fill roster tables with the new roster for jid in roster: self.add_or_update_contact(account_jid, jid, roster[jid]['name'], - roster[jid]['subscription'], roster[jid]['ask'], - roster[jid]['groups'], commit=False) - self.con.commit() + roster[jid]['subscription'], roster[jid]['ask'], + roster[jid]['groups'], commit=False) + self._timeout_commit() # At this point, we are sure the replacement works properly so we can # set the new roster_version value. @@ -987,7 +998,7 @@ self.cur.execute( 'DELETE FROM roster_entry WHERE account_jid_id=? AND jid_id=?', (account_jid_id, jid_id)) - self.con.commit() + self._timeout_commit() def add_or_update_contact(self, account_jid, jid, name, sub, ask, groups, commit=True): @@ -1022,7 +1033,7 @@ self.convert_human_subscription_values_to_db_api_values(sub), bool(ask))) if commit: - self.con.commit() + self._timeout_commit() def get_roster(self, account_jid): """ @@ -1075,7 +1086,7 @@ (account_jid_id,)) self.cur.execute('DELETE FROM roster_group WHERE account_jid_id=?', (account_jid_id,)) - self.con.commit() + self._timeout_commit() def save_if_not_exists(self, with_, direction, tim, msg='', nick=None): if tim:

1 0

gajim: we require PyGTK2.22 for InfoBar
by Yann Leboulanger 01 Apr '12

01 Apr '12

changeset b509d1435857 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b509d1435857 description: we require PyGTK2.22 for InfoBar diffstat: README.html | 2 +- debian/control | 2 +- src/gajim.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diffs (46 lines): diff -r dfd58bb1ad06 -r b509d1435857 README.html --- a/README.html Sun Apr 01 19:49:52 2012 +0200 +++ b/README.html Sun Apr 01 20:17:05 2012 +0200 @@ -15,7 +15,7 @@ <h2>Runtime Requirements</h2> <ul> <li>python2.5 or higher</li> -<li>pygtk2.16 or higher</li> +<li>pygtk2.22 or higher</li> </ul> <h2>Optional Runtime Requirements</h2> diff -r dfd58bb1ad06 -r b509d1435857 debian/control --- a/debian/control Sun Apr 01 19:49:52 2012 +0200 +++ b/debian/control Sun Apr 01 20:17:05 2012 +0200 @@ -10,7 +10,7 @@ Package: gajim Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.16.0), dnsutils +Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.22.0), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-openssl (>= 0.12), python-crypto, python-pyasn1 Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farstream, gstreamer0.10-plugins-ugly, python-pycurl Description: Jabber client written in PyGTK diff -r dfd58bb1ad06 -r b509d1435857 src/gajim.py --- a/src/gajim.py Sun Apr 01 19:49:52 2012 +0200 +++ b/src/gajim.py Sun Apr 01 20:17:05 2012 +0200 @@ -233,12 +233,12 @@ elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'): libc.setproctitle('gajim') - if gtk.pygtk_version < (2, 16, 0): - pritext = _('Gajim needs PyGTK 2.16 or above') - sectext = _('Gajim needs PyGTK 2.16 or above to run. Quiting...') - elif gtk.gtk_version < (2, 16, 0): - pritext = _('Gajim needs GTK 2.16 or above') - sectext = _('Gajim needs GTK 2.16 or above to run. Quiting...') + if gtk.pygtk_version < (2, 22, 0): + pritext = _('Gajim needs PyGTK 2.22 or above') + sectext = _('Gajim needs PyGTK 2.22 or above to run. Quiting...') + elif gtk.gtk_version < (2, 22, 0): + pritext = _('Gajim needs GTK 2.22 or above') + sectext = _('Gajim needs GTK 2.22 or above to run. Quiting...') from common import check_paths

1 0

gajim: [Olivier Crete] port Gajim to use Farstream instead of Fa...
by Yann Leboulanger 01 Apr '12

01 Apr '12

changeset dfd58bb1ad06 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dfd58bb1ad06 description: [Olivier Crete] port Gajim to use Farstream instead of Farsight2. Fixes #7113 diffstat: debian/README.Debian | 2 +- debian/control | 2 +- src/chat_control.py | 10 ++-- src/common/gajim.py | 10 ++-- src/common/helpers.py | 2 +- src/common/jingle.py | 2 +- src/common/jingle_rtp.py | 79 ++++++++++++++++++++--------------------- src/common/jingle_transport.py | 32 ++++++++-------- src/features_window.py | 8 ++-- 9 files changed, 72 insertions(+), 75 deletions(-) diffs (truncated from 427 to 300 lines): diff -r 0f94fd42abba -r dfd58bb1ad06 debian/README.Debian --- a/debian/README.Debian Sun Apr 01 19:47:11 2012 +0200 +++ b/debian/README.Debian Sun Apr 01 19:49:52 2012 +0200 @@ -1,7 +1,7 @@ gajim for Debian ---------------- -For video chat support, you have to install python-farsight. +For video chat support, you have to install python-farstream. -- Yann Le Boulanger <asterix(a)lagaule.org>, Mon, 20 Jun 2005 12:02:31 +0200 -- Julien Valroff <julien(a)debian.org> Sat, 07 May 2011 13:50:27 +0200 diff -r 0f94fd42abba -r dfd58bb1ad06 debian/control --- a/debian/control Sun Apr 01 19:47:11 2012 +0200 +++ b/debian/control Sun Apr 01 19:49:52 2012 +0200 @@ -12,7 +12,7 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.16.0), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-openssl (>= 0.12), python-crypto, python-pyasn1 -Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly, python-pycurl +Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farstream, gstreamer0.10-plugins-ugly, python-pycurl Description: Jabber client written in PyGTK Gajim is a Jabber client. It has a tabbed user interface with normal chats, group chats, and has many features such as, TLS, GPG, SSL, multiple accounts, diff -r 0f94fd42abba -r dfd58bb1ad06 src/chat_control.py --- a/src/chat_control.py Sun Apr 01 19:47:11 2012 +0200 +++ b/src/chat_control.py Sun Apr 01 19:49:52 2012 +0200 @@ -1649,15 +1649,15 @@ self.restore_conversation() self.msg_textview.grab_focus() - # change tooltip text for audio and video buttons if python-farsight is + # change tooltip text for audio and video buttons if python-farstream is # not installed - if not gajim.HAVE_FARSIGHT: + if not gajim.HAVE_FARSTREAM: tooltip_text = self._audio_button.get_tooltip_text() self._audio_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) tooltip_text = self._video_button.get_tooltip_text() self._video_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) gajim.ged.register_event_handler('pep-received', ged.GUI1, self._nec_pep_received) @@ -1705,7 +1705,7 @@ # Jingle detection if self.contact.supports(NS_JINGLE_ICE_UDP) and \ - gajim.HAVE_FARSIGHT and self.contact.resource: + gajim.HAVE_FARSTREAM and self.contact.resource: self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) else: diff -r 0f94fd42abba -r dfd58bb1ad06 src/common/gajim.py --- a/src/common/gajim.py Sun Apr 01 19:47:11 2012 +0200 +++ b/src/common/gajim.py Sun Apr 01 19:49:52 2012 +0200 @@ -169,21 +169,21 @@ # read. HAVE_LATEX = False -HAVE_FARSIGHT = True +HAVE_FARSTREAM = True try: - farsight = __import__('farsight') + farstream = __import__('farstream') import gst import glib try: conference = gst.element_factory_make('fsrtpconference') - session = conference.new_session(farsight.MEDIA_TYPE_AUDIO) + session = conference.new_session(farstream.MEDIA_TYPE_AUDIO) del session del conference except glib.GError: - HAVE_FARSIGHT = False + HAVE_FARSTREAM = False except ImportError: - HAVE_FARSIGHT = False + HAVE_FARSTREAM = False HAVE_UPNP_IGD = True try: diff -r 0f94fd42abba -r dfd58bb1ad06 src/common/helpers.py --- a/src/common/helpers.py Sun Apr 01 19:47:11 2012 +0200 +++ b/src/common/helpers.py Sun Apr 01 19:49:52 2012 +0200 @@ -1330,7 +1330,7 @@ gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION) if gajim.config.get_per('accounts', a, 'answer_receipts'): gajim.gajim_optional_features[a].append(xmpp.NS_RECEIPTS) - if gajim.HAVE_FARSIGHT: + if gajim.HAVE_FARSTREAM: gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE) gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP) gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP_AUDIO) diff -r 0f94fd42abba -r dfd58bb1ad06 src/common/jingle.py --- a/src/common/jingle.py Sun Apr 01 19:47:11 2012 +0200 +++ b/src/common/jingle.py Sun Apr 01 19:49:52 2012 +0200 @@ -35,7 +35,7 @@ import gajim from jingle_session import JingleSession, JingleStates -if gajim.HAVE_FARSIGHT: +if gajim.HAVE_FARSTREAM: from jingle_rtp import JingleAudio, JingleVideo diff -r 0f94fd42abba -r dfd58bb1ad06 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Apr 01 19:47:11 2012 +0200 +++ b/src/common/jingle_rtp.py Sun Apr 01 19:49:52 2012 +0200 @@ -21,7 +21,7 @@ import socket import xmpp -import farsight, gst +import farstream, gst from glib import GError import gajim @@ -42,8 +42,8 @@ JingleContent.__init__(self, session, transport) self.media = media self._dtmf_running = False - self.farsight_media = {'audio': farsight.MEDIA_TYPE_AUDIO, - 'video': farsight.MEDIA_TYPE_VIDEO}[media] + self.farstream_media = {'audio': farstream.MEDIA_TYPE_AUDIO, + 'video': farstream.MEDIA_TYPE_VIDEO}[media] self.pipeline = None self.src_bin = None @@ -59,7 +59,7 @@ self.callbacks['session-terminate'] += [self.__stop] self.callbacks['session-terminate-sent'] += [self.__stop] - def setup_stream(self): + def setup_stream(self, on_src_pad_added): # pipeline and bus self.pipeline = gst.Pipeline() bus = self.pipeline.get_bus() @@ -68,13 +68,12 @@ # conference self.conference = gst.element_factory_make('fsrtpconference') - self.conference.set_property('sdes-cname', self.session.ourjid) self.pipeline.add(self.conference) self.funnel = None - self.p2psession = self.conference.new_session(self.farsight_media) + self.p2psession = self.conference.new_session(self.farstream_media) - participant = self.conference.new_participant(self.session.peerjid) + participant = self.conference.new_participant() # FIXME: Consider a workaround, here... # pidgin and telepathy-gabble don't follow the XEP, and it won't work # due to bad controlling-mode @@ -93,7 +92,9 @@ params['stun-ip'] = ip self.p2pstream = self.p2psession.new_stream(participant, - farsight.DIRECTION_RECV, 'nice', params) + farstream.DIRECTION_RECV) + self.p2pstream.connect('src-pad-added', on_src_pad_added) + self.p2pstream.set_transmitter('nice', params) def is_ready(self): return (JingleContent.is_ready(self) and self.candidates_ready) @@ -117,7 +118,7 @@ # FIXME: connectivity should not be etablished yet # Instead, it should be etablished after session-accept! if self.sent: - self.p2pstream.set_remote_candidates(candidates) + self.p2pstream.add_remote_candidates(candidates) def batch_dtmf(self, events): """ @@ -140,15 +141,14 @@ def _start_dtmf(self, event): if event in ('*', '#'): - event = {'*': farsight.DTMF_EVENT_STAR, - '#': farsight.DTMF_EVENT_POUND}[event] + event = {'*': farstream.DTMF_EVENT_STAR, + '#': farstream.DTMF_EVENT_POUND}[event] else: event = int(event) - self.p2psession.start_telephony_event(event, 2, - farsight.DTMF_METHOD_RTP_RFC4733) + self.p2psession.start_telephony_event(event, 2) def _stop_dtmf(self): - self.p2psession.stop_telephony_event(farsight.DTMF_METHOD_RTP_RFC4733) + self.p2psession.stop_telephony_event() def _fill_content(self, content): content.addChild(xmpp.NS_JINGLE_RTP + ' description', @@ -170,34 +170,33 @@ if message.type == gst.MESSAGE_ELEMENT: name = message.structure.get_name() log.debug('gst element message: %s: %s' % (name, message)) - if name == 'farsight-new-active-candidate-pair': + if name == 'farstream-new-active-candidate-pair': pass - elif name == 'farsight-recv-codecs-changed': + elif name == 'farstream-recv-codecs-changed': pass - elif name == 'farsight-codecs-changed': - if self.sent and self.p2psession.get_property('codecs-ready'): + elif name == 'farstream-codecs-changed': + if self.sent and self.p2psession.get_property('codecs'): self.send_description_info() - elif name == 'farsight-local-candidates-prepared': + elif name == 'farstream-local-candidates-prepared': self.candidates_ready = True if self.is_ready(): self.session.on_session_state_changed(self) - elif name == 'farsight-new-local-candidate': + elif name == 'farstream-new-local-candidate': candidate = message.structure['candidate'] self.transport.candidates.append(candidate) if self.sent: # FIXME: Is this case even possible? self.send_candidate(candidate) - elif name == 'farsight-component-state-changed': + elif name == 'farstream-component-state-changed': state = message.structure['state'] - if state == farsight.STREAM_STATE_FAILED: + if state == farstream.STREAM_STATE_FAILED: reason = xmpp.Node('reason') reason.setTag('failed-transport') self.session.remove_content(self.creator, self.name, reason) - elif name == 'farsight-error': - log.error('Farsight error #%d!\nMessage: %s\nDebug: %s' % ( + elif name == 'farstream-error': + log.error('Farstream error #%d!\nMessage: %s' % ( message.structure['error-no'], - message.structure['error-msg'], - message.structure['debug-msg'])) + message.structure['error-msg'])) elif message.type == gst.MESSAGE_ERROR: # TODO: Fix it to fallback to videotestsrc anytime an error occur, # or raise an error, Jingle way @@ -236,10 +235,10 @@ def on_negotiated(self): if self.accepted: if self.transport.remote_candidates: - self.p2pstream.set_remote_candidates(self.transport.remote_candidates) + self.p2pstream.add_remote_candidates(self.transport.remote_candidates) self.transport.remote_candidates = [] - # TODO: farsight.DIRECTION_BOTH only if senders='both' - self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH) + # TODO: farstream.DIRECTION_BOTH only if senders='both' + self.p2pstream.set_property('direction', farstream.DIRECTION_BOTH) JingleContent.on_negotiated(self) def __on_remote_codecs(self, stanza, content, error, action): @@ -252,8 +251,8 @@ if not codec['id'] or not codec['name'] or not codec['clockrate']: # ignore invalid payload-types continue - c = farsight.Codec(int(codec['id']), codec['name'], - self.farsight_media, int(codec['clockrate'])) + c = farstream.Codec(int(codec['id']), codec['name'], + self.farstream_media, int(codec['clockrate'])) if 'channels' in codec: c.channels = int(codec['channels']) else: @@ -318,7 +317,7 @@ self.out_volume.set_property('volume', vol) def setup_stream(self): - JingleRTPContent.setup_stream(self) + JingleRTPContent.setup_stream(self, self._on_src_pad_added) # Configure SPEEX # Workaround for psi (not needed since rev @@ -326,10 +325,10 @@ # place 16kHz before 8kHz, as buggy psi versions will take in # account only the first codec - codecs = [farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX', - farsight.MEDIA_TYPE_AUDIO, 16000), - farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX', - farsight.MEDIA_TYPE_AUDIO, 8000)] + codecs = [farstream.Codec(farstream.CODEC_ID_ANY, 'SPEEX', + farstream.MEDIA_TYPE_AUDIO, 16000), + farstream.Codec(farstream.CODEC_ID_ANY, 'SPEEX', + farstream.MEDIA_TYPE_AUDIO, 8000)] self.p2psession.set_codec_preferences(codecs) # the local parts @@ -348,9 +347,8 @@ self.src_bin.get_pad('src').link(self.p2psession.get_property( 'sink-pad')) - self.p2pstream.connect('src-pad-added', self._on_src_pad_added) - # The following is needed for farsight to process ICE requests:

1 0

gajim: revert unwanted change
by Yann Leboulanger 01 Apr '12

01 Apr '12

changeset 0f94fd42abba in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0f94fd42abba description: revert unwanted change diffstat: src/chat_control.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (32 lines): diff -r ab9d8cefa116 -r 0f94fd42abba src/chat_control.py --- a/src/chat_control.py Sun Apr 01 19:39:26 2012 +0200 +++ b/src/chat_control.py Sun Apr 01 19:47:11 2012 +0200 @@ -1649,15 +1649,15 @@ self.restore_conversation() self.msg_textview.grab_focus() - # change tooltip text for audio and video buttons if python-farstream is + # change tooltip text for audio and video buttons if python-farsight is # not installed - if not gajim.HAVE_FARSTREAM: + if not gajim.HAVE_FARSIGHT: tooltip_text = self._audio_button.get_tooltip_text() self._audio_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) tooltip_text = self._video_button.get_tooltip_text() self._video_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) gajim.ged.register_event_handler('pep-received', ged.GUI1, self._nec_pep_received) @@ -1705,7 +1705,7 @@ # Jingle detection if self.contact.supports(NS_JINGLE_ICE_UDP) and \ - gajim.HAVE_FARSTREAM and self.contact.resource: + gajim.HAVE_FARSIGHT and self.contact.resource: self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) else:

1 0

gajim: correctly forward unread printed messages to other resour...
by Yann Leboulanger 01 Apr '12

01 Apr '12

changeset ab9d8cefa116 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ab9d8cefa116 description: correctly forward unread printed messages to other resources. Fixes #7094 diffstat: src/chat_control.py | 14 +++++++------- src/common/commands.py | 18 +++++++++++------- src/common/events.py | 2 +- src/common/stanza_session.py | 2 +- src/gui_interface.py | 4 ++-- src/roster_window.py | 4 ++-- 6 files changed, 24 insertions(+), 20 deletions(-) diffs (142 lines): diff -r 371d3f267052 -r ab9d8cefa116 src/chat_control.py --- a/src/chat_control.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/chat_control.py Sun Apr 01 19:39:26 2012 +0200 @@ -981,8 +981,8 @@ show_in_systray = notify.get_show_in_systray(event, self.account, self.contact, type_) - event = gajim.events.create_event(type_, (self, msg_id), - show_in_roster=show_in_roster, + event = gajim.events.create_event(type_, (text, subject, self, + msg_id), show_in_roster=show_in_roster, show_in_systray=show_in_systray) gajim.events.add_event(self.account, full_jid, event) # We need to redraw contact if we show in roster @@ -1649,15 +1649,15 @@ self.restore_conversation() self.msg_textview.grab_focus() - # change tooltip text for audio and video buttons if python-farsight is + # change tooltip text for audio and video buttons if python-farstream is # not installed - if not gajim.HAVE_FARSIGHT: + if not gajim.HAVE_FARSTREAM: tooltip_text = self._audio_button.get_tooltip_text() self._audio_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) tooltip_text = self._video_button.get_tooltip_text() self._video_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) gajim.ged.register_event_handler('pep-received', ged.GUI1, self._nec_pep_received) @@ -1705,7 +1705,7 @@ # Jingle detection if self.contact.supports(NS_JINGLE_ICE_UDP) and \ - gajim.HAVE_FARSIGHT and self.contact.resource: + gajim.HAVE_FARSTREAM and self.contact.resource: self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) else: diff -r 371d3f267052 -r ab9d8cefa116 src/common/commands.py --- a/src/common/commands.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/common/commands.py Sun Apr 01 19:39:26 2012 +0200 @@ -56,10 +56,10 @@ assert status in ('executing', 'completed', 'canceled') response = request.buildReply('result') - cmd = response.addChild('command', namespace=xmpp.NS_COMMANDS, attrs={ - 'sessionid': self.sessionid, - 'node': self.commandnode, - 'status': status}) + cmd = response.getTag('command', namespace=xmpp.NS_COMMANDS) + cmd.setAttr('sessionid', self.sessionid) + cmd.setAttr('node', self.commandnode) + cmd.setAttr('status', status) if defaultaction is not None or actions is not None: if defaultaction is not None: assert defaultaction in ('cancel', 'execute', 'prev', 'next', @@ -277,13 +277,17 @@ def execute(self, request): account = self.connection.name # Forward messages - events = gajim.events.get_events(account, types=['chat', 'normal']) + events = gajim.events.get_events(account, types=['chat', 'normal', + 'printed_chat']) j, resource = gajim.get_room_and_nick_from_fjid(self.jid) for jid in events: for event in events[jid]: + ev_typ = event.type_ + if ev_typ == 'printed_chat': + ev_typ = 'chat' self.connection.send_message(j, event.parameters[0], '', - type_=event.type_, subject=event.parameters[1], - resource=resource, forward_from=jid, delayed=event.time_) + type_=ev_typ, subject=event.parameters[1], + resource=resource, forward_from=jid, delayed=event.time_) # Inform other client of completion response, cmd = self.buildResponse(request, status = 'completed') diff -r 371d3f267052 -r ab9d8cefa116 src/common/events.py --- a/src/common/events.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/common/events.py Sun Apr 01 19:39:26 2012 +0200 @@ -45,7 +45,7 @@ where kind in error, incoming file-*: file_props gc_msg: None - printed_chat: control + printed_chat: [message, subject, control, msg_id] printed_*: None messages that are already printed in chat, but not read gc-invitation: [room_jid, reason, password, is_continued] diff -r 371d3f267052 -r ab9d8cefa116 src/common/stanza_session.py --- a/src/common/stanza_session.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/common/stanza_session.py Sun Apr 01 19:39:26 2012 +0200 @@ -99,7 +99,7 @@ for event in gajim.events.get_events(self.conn.name, j, types=types): # the event wasn't in this session if (event.type_ == 'chat' and event.parameters[8] != self) or \ - (event.type_ == 'printed_chat' and event.parameters[0].session != \ + (event.type_ == 'printed_chat' and event.parameters[2].session != \ self): continue diff -r 371d3f267052 -r ab9d8cefa116 src/gui_interface.py --- a/src/gui_interface.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/gui_interface.py Sun Apr 01 19:39:26 2012 +0200 @@ -1560,7 +1560,7 @@ return if type_ == 'printed_chat': - ctrl = event.parameters[0] + ctrl = event.parameters[2] elif type_ == 'chat': session = event.parameters[8] ctrl = session.control @@ -1598,7 +1598,7 @@ event = gajim.events.get_first_event(account, jid, type_) if type_ == 'printed_pm': - ctrl = event.parameters[0] + ctrl = event.parameters[2] elif type_ == 'pm': session = event.parameters[8] diff -r 371d3f267052 -r ab9d8cefa116 src/roster_window.py --- a/src/roster_window.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/roster_window.py Sun Apr 01 19:39:26 2012 +0200 @@ -1871,9 +1871,9 @@ for ev in event_list: if ev.type_ != 'printed_chat': continue - if len(ev.parameters) > 1 and ev.parameters[1]: + if len(ev.parameters) > 3 and ev.parameters[3]: # There is a msg_id - msg_ids.append(ev.parameters[1]) + msg_ids.append(ev.parameters[3]) if msg_ids: gajim.logger.set_read_messages(msg_ids)

1 0

gajim: [Davide Pizzetti] updated italian translation
by Yann Leboulanger 29 Mar '12

29 Mar '12

changeset e1920c602015 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e1920c602015 description: [Davide Pizzetti] updated italian translation diffstat: po/it.po | 964 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 404 insertions(+), 560 deletions(-) diffs (truncated from 2881 to 300 lines): diff -r d0f31ee72397 -r e1920c602015 po/it.po --- a/po/it.po Thu Mar 22 20:15:42 2012 +0100 +++ b/po/it.po Thu Mar 29 19:17:52 2012 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-22 08:21+0100\n" +"POT-Creation-Date: 2012-03-18 12:16+0100\n" "PO-Revision-Date: 2009-08-19 23:53+0200\n" "Last-Translator: neoex <neoex.dc(a)gmail.com>\n" "Language-Team: Italian <>\n" @@ -22,7 +22,7 @@ #: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 msgid "Join _Group Chat..." -msgstr "Entra in chat di _gruppo..." +msgstr "Entra in una conversazione di _gruppo..." #: ../data/gui/account_context_menu.ui.h:2 msgid "_Add Contact..." @@ -64,7 +64,7 @@ "\n" "Please wait..." msgstr "" -"Connessione al server\n" +"Connessione al server in corso\n" "\n" "Attendere prego..." @@ -88,7 +88,6 @@ msgstr "" #: ../data/gui/account_creation_wizard_window.ui.h:10 -#, fuzzy msgid "Anon_ymous authentication" msgstr "Autenticazione anon_ima" @@ -98,12 +97,11 @@ #: ../data/gui/account_creation_wizard_window.ui.h:12 msgid "Gajim: Account Creation Wizard" -msgstr "Gajim: Assistente creazione account" +msgstr "Gajim: Assistente per la creazione di un account" #: ../data/gui/account_creation_wizard_window.ui.h:13 -#, fuzzy msgid "I already have an account I want to _use" -msgstr "Ho già un account da usare" +msgstr "Ho già un account che voglio _utilizzare" #: ../data/gui/account_creation_wizard_window.ui.h:14 msgid "I want to _register for a new account" @@ -137,7 +135,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:19 #: ../data/gui/accounts_window.ui.h:50 msgid "Save pass_word" -msgstr "Ricorda la pass_word" +msgstr "Salva la pass_word" #: ../data/gui/account_creation_wizard_window.ui.h:20 msgid "Set my profile when I connect" @@ -158,7 +156,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:24 #: ../data/gui/roster_window.ui.h:17 msgid "_Advanced" -msgstr "_Avanzato" +msgstr "_Avanzate" #: ../data/gui/account_creation_wizard_window.ui.h:25 msgid "_Finish" @@ -201,7 +199,6 @@ msgstr "Informazioni personali" #: ../data/gui/accounts_window.ui.h:4 -#, fuzzy msgid "Proxy" msgstr "Proxy" @@ -221,25 +218,22 @@ #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:8 ../src/dialogs.py:3386 #: ../src/dialogs.py:3432 -#, fuzzy msgid "Add" -msgstr "Indirizzo" +msgstr "Aggiungi" #: ../data/gui/accounts_window.ui.h:9 msgid "Administration operations" msgstr "Operazioni amministrative" #: ../data/gui/accounts_window.ui.h:10 -#, fuzzy msgid "Anonymous authentication" -msgstr "Usa autenticazione" +msgstr "Autenticazione anonima" #: ../data/gui/accounts_window.ui.h:11 msgid "Auto-reconnect when connection is lost" msgstr "Riconnetti automaticamente quando si perde la connessione" #: ../data/gui/accounts_window.ui.h:12 -#, fuzzy msgid "Browse..." msgstr "Sfoglia..." @@ -254,7 +248,7 @@ #: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" -msgstr "_Cambia password" +msgstr "_Cambia la password" #: ../data/gui/accounts_window.ui.h:16 msgid "" @@ -276,12 +270,10 @@ "Clicca per richiedere l'autorizzazione a tutti i contatti di un altro account" #: ../data/gui/accounts_window.ui.h:20 -#, fuzzy msgid "Client certificate" msgstr "Certificato del client" #: ../data/gui/accounts_window.ui.h:21 -#, fuzzy msgid "Co_nnect on Gajim startup" msgstr "C_onnetti all'avvio di Gajim" @@ -334,9 +326,8 @@ "possibilità di funzionare correttamente." #: ../data/gui/accounts_window.ui.h:29 -#, fuzzy msgid "If checked, Gajim will get the password from a GPG agent like seahorse" -msgstr "Se marcato, Gajim ricorderà la password per questo account" +msgstr "Se marcato, Gajim Otterrà la password da un agente GPG come seahorse" #: ../data/gui/accounts_window.ui.h:31 msgid "" @@ -447,16 +438,14 @@ msgstr "_Registra le conversazioni con tutti i contatti" #: ../data/gui/accounts_window.ui.h:51 -#, fuzzy msgid "Send _keep-alive packets" -msgstr "Invia pacchetti di keep-alive" +msgstr "Invia pacchetti di _keep-alive" #: ../data/gui/accounts_window.ui.h:52 msgid "Synch_ronize account status with global status" msgstr "Sinc_ronizza lo stato dell'account con lo stato globale" #: ../data/gui/accounts_window.ui.h:53 -#, fuzzy msgid "Synchroni_ze account status with global status" msgstr "Sinc_ronizza lo stato dell'account con lo stato globale" @@ -467,17 +456,15 @@ #: ../data/gui/accounts_window.ui.h:55 msgid "Use G_PG Agent" -msgstr "" +msgstr "Utilizza un agente G_PG" #: ../data/gui/accounts_window.ui.h:56 -#, fuzzy msgid "Use cust_om hostname/port" msgstr "Usa hostname/porta personalizzati" #: ../data/gui/accounts_window.ui.h:57 -#, fuzzy msgid "Use cust_om port:" -msgstr "Usa porta personalizzata:" +msgstr "Utilizza una porta personalizzata:" #: ../data/gui/accounts_window.ui.h:58 msgid "Use file transfer proxies" @@ -488,28 +475,23 @@ msgstr "File del certificato del _client" #: ../data/gui/accounts_window.ui.h:60 -#, fuzzy msgid "_Edit Personal Information..." msgstr "_Modifica le informazioni personali..." #. XML Console enable checkbutton #: ../data/gui/accounts_window.ui.h:61 ../data/gui/xml_console_window.ui.h:11 -#, fuzzy msgid "_Enable" msgstr "_Abilita" #: ../data/gui/accounts_window.ui.h:62 -#, fuzzy msgid "_Hostname: " msgstr "Nome dell'_host: " #: ../data/gui/accounts_window.ui.h:64 ../data/gui/preferences_window.ui.h:133 -#, fuzzy msgid "_Manage..." msgstr "_Gestisci..." #: ../data/gui/accounts_window.ui.h:66 -#, fuzzy msgid "_Port: " msgstr "_Porta:" @@ -564,7 +546,7 @@ #: ../data/gui/add_new_contact_window.ui.h:12 #: ../data/gui/manage_bookmarks_window.ui.h:7 msgid "_Nickname:" -msgstr "_Nickname:" +msgstr "_Soprannome:" #: ../data/gui/add_new_contact_window.ui.h:13 msgid "_Protocol:" @@ -605,9 +587,8 @@ msgstr "Descrizione errore..." #: ../data/gui/adhoc_commands_window.ui.h:6 -#, fuzzy msgid "F_inish" -msgstr "_Fine" +msgstr "_Finisci" #: ../data/gui/adhoc_commands_window.ui.h:7 msgid "Please wait while retrieving command list..." @@ -706,31 +687,28 @@ msgstr "" #: ../data/gui/archiving_preferences_window.ui.h:4 -#, fuzzy msgid "Auto" -msgstr "Partecipa automaticamente" +msgstr "" #: ../data/gui/archiving_preferences_window.ui.h:5 msgid "Concede" -msgstr "" +msgstr "Concedi" #: ../data/gui/archiving_preferences_window.ui.h:6 msgid "Forbid" -msgstr "" +msgstr "Vieta" #: ../data/gui/archiving_preferences_window.ui.h:7 -#, fuzzy msgid "No" -msgstr "Nessuno" +msgstr "No" #: ../data/gui/archiving_preferences_window.ui.h:8 -#, fuzzy msgid "Prefer" -msgstr "Preferenze" +msgstr "Preferisci" #: ../data/gui/archiving_preferences_window.ui.h:9 msgid "Yes" -msgstr "" +msgstr "Sì" #: ../data/gui/atom_entry_window.ui.h:1 msgid "Entry:" @@ -764,53 +742,48 @@ msgstr "_Sblocca" #: ../data/gui/change_activity_dialog.ui.h:1 -#, fuzzy msgid "Message: " -msgstr "Messaggi di stato predefiniti" +msgstr "Messaggio:" #: ../data/gui/change_activity_dialog.ui.h:2 msgid "Set Activity" -msgstr "" +msgstr "Imposta l'attività" #: ../data/gui/change_activity_dialog.ui.h:3 msgid "Set an activity" -msgstr "" +msgstr "Imposta un'attività" #: ../data/gui/change_mood_dialog.ui.h:1 -#, fuzzy msgid "Message:" -msgstr "Temi" +msgstr "Messaggio:" #: ../data/gui/change_mood_dialog.ui.h:2 -#, fuzzy msgid "Mood:" -msgstr "Suoni" +msgstr "Umore:" #: ../data/gui/change_password_dialog.ui.h:1 msgid "Change Password" -msgstr "Cambia password" +msgstr "Cambia la password"

1 0

gajim: fix pyopenssl version checking. Fixes #7124
by Yann Leboulanger 27 Mar '12

27 Mar '12

changeset 371d3f267052 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=371d3f267052 description: fix pyopenssl version checking. Fixes #7124 diffstat: src/common/check_X509.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 51acffd72b9a -r 371d3f267052 src/common/check_X509.py --- a/src/common/check_X509.py Tue Mar 27 14:50:26 2012 +0200 +++ b/src/common/check_X509.py Tue Mar 27 14:57:49 2012 +0200 @@ -5,8 +5,7 @@ import OpenSSL.SSL import OpenSSL.crypto ver = OpenSSL.__version__ - ver_l = [int(i) for i in ver.split('.')] - if ver_l < [0, 12]: + if ver < '0.12': raise ImportError from pyasn1.type import univ, constraint, char, namedtype, tag from pyasn1.codec.der.decoder import decode

1 0

gajim: [mathieui] make popup notification colors configurable. F...
by Yann Leboulanger 27 Mar '12

27 Mar '12

changeset 51acffd72b9a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=51acffd72b9a description: [mathieui] make popup notification colors configurable. Fixes #7127 diffstat: src/common/config.py | 9 +++++++++ src/dialogs.py | 18 +++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diffs (57 lines): diff -r d2c63469b86e -r 51acffd72b9a src/common/config.py --- a/src/common/config.py Sun Mar 25 16:15:25 2012 +0400 +++ b/src/common/config.py Tue Mar 27 14:50:26 2012 +0200 @@ -99,6 +99,15 @@ 'statusmsgcolor': [ opt_color, '#4e9a06', _('Status message text color.'), True ], 'markedmsgcolor': [ opt_color, '#ff8080', '', True ], 'urlmsgcolor': [ opt_color, '#204a87', '', True ], + 'notif_signin_color': [ opt_color, '#32CD32', _('Contact signed in notification color.') ], # limegreen + 'notif_signout_color': [ opt_color, '#FF0000', _('Contact signout notification color') ], # red + 'notif_message_color': [ opt_color, '#1E90FF', _('New message/email notification color.') ], # dodgerblue + 'notif_ftrequest_color': [ opt_color, '#F0E68C', _('File transfer request notification color.') ], # khaki + 'notif_fterror_color': [ opt_color, '#B22222', _('File transfer error notification color.') ], # firebrick + 'notif_ftcomplete_color': [ opt_color, '#9ACD32', _('File transfer complete or stopped notification color.') ], # yellowgreen + 'notif_invite_color': [ opt_color, '#D2B48C', _('Groupchat invitation notification color') ], # tan1 + 'notif_status_color': [ opt_color, '#D8BFD8', _('Status changed notification background color') ], # thistle2 + 'notif_other_color': [ opt_color, '#FFFFFF', _('Other dialogs color.') ], # white 'inmsgfont': [ opt_str, '', _('Incoming nickname font.'), True ], 'outmsgfont': [ opt_str, '', _('Outgoing nickname font.'), True ], 'inmsgtxtfont': [ opt_str, '', _('Incoming text font.'), True ], diff -r d2c63469b86e -r 51acffd72b9a src/dialogs.py --- a/src/dialogs.py Sun Mar 25 16:15:25 2012 +0400 +++ b/src/dialogs.py Tue Mar 27 14:50:26 2012 +0200 @@ -2776,25 +2776,25 @@ path_to_image = gtkgui_helpers.get_icon_path('gajim-chat_msg_recv', 48) if event_type == _('Contact Signed In'): - bg_color = 'limegreen' + bg_color = gajim.config.get('notif_signin_color') elif event_type == _('Contact Signed Out'): - bg_color = 'red' + bg_color = gajim.config.get('notif_signout_color') elif event_type in (_('New Message'), _('New Single Message'), _('New Private Message'), _('New E-mail')): - bg_color = 'dodgerblue' + bg_color = gajim.config.get('notif_message_color') elif event_type == _('File Transfer Request'): - bg_color = 'khaki' + bg_color = gajim.config.get('notif_ftrequest_color') elif event_type == _('File Transfer Error'): - bg_color = 'firebrick' + bg_color = gajim.config.get('notif_fterror_color') elif event_type in (_('File Transfer Completed'), _('File Transfer Stopped')): - bg_color = 'yellowgreen' + bg_color = gajim.config.get('notif_ftcomplete_color') elif event_type == _('Groupchat Invitation'): - bg_color = 'tan1' + bg_color = gajim.config.get('notif_invite_color') elif event_type == _('Contact Changed Status'): - bg_color = 'thistle2' + bg_color = gajim.config.get('notif_status_color') else: # Unknown event! Shouldn't happen but deal with it - bg_color = 'white' + bg_color = gajim.config.get('notif_other_color') popup_bg_color = gtk.gdk.color_parse(bg_color) close_button.modify_bg(gtk.STATE_NORMAL, popup_bg_color) eventbox.modify_bg(gtk.STATE_NORMAL, popup_bg_color)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits