Commits September 2017

commits@gajim.org

1 participants
49 discussions

[Git][gajim/gajim][master] 2 commits: implement XEP-0380. Fixes #8734
by Yann Leboulanger 21 Sep '17

21 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 3e1ea4a3 by Yann Leboulanger at 2017-09-21T17:19:25+02:00 implement XEP-0380. Fixes #8734 - - - - - 0c167b65 by Yann Leboulanger at 2017-09-21T17:28:32+02:00 Merge branch 'master' into 'master' implement XEP-0380. Fixes #8734 Closes #8734 See merge request !133 - - - - - 1 changed file: - gajim/common/connection_handlers.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1080,6 +1080,27 @@ class ConnectionHandlersBase: app.plugin_manager.extension_point( 'decrypt', self, obj, self._on_message_received) if not obj.encrypted: + # XEP-0380 + enc_tag = obj.stanza.getTag('encryption', namespace=nbxmpp.NS_EME) + if enc_tag: + ns = enc_tag.getAttr('namespace') + if ns: + if ns == 'urn:xmpp:otr:0': + obj.msgtxt = _('This message was encrypted with OTR ' + 'and could not be decrypted.') + elif ns == 'jabber:x:encrypted': + obj.msgtxt = _('This message was encrypted with Legacy ' + 'OpenPGP and could not be decrypted. You can install ' + 'the PGP plugin to handle those messages.') + elif ns == 'urn:xmpp:openpgp:0': + obj.msgtxt = _('This message was encrypted with ' + 'OpenPGP for XMPP and could not be decrypted.') + else: + enc_name = enc_tag.getAttr('name') + if not enc_name: + enc_name = ns + obj.msgtxt = _('This message was encrypted with %s ' + 'and could not be decrypted.') % enc_name self._on_message_received(obj) def _on_message_received(self, obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f50f22c4bd1441e9e2776471bf1037a29… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f50f22c4bd1441e9e2776471bf1037a29… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use custom font for MessageTextView
by Philipp Hörist 20 Sep '17

20 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f50f22c4 by Philipp Hörist at 2017-09-20T21:18:22+02:00 Use custom font for MessageTextView - - - - - 1 changed file: - gajim/message_textview.py Changes: ===================================== gajim/message_textview.py ===================================== --- a/gajim/message_textview.py +++ b/gajim/message_textview.py @@ -51,6 +51,7 @@ class MessageTextView(Gtk.TextView): self.set_right_margin(2) self.set_pixels_above_lines(2) self.set_pixels_below_lines(2) + self.get_style_context().add_class('font_custom') # set undo list self.undo_list = [] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f50f22c4bd1441e9e2776471bf1037a29d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f50f22c4bd1441e9e2776471bf1037a29d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PyOpenSSL removed rand module. Stop using it. Fixes #8731
by Yann Leboulanger 20 Sep '17

20 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: ab60bcbe by Yann Leboulanger at 2017-09-20T11:39:55+02:00 PyOpenSSL removed rand module. Stop using it. Fixes #8731 - - - - - 3 changed files: - gajim/common/configpaths.py - gajim/common/crypto.py - gajim/gajim.py Changes: ===================================== gajim/common/configpaths.py ===================================== --- a/gajim/common/configpaths.py +++ b/gajim/common/configpaths.py @@ -144,8 +144,7 @@ class ConfigPaths: d = {'LOG_DB': 'logs.db', 'MY_CACERTS': 'cacerts.pem', 'MY_EMOTS': 'emoticons', 'MY_ICONSETS': 'iconsets', 'MY_MOOD_ICONSETS': 'moods', 'MY_ACTIVITY_ICONSETS': 'activities', - 'PLUGINS_USER': 'plugins', - 'RNG_SEED': 'rng_seed'} + 'PLUGINS_USER': 'plugins'} for name in d: d[name] += profile self.add(name, Type.DATA, windowsify(d[name])) ===================================== gajim/common/crypto.py ===================================== --- a/gajim/common/crypto.py +++ b/gajim/common/crypto.py @@ -76,54 +76,8 @@ def base28(n): else: return base28_chr[n] -def add_entropy_sources_OpenSSL(): - # Other possibly variable data. This are very low quality sources of - # entropy, but some of them are installation dependent and can be hard - # to guess for the attacker. - # Data available on all platforms Unix, Windows - sources = [sys.argv, sys.builtin_module_names, - sys.copyright, sys.getfilesystemencoding(), sys.hexversion, - sys.modules, sys.path, sys.version, sys.api_version, - os.environ, os.getcwd(), os.getpid()] - - for s in sources: - OpenSSL.rand.add(str(s).encode('utf-8'), 1) - - # On Windows add the current contents of the screen to the PRNG state. -# if os.name == 'nt': -# OpenSSL.rand.screen() - # The /proc filesystem on POSIX systems contains many random variables: - # memory statistics, interrupt counts, network packet counts - if os.name == 'posix': - dirs = ['/proc', '/proc/net', '/proc/self'] - for d in dirs: - if os.access(d, os.R_OK): - for filename in os.listdir(d): - OpenSSL.rand.add(filename.encode('utf-8'), 0) - try: - with open(d + os.sep + filename, "r") as fp: - # Limit the ammount of read bytes, in case a memory - # file was opened - OpenSSL.rand.add(str(fp.read(5000)).encode('utf-8'), - 1) - except: - # Ignore all read and access errors - pass - -PYOPENSSL_PRNG_PRESENT = False -try: - import OpenSSL.rand - PYOPENSSL_PRNG_PRESENT = True -except ImportError: - # PyOpenSSL PRNG not available - pass - def random_bytes(bytes_): - if PYOPENSSL_PRNG_PRESENT: - OpenSSL.rand.add(os.urandom(bytes_), bytes_) - return OpenSSL.rand.bytes(bytes_) - else: - return os.urandom(bytes_) + return os.urandom(bytes_) def generate_nonce(): return random_bytes(8) ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -52,12 +52,6 @@ from gi.repository import GLib, Gio, Gtk from gajim.common import i18n from gajim.common import logging_helpers from gajim.common import crypto -try: - PYOPENSSL_PRNG_PRESENT = True - import OpenSSL.rand -except ImportError: - print('PyOpenSSL not available, impossible to generate entropy', file=sys.stderr) - PYOPENSSL_PRNG_PRESENT = False MIN_NBXMPP_VER = "0.5.6" @@ -104,7 +98,6 @@ class GajimApplication(Gtk.Application): self.config_path = None self.profile_separation = False self.interface = None - self.rng_seed = None GLib.set_prgname('gajim') if GLib.get_application_name() != 'Gajim': @@ -206,20 +199,6 @@ class GajimApplication(Gtk.Application): elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'): libc.setproctitle('gajim') - # Seed the OpenSSL pseudo random number generator from file and initialize - if PYOPENSSL_PRNG_PRESENT: - self.rng_seed = app.gajimpaths['RNG_SEED'] - # Seed from file - try: - OpenSSL.rand.load_file(self.rng_seed) - except TypeError: - OpenSSL.rand.load_file(self.rng_seed.encode('utf-8')) - crypto.add_entropy_sources_OpenSSL() - try: - OpenSSL.rand.write_file(self.rng_seed) - except TypeError: - OpenSSL.rand.write_file(self.rng_seed.encode('utf-8')) - def sigint_cb(num, stack): print('SIGINT/SIGTERM received') self.quit() @@ -249,12 +228,6 @@ class GajimApplication(Gtk.Application): def do_shutdown(self, *args): Gtk.Application.do_shutdown(self) - # Save the entropy from OpenSSL PRNG - if PYOPENSSL_PRNG_PRESENT and self.rng_seed: - try: - OpenSSL.rand.write_file(self.rng_seed) - except TypeError: - OpenSSL.rand.write_file(self.rng_seed.encode('utf-8')) # Shutdown GUI and save config if hasattr(self.interface, 'roster') and self.interface.roster: self.interface.roster.prepare_quit() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ab60bcbe8510584e0b406c6d3f66b23bef… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ab60bcbe8510584e0b406c6d3f66b23bef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix import
by Philipp Hörist 19 Sep '17

19 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f6deff2c by Philipp Hörist at 2017-09-19T22:06:21+02:00 Fix import - - - - - 1 changed file: - gajim/common/passwords.py Changes: ===================================== gajim/common/passwords.py ===================================== --- a/gajim/common/passwords.py +++ b/gajim/common/passwords.py @@ -27,6 +27,9 @@ import os import logging import gi + +from gi.repository import GLib + from gajim.common import app __all__ = ['get_password', 'save_password'] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f6deff2cd01fbb223ffbe2d78af364ac6d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f6deff2cd01fbb223ffbe2d78af364ac6d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Catch LibSecret errors
by Philipp Hörist 19 Sep '17

19 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 267dd73f by Philipp Hörist at 2017-09-19T22:04:39+02:00 Catch LibSecret errors - - - - - 1 changed file: - gajim/common/passwords.py Changes: ===================================== gajim/common/passwords.py ===================================== --- a/gajim/common/passwords.py +++ b/gajim/common/passwords.py @@ -80,8 +80,13 @@ class LibSecretPasswordStorage(PasswordStorage): user = app.config.get_per('accounts', account_name, 'name') display_name = _('XMPP account %s') % user + '@' + server attributes = {'user': user, 'server': server, 'protocol': 'xmpp'} - return self.Secret.password_store_sync(self.GAJIM_SCHEMA, attributes, - self.Secret.COLLECTION_DEFAULT, display_name, password or '', None) + try: + return self.Secret.password_store_sync( + self.GAJIM_SCHEMA, attributes, self.Secret.COLLECTION_DEFAULT, + display_name, password or '', None) + except GLib.Error as error: + log.error(error) + return False class SecretWindowsPasswordStorage(PasswordStorage): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/267dd73fcb53b8b604c8e8dbe9e4f6627f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/267dd73fcb53b8b604c8e8dbe9e4f6627f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove more Gmail things
by Yann Leboulanger 19 Sep '17

19 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 84060484 by Yann Leboulanger at 2017-09-19T15:52:53+02:00 Remove more Gmail things - - - - - 3 changed files: - gajim/common/connection_handlers.py - plugins/events_dump/plugin.py - test/integration/test_resolver.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -2192,10 +2192,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): con.RegisterHandler('iq', self._HttpAuthCB, 'get', nbxmpp.NS_HTTP_AUTH) con.RegisterHandler('iq', self._CommandExecuteCB, 'set', nbxmpp.NS_COMMANDS) - con.RegisterHandler('iq', self._gMailNewMailCB, 'set', - nbxmpp.NS_GMAILNOTIFY) - con.RegisterHandler('iq', self._gMailQueryCB, 'result', - nbxmpp.NS_GMAILNOTIFY) con.RegisterHandler('iq', self._DiscoverInfoGetCB, 'get', nbxmpp.NS_DISCO_INFO) con.RegisterHandler('iq', self._DiscoverItemsGetCB, 'get', ===================================== plugins/events_dump/plugin.py ===================================== --- a/plugins/events_dump/plugin.py +++ b/plugins/events_dump/plugin.py @@ -64,8 +64,8 @@ class EventsDumpPlugin(GajimPlugin): 'GC_AFFILIATION', 'GC_PASSWORD_REQUIRED', 'BAD_PASSPHRASE', 'ROSTER_INFO', 'BOOKMARKS', 'CON_TYPE', 'CONNECTION_LOST', 'FILE_REQUEST', - 'GMAIL_NOTIFY', 'FILE_REQUEST_ERROR', - 'FILE_SEND_ERROR', 'STANZA_ARRIVED', 'STANZA_SENT', + 'FILE_REQUEST_ERROR', 'FILE_SEND_ERROR', + 'STANZA_ARRIVED', 'STANZA_SENT', 'HTTP_AUTH', 'VCARD_PUBLISHED', 'VCARD_NOT_PUBLISHED', 'ASK_NEW_NICK', 'SIGNED_IN', 'METACONTACTS', 'ATOM_ENTRY', 'FAILED_DECRYPT', ===================================== test/integration/test_resolver.py ===================================== --- a/test/integration/test_resolver.py +++ b/test/integration/test_resolver.py @@ -13,13 +13,11 @@ from mock import Mock, expectParams from gajim_mocks import * from xmpp_mocks import IdleQueueThread -GMAIL_SRV_NAME = '_xmpp-client._tcp.gmail.com' NONSENSE_NAME = 'sfsdfsdfsdf.sdfs.fsd' JABBERCZ_TXT_NAME = '_xmppconnect.jabber.cz' JABBERCZ_SRV_NAME = '_xmpp-client._tcp.jabber.cz' -TEST_LIST = [(GMAIL_SRV_NAME, 'srv', True), - (NONSENSE_NAME, 'srv', False), +TEST_LIST = [(NONSENSE_NAME, 'srv', False), (JABBERCZ_SRV_NAME, 'srv', True)] class TestResolver(unittest.TestCase): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/84060484c44aceeff32ef6aa715374de21… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/84060484c44aceeff32ef6aa715374de21… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove Gmail special options
by Yann Leboulanger 19 Sep '17

19 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: a378152a by Yann Leboulanger at 2017-09-19T15:44:58+02:00 Remove Gmail special options - - - - - 11 changed files: - gajim/common/app.py - gajim/common/config.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/config.py - gajim/data/gui/account_context_menu.ui - gajim/data/gui/preferences_window.ui - gajim/gui_interface.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -88,8 +88,6 @@ else: os_info = None # used to cache os information -gmail_domains = ['gmail.com', 'googlemail.com'] - transport_type = {} # list the type of transport last_message_time = {} # list of time of the latest incomming message ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -178,9 +178,6 @@ class Config: 'time_stamp': [ opt_str, '[%X] ', _('This option let you customize timestamp that is printed in conversation. For exemple "[%H:%M] " will show "[hour:minute] ". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html') ], 'before_nickname': [ opt_str, '', _('Characters that are printed before the nickname in conversations') ], 'after_nickname': [ opt_str, ':', _('Characters that are printed after the nickname in conversations') ], - 'notify_on_new_gmail_email': [ opt_bool, True ], - 'notify_on_new_gmail_email_extra': [ opt_bool, False ], - 'notify_on_new_gmail_email_command': [ opt_str, '', _('Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q') ], 'use_gpg_agent': [ opt_bool, False ], 'change_roster_title': [ opt_bool, True, _('Add * and [n] in roster title?')], 'restore_lines': [opt_int, 10, _('How many history messages should be restored when a chat tab/window is reopened?')], @@ -538,7 +535,6 @@ class Config: 'message_sent': [ False, 'sent.wav' ], 'muc_message_highlight': [ True, 'gc_message1.wav', _('Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname.')], 'muc_message_received': [ False, 'gc_message2.wav', _('Sound to play when any MUC message arrives.') ], - 'gmail_received': [ False, 'message1.wav' ], } themes_default = { ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1915,9 +1915,6 @@ class Connection(CommonConnection, ConnectionHandlers): get_action(self.name + '-archive').set_enabled(True) if obj.fjid == hostname: - if nbxmpp.NS_GMAILNOTIFY in obj.features: - app.gmail_domains.append(obj.fjid) - self.request_gmail_notifications() if nbxmpp.NS_SECLABEL in obj.features: self.seclabel_supported = True for identity in obj.identities: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1358,7 +1358,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): client_caps_factory=capscache.create_suitable_client_caps) ConnectionJingle.__init__(self) ConnectionHandlersBase.__init__(self) - self.gmail_url = None # keep the latest subscribed event for each jid to prevent loop when we # acknowledge presences @@ -1377,9 +1376,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): self.privacy_default_list = None - self.gmail_last_tid = None - self.gmail_last_time = None - app.nec.register_incoming_event(PrivateStorageBookmarksReceivedEvent) app.nec.register_incoming_event(BookmarksReceivedEvent) app.nec.register_incoming_event( @@ -1417,8 +1413,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): self._nec_roster_received) app.ged.register_event_handler('iq-error-received', ged.CORE, self._nec_iq_error_received) - app.ged.register_event_handler('gmail-new-mail-received', ged.CORE, - self._nec_gmail_new_mail_received) app.ged.register_event_handler('ping-received', ged.CORE, self._nec_ping_received) app.ged.register_event_handler('subscribe-presence-received', @@ -1463,8 +1457,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): self._nec_roster_received) app.ged.remove_event_handler('iq-error-received', ged.CORE, self._nec_iq_error_received) - app.ged.remove_event_handler('gmail-new-mail-received', ged.CORE, - self._nec_gmail_new_mail_received) app.ged.remove_event_handler('ping-received', ged.CORE, self._nec_ping_received) app.ged.remove_event_handler('subscribe-presence-received', @@ -1721,44 +1713,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): app.nec.push_incoming_event(TimeResultReceivedEvent(None, conn=self, stanza=iq_obj)) - def _gMailNewMailCB(self, con, iq_obj): - """ - Called when we get notified of new mail messages in gmail account - """ - log.debug('gMailNewMailCB') - app.nec.push_incoming_event(GmailNewMailReceivedEvent(None, conn=self, - stanza=iq_obj)) - raise nbxmpp.NodeProcessed - - def _nec_gmail_new_mail_received(self, obj): - if obj.conn.name != self.name: - return - if not self.connection or self.connected < 2: - return - # we'll now ask the server for the exact number of new messages - jid = app.get_jid_from_account(self.name) - log.debug('Got notification of new gmail e-mail on %s. Asking the ' - 'server for more info.' % jid) - iq = nbxmpp.Iq(typ='get') - query = iq.setTag('query') - query.setNamespace(nbxmpp.NS_GMAILNOTIFY) - # we want only be notified about newer mails - if self.gmail_last_tid: - query.setAttr('newer-than-tid', self.gmail_last_tid) - if self.gmail_last_time: - query.setAttr('newer-than-time', self.gmail_last_time) - self.connection.send(iq) - - def _gMailQueryCB(self, con, iq_obj): - """ - Called when we receive results from Querying the server for mail messages - in gmail account - """ - log.debug('gMailQueryCB') - app.nec.push_incoming_event(GMailQueryReceivedEvent(None, conn=self, - stanza=iq_obj)) - raise nbxmpp.NodeProcessed - def _rosterItemExchangeCB(self, con, msg): """ XEP-0144 Roster Item Echange @@ -2123,28 +2077,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): # hashes of already received messages self.received_message_hashes = [] - def request_gmail_notifications(self): - if not self.connection or self.connected < 2: - return - # It's a gmail account, - # inform the server that we want e-mail notifications - our_jid = helpers.parse_jid(app.get_jid_from_account(self.name)) - log.debug(('%s is a gmail account. Setting option ' - 'to get e-mail notifications on the server.') % (our_jid)) - iq = nbxmpp.Iq(typ='set', to=our_jid) - iq.setAttr('id', 'MailNotify') - query = iq.setTag('usersetting') - query.setNamespace(nbxmpp.NS_GTALKSETTING) - query = query.setTag('mailnotifications') - query.setAttr('value', 'true') - self.connection.send(iq) - # Ask how many messages there are now - iq = nbxmpp.Iq(typ='get') - iq.setID(self.connection.getAnID()) - query = iq.setTag('query') - query.setNamespace(nbxmpp.NS_GMAILNOTIFY) - self.connection.send(iq) - def _SearchCB(self, con, iq_obj): log.debug('SearchCB') app.nec.push_incoming_event(SearchFormReceivedEvent(None, ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -232,61 +232,6 @@ class TimeResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.time_info = t.astimezone(contact_tz()).strftime('%c') return True -class GMailQueryReceivedEvent(nec.NetworkIncomingEvent): - name = 'gmail-notify' - base_network_events = [] - - def generate(self): - if not self.stanza.getTag('mailbox'): - return - mb = self.stanza.getTag('mailbox') - if not mb.getAttr('url'): - return - self.conn.gmail_url = mb.getAttr('url') - if mb.getNamespace() != nbxmpp.NS_GMAILNOTIFY: - return - self.newmsgs = mb.getAttr('total-matched') - if not self.newmsgs: - return - if self.newmsgs == '0': - return - # there are new messages - self.gmail_messages_list = [] - if mb.getTag('mail-thread-info'): - gmail_messages = mb.getTags('mail-thread-info') - for gmessage in gmail_messages: - unread_senders = [] - for sender in gmessage.getTag('senders').getTags('sender'): - if sender.getAttr('unread') != '1': - continue - if sender.getAttr('name'): - unread_senders.append(sender.getAttr('name') + \ - '< ' + sender.getAttr('address') + '>') - else: - unread_senders.append(sender.getAttr('address')) - - if not unread_senders: - continue - gmail_subject = gmessage.getTag('subject').getData() - gmail_snippet = gmessage.getTag('snippet').getData() - tid = int(gmessage.getAttr('tid')) - if not self.conn.gmail_last_tid or \ - tid > self.conn.gmail_last_tid: - self.conn.gmail_last_tid = tid - self.gmail_messages_list.append({ - 'From': unread_senders, - 'Subject': gmail_subject, - 'Snippet': gmail_snippet, - 'url': gmessage.getAttr('url'), - 'participation': gmessage.getAttr('participation'), - 'messages': gmessage.getAttr('messages'), - 'date': gmessage.getAttr('date')}) - self.conn.gmail_last_time = int(mb.getAttr('result-time')) - - self.jid = app.get_jid_from_account(self.name) - log.debug('You have %s new gmail e-mails on %s.', self.newmsgs, self.jid) - return True - class RosterItemExchangeEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'roster-item-exchange-received' base_network_events = [] @@ -671,18 +616,6 @@ class IqErrorReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.errcode = self.stanza.getErrorCode() return True -class GmailNewMailReceivedEvent(nec.NetworkIncomingEvent): - name = 'gmail-new-mail-received' - base_network_events = [] - - def generate(self): - if not self.stanza.getTag('new-mail'): - return - if self.stanza.getTag('new-mail').getNamespace() != \ - nbxmpp.NS_GMAILNOTIFY: - return - return True - class PingReceivedEvent(nec.NetworkIncomingEvent): name = 'ping-received' base_network_events = [] ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -339,23 +339,6 @@ class PreferencesWindow: else: self.xml.get_object('manage_sounds_button').set_sensitive(False) - # Notify user of new gmail e-mail messages, - # make checkbox sensitive if user has a gtalk account - frame_gmail = self.xml.get_object('frame_gmail') - notify_gmail_checkbutton = self.xml.get_object('notify_gmail_checkbutton') - notify_gmail_extra_checkbutton = self.xml.get_object( - 'notify_gmail_extra_checkbutton') - - for account in app.config.get_per('accounts'): - jid = app.get_jid_from_account(account) - if app.get_server_from_jid(jid) in app.gmail_domains: - frame_gmail.set_sensitive(True) - st = app.config.get('notify_on_new_gmail_email') - notify_gmail_checkbutton.set_active(st) - st = app.config.get('notify_on_new_gmail_email_extra') - notify_gmail_extra_checkbutton.set_active(st) - break - #### Status tab ### # Autoaway st = app.config.get('autoaway') @@ -1144,12 +1127,6 @@ class PreferencesWindow: widget.set_inconsistent(False) self.on_per_account_checkbutton_toggled(widget, 'send_idle_time') - def on_notify_gmail_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'notify_on_new_gmail_email') - - def on_notify_gmail_extra_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'notify_on_new_gmail_email_extra') - def fill_msg_treeview(self): self.xml.get_object('delete_msg_button').set_sensitive(False) model = self.msg_tree.get_model() @@ -3054,7 +3031,6 @@ class ManageSoundsWindow: 'message_sent': _('Message Sent'), 'muc_message_highlight': _('Group Chat Message Highlight'), 'muc_message_received': _('Group Chat Message Received'), - 'gmail_received': _('GMail Email Received') } for sound_event_config_name, sound_ui_name in sounds_dict.items(): ===================================== gajim/data/gui/account_context_menu.ui ===================================== --- a/gajim/data/gui/account_context_menu.ui +++ b/gajim/data/gui/account_context_menu.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkMenu" id="account_context_menu"> @@ -76,14 +76,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="open_gmail_inbox_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Open Gmail Inbox</property> - <property name="use_underline">True</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="seperator1"> <property name="visible">True</property> <property name="can_focus">False</property> ===================================== gajim/data/gui/preferences_window.ui ===================================== --- a/gajim/data/gui/preferences_window.ui +++ b/gajim/data/gui/preferences_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAdjustment" id="adjustment1"> @@ -728,75 +728,6 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame_gmail"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkBox" id="vbox_gmail"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="notify_gmail_checkbutton"> - <property name="label" translatable="yes">Notify on new _GMail email</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will show a notification when a new e-mail is received via GMail</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_notify_gmail_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="notify_gmail_extra_checkbutton"> - <property name="label" translatable="yes">Display _extra email details</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will also include information about the sender of new emails</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_notify_gmail_extra_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="gmail_options_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>GMail Options</b></property> - <property name="use_markup">True</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">5</property> - </packing> - </child> - <child> <object class="GtkBox" id="hbox5"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -836,7 +767,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">5</property> </packing> </child> </object> @@ -1215,7 +1146,7 @@ $T will be replaced by auto-not-available timeout</property> <property name="width_request">50</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="text" translatable="yes">12</property> + <property name="text">12</property> <property name="adjustment">adjustment2</property> <property name="climb_rate">1</property> <property name="value">12</property> @@ -1231,7 +1162,7 @@ $T will be replaced by auto-not-available timeout</property> <property name="width_request">50</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="text" translatable="yes">20</property> + <property name="text">20</property> <property name="adjustment">adjustment1</property> <property name="climb_rate">1</property> <property name="value">20</property> @@ -2127,10 +2058,10 @@ $T will be replaced by auto-not-available timeout</property> <property name="label" translatable="yes">_Reset to Default Colors</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="image">image1</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> <signal name="clicked" handler="on_reset_colors_button_clicked" swapped="no"/> </object> <packing> ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -847,44 +847,6 @@ class Interface: notify.popup(event_type, jid, account, 'file-send-error', path, event_type, file_props.name) - @staticmethod - def handle_event_gmail_notify(obj): - jid = obj.jid - gmail_new_messages = int(obj.newmsgs) - gmail_messages_list = obj.gmail_messages_list - if not app.config.get('notify_on_new_gmail_email'): - return - path = gtkgui_helpers.get_icon_path('gajim-new_email_recv', 48) - title = _('New e-mail on %(gmail_mail_address)s') % \ - {'gmail_mail_address': jid} - text = i18n.ngettext('You have %d new e-mail conversation', - 'You have %d new e-mail conversations', gmail_new_messages, - gmail_new_messages, gmail_new_messages) - - if app.config.get('notify_on_new_gmail_email_extra'): - cnt = 0 - for gmessage in gmail_messages_list: - # FIXME: emulate Gtalk client popups. find out what they - # parse and how they decide what to show each message has a - # 'From', 'Subject' and 'Snippet' field - if cnt >= 5: - break - senders = ',\n '.join(reversed(gmessage['From'])) - text += _('\n\nFrom: %(from_address)s\nSubject: ' - '%(subject)s\n%(snippet)s') % {'from_address': senders, - 'subject': gmessage['Subject'], - 'snippet': gmessage['Snippet']} - cnt += 1 - - command = app.config.get('notify_on_new_gmail_email_command') - if command: - Popen(command, shell=True) - - if app.config.get_per('soundevents', 'gmail_received', 'enabled'): - helpers.play_sound('gmail_received') - notify.popup(_('New E-mail'), jid, obj.conn.name, 'gmail', - path_to_image=path, title=title, text=text) - def handle_event_file_request_error(self, obj): # ('FILE_REQUEST_ERROR', account, (jid, file_props, error_msg)) ft = self.instances['file_transfers'] @@ -1553,7 +1515,6 @@ class Interface: 'gc-decline-received': [self.handle_event_gc_decline], 'gc-presence-received': [self.handle_event_gc_presence], 'gc-message-received': [self.handle_event_gc_message], - 'gmail-notify': [self.handle_event_gmail_notify], 'gpg-password-required': [self.handle_event_gpg_password_required], 'gpg-trust-key': [self.handle_event_gpg_trust_key], 'http-auth-received': [self.handle_event_http_auth], @@ -1762,10 +1723,6 @@ class Interface: else: # Open the window self.roster.open_event(account, fjid, event) - elif type_ == 'gmail': - url = app.connections[account].gmail_url - if url: - helpers.launch_browser_mailer('url', url) elif type_ == 'gc-invitation': event = app.events.get_first_event(account, jid, type_) dialogs.InvitationReceivedDialog(account, event.room_jid, jid, ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -111,8 +111,6 @@ class Remote: self.on_os_info) app.ged.register_event_handler('time-result-received', ged.POSTGUI, self.on_time) - app.ged.register_event_handler('gmail-nofify', ged.POSTGUI, - self.on_gmail_notify) app.ged.register_event_handler('roster-info', ged.POSTGUI, self.on_roster_info) app.ged.register_event_handler('presence-received', ged.POSTGUI, @@ -156,10 +154,6 @@ class Remote: self.raise_signal('EntityTime', (obj.conn.name, [obj.jid, obj.resource, obj.time_info])) - def on_gmail_notify(self, obj): - self.raise_signal('NewGmail', (obj.conn.name, [obj.jid, obj.newmsgs, - obj.gmail_messages_list])) - def on_roster_info(self, obj): self.raise_signal('RosterInfo', (obj.conn.name, [obj.jid, obj.nickname, obj.sub, obj.ask, obj.groups])) @@ -293,10 +287,6 @@ class SignalObject(dbus.service.Object): pass @dbus.service.signal(INTERFACE, signature='av') - def NewGmail(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') def ChatState(self, account_and_array): pass ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -3235,11 +3235,6 @@ class RosterWindow: app.interface.instances['accounts'] = config.AccountsWindow() app.interface.instances['accounts'].select_account(account) - def on_open_gmail_inbox(self, widget, account): - url = app.connections[account].gmail_url - if url: - helpers.launch_browser_mailer('url', url) - def on_change_status_message_activate(self, widget, account): show = app.SHOW_LIST[app.connections[account].connected] def on_response(message, pep_dict): @@ -5036,8 +5031,6 @@ class RosterWindow: start_chat_menuitem = xml.get_object('start_chat_menuitem') join_group_chat_menuitem = xml.get_object( 'join_group_chat_menuitem') - open_gmail_inbox_menuitem = xml.get_object( - 'open_gmail_inbox_menuitem') add_contact_menuitem = xml.get_object('add_contact_menuitem') service_discovery_menuitem = xml.get_object( 'service_discovery_menuitem') @@ -5108,13 +5101,6 @@ class RosterWindow: else: pep_menuitem.set_sensitive(False) - if not app.connections[account].gmail_url: - open_gmail_inbox_menuitem.set_no_show_all(True) - open_gmail_inbox_menuitem.hide() - else: - open_gmail_inbox_menuitem.connect('activate', - self.on_open_gmail_inbox, account) - edit_account_menuitem.connect('activate', self.on_edit_account, account) if app.connections[account].roster_supported: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a378152a9c791d2a5941b33d4f10b3e3d9… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a378152a9c791d2a5941b33d4f10b3e3d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix some strings for a better translation
by Yann Leboulanger 19 Sep '17

19 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 152be447 by Yann Leboulanger at 2017-09-19T12:45:02+02:00 Fix some strings for a better translation - - - - - 13 changed files: - gajim/command_system/implementation/standard.py - gajim/common/check_paths.py - gajim/common/config.py - gajim/common/connection.py - gajim/common/jingle_rtp.py - gajim/common/passwords.py - gajim/config.py - gajim/data/gui/accounts_window.ui - gajim/dialogs.py - gajim/gui_interface.py - gajim/history_sync.py - gajim/roster_window.py - test/runtests.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== --- a/gajim/command_system/implementation/standard.py +++ b/gajim/command_system/implementation/standard.py @@ -298,7 +298,8 @@ class StandardGroupChatCommands(CommandContainer): @doc(_("Invite a user to a room for a reason")) def invite(self, jid, reason): self.connection.send_invite(self.room_jid, jid, reason) - return _("Invited %s to %s") % (jid, self.room_jid) + return _("Invited %(jid)s to %(room_jid)s") % {'jid': jid, + 'room_jid': self.room_jid} @command(raw=True, empty=True) @doc(_("Join a group chat given by a jid, optionally using given nickname")) ===================================== gajim/common/check_paths.py ===================================== --- a/gajim/common/check_paths.py +++ b/gajim/common/check_paths.py @@ -250,7 +250,7 @@ def check_and_possibly_move_config(): continue if not os.path.exists(src): continue - print(_('moving %s to %s') % (src, dst)) + print(_('moving %(src)s to %(dst)s') % {'src': src, 'dst': dst}) shutil.move(src, dst) app.logger.init_vars() app.logger.attach_cache_database() ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -194,7 +194,7 @@ class Config: 'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP.')], 'version': [ opt_str, defs.version ], # which version created the config 'search_engine': [opt_str, 'https://www.google.com/search?&q=%s&sourceid=gajim'], - 'dictionary_url': [opt_str, 'WIKTIONARY', _("Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary.")], + 'dictionary_url': [opt_str, 'WIKTIONARY', _("Either custom url with %%s in it where %%s is the word/phrase or 'WIKTIONARY' which means use wiktionary.")], 'always_english_wikipedia': [opt_bool, False], 'always_english_wiktionary': [opt_bool, True], 'remote_control': [opt_bool, False, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -2078,8 +2078,9 @@ class Connection(CommonConnection, ConnectionHandlers): return if type_ == 'message': if len(contacts) == 1: - msg = _('Sent contact: "%s" (%s)') % (contacts[0].get_full_jid(), - contacts[0].get_shown_name()) + msg = _('Sent contact: "%(jid)s" (%(name)s)') % { + 'jid': contacts[0].get_full_jid(), + 'name': contacts[0].get_shown_name()} else: msg = _('Sent contacts:') for contact in contacts: ===================================== gajim/common/jingle_rtp.py ===================================== --- a/gajim/common/jingle_rtp.py +++ b/gajim/common/jingle_rtp.py @@ -121,8 +121,10 @@ class JingleRTPContent(JingleContent): InformationEvent( None, conn=self.session.connection, level='error', pri_txt=_('%s configuration error') % text.capitalize(), - sec_txt=_('Couldn’t setup %s. Check your configuration.\n\n' - 'Pipeline was:\n%s\n\nError was:\n%s') % (text, pipeline, str(e)))) + sec_txt=_('Couldn’t setup %(text)s. Check your ' + 'configuration.\n\nPipeline was:\n%(pipeline)s\n\n' + 'Error was:\n%(error)s') % {'text': text, + 'pipeline': pipeline, 'error': str(e)})) raise JingleContentSetupException def add_remote_candidates(self, candidates): @@ -228,9 +230,9 @@ class JingleRTPContent(JingleContent): InformationEvent( None, conn=self.session.connection, level='error', pri_txt=_('GStreamer error'), - sec_txt=_('Error: %s\nDebug: %s' % - (message.get_structure().get_value('gerror'), - message.get_structure().get_value('debug'))))) + sec_txt=_('Error: %(error)s\nDebug: %(debug)s' % { + 'error': message.get_structure().get_value('gerror'), + 'debug': message.get_structure().get_value('debug')}))) sink_pad = self.p2psession.get_property('sink-pad') ===================================== gajim/common/passwords.py ===================================== --- a/gajim/common/passwords.py +++ b/gajim/common/passwords.py @@ -78,7 +78,7 @@ class LibSecretPasswordStorage(PasswordStorage): def save_password(self, account_name, password, update=True): server = app.config.get_per('accounts', account_name, 'hostname') user = app.config.get_per('accounts', account_name, 'name') - display_name = _('XMPP account %s@%s') % (user, server) + display_name = _('XMPP account %s') % user + '@' + server attributes = {'user': user, 'server': server, 'protocol': 'xmpp'} return self.Secret.password_store_sync(self.GAJIM_SCHEMA, attributes, self.Secret.COLLECTION_DEFAULT, display_name, password or '', None) ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -2693,9 +2693,10 @@ class AccountCreationWizardWindow: 'hostname': hostname, 'error': obj.ssl_msg}) if obj.errnum in (18, 27): text = _('Add this certificate to the list of trusted ' - 'certificates.\nSHA-1 fingerprint of the certificate:\n%s' - '\nSHA-256 fingerprint of the certificate:\n%s') \ - % (obj.ssl_fingerprint_sha1, obj.ssl_fingerprint_sha256) + 'certificates.\nSHA-1 fingerprint of the certificate:\n' + '%(sha1)s\nSHA-256 fingerprint of the certificate:\n' + '%(sha256)s') % {'sha1': obj.ssl_fingerprint_sha1, + 'sha256': obj.ssl_fingerprint_sha256} self.xml.get_object('ssl_checkbutton').set_label(text) else: self.xml.get_object('ssl_checkbutton').set_no_show_all(True) ===================================== gajim/data/gui/accounts_window.ui ===================================== --- a/gajim/data/gui/accounts_window.ui +++ b/gajim/data/gui/accounts_window.ui @@ -61,7 +61,7 @@ </object> <packing> <property name="name">main</property> - <property name="title" translatable="yes">page0</property> + <property name="title">page0</property> </packing> </child> </object> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -894,7 +894,7 @@ class AddNewContactWindow: 'group_comboboxentry', 'auto_authorize_checkbutton'): self.__dict__[w] = self.xml.get_object(w) if account and len(app.connections) >= 2: - self.default_desc = _('Please fill in the data of the contact you want\n' + self.default_desc = _('Please fill in the data of the contact you want ' 'to add to your account <b>%s</b>') % account else: self.default_desc = _('Please fill in the data of the contact you ' @@ -1276,7 +1276,8 @@ class AddNewContactWindow: if obj.stanza.getError(): ErrorDialog(_('Error while adding transport contact'), _('This error occured while adding a contact for transport ' - '%s:\n\n%s') % (transport, obj.stanza.getErrorMsg())) + '%(transport)s:\n\n%(error)s') % {'transport': transport, + 'error': obj.stanza.getErrorMsg()}) return if obj.prompt_jid: self._add_jid(obj.prompt_jid, type_) @@ -2636,9 +2637,10 @@ class JoinGroupchatWindow: if app.contacts.get_contact(self.account, room_jid) and \ not app.contacts.get_contact(self.account, room_jid).is_groupchat(): ErrorDialog(_('This is not a group chat'), - _('%s is already in your roster. Please check if %s is a ' - 'correct group chat name. If it is, delete it from your roster ' - 'and try joining the group chat again.') % (room_jid, room_jid)) + _('%(room_jid)s is already in your roster. Please check if ' + '%(room_jid)s is a correct group chat name. If it is, delete ' + 'it from your roster and try joining the group chat again.') % \ + {'room_jid': room_jid, 'room_jid': room_jid}) return full_jid = room_jid + '/' + nickname ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1360,9 +1360,9 @@ class Interface: 'server?') % {'error': obj.error_text} if obj.error_num in (18, 27): checktext1 = _('Add this certificate to the list of trusted ' - 'certificates.\nSHA-1 fingerprint of the certificate:\n%s' - '\nSHA256 fingerprint of the certificate:\n%s') % \ - (obj.fingerprint_sha1, obj.fingerprint_sha256) + 'certificates.\nSHA-1 fingerprint of the certificate:\n%(sha1)s' + '\nSHA256 fingerprint of the certificate:\n%(sha256)s') % \ + {'sha1': obj.fingerprint_sha1, 'sha256': obj.fingerprint_sha256} else: checktext1 = '' checktext2 = _('Ignore this error for this certificate.') @@ -1967,9 +1967,10 @@ class Interface: if app.contacts.get_contact(account, room_jid) and \ not app.contacts.get_contact(account, room_jid).is_groupchat(): dialogs.ErrorDialog(_('This is not a group chat'), - _('%s is already in your roster. Please check if %s is a ' - 'correct group chat name. If it is, delete it from your roster ' - 'and try joining the group chat again.') % (room_jid, room_jid)) + _('%(room_jid)s is already in your roster. Please check ' + 'if %(room_jid)s is a correct group chat name. If it is, ' + 'delete it from your roster and try joining the group chat ' + 'again.') % {'room_jid': room_jid, 'room_jid': room_jid}) return if not nick: ===================================== gajim/history_sync.py ===================================== --- a/gajim/history_sync.py +++ b/gajim/history_sync.py @@ -283,7 +283,8 @@ class DownloadHistoryPage(Gtk.Box): self.received += 1 if self.count: self.progress.set_fraction(self.received / self.count) - self.progress.set_text(_('%s of %s' % (self.received, self.count))) + self.progress.set_text(_('%(received)s of %(max)s' % { + 'received': self.received, 'max': self.count})) else: self.progress.pulse() self.progress.set_text(_('Downloaded %s Messages' % self.received)) ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -4642,8 +4642,8 @@ class RosterWindow: # c_dest is None if jid_dest doesn't belong to account return menu = Gtk.Menu() - item = Gtk.MenuItem.new_with_label(_('Send %s to %s') % ( - c_source.get_shown_name(), c_dest.get_shown_name())) + item = Gtk.MenuItem.new_with_label(_('Send %(from)s to %(to)s') % { + 'from': c_source.get_shown_name(), 'to': c_dest.get_shown_name()}) item.set_use_underline(False) item.connect('activate', self.on_drop_rosterx, account_source, c_source, account_dest, c_dest, is_big_brother, context, etime) @@ -4660,8 +4660,8 @@ class RosterWindow: item.set_use_underline(False) else: item = Gtk.MenuItem.new_with_label( - _('Make %s and %s metacontacts') % ( - c_source.get_shown_name(), c_dest.get_shown_name())) + _('Make %(contact1)s and %(contact2)s metacontacts') % { + 'contact1': c_source.get_shown_name(), 'contact2': c_dest.get_shown_name()}) item.set_use_underline(False) item.connect('activate', self.on_drop_in_contact, account_source, ===================================== test/runtests.py ===================================== --- a/test/runtests.py +++ b/test/runtests.py @@ -57,7 +57,7 @@ for mod in modules: suite = unittest.defaultTestLoader.loadTestsFromName(mod) result = unittest.TextTestRunner(verbosity=verbose).run(suite) if use_x: - # Wait 1s to be sure all timeout_add will be called before we cleanup main loop + # Wait 500ms to be sure all timeout_add will be called before we cleanup main loop import time time.sleep(0.5) # Clean main loop View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/152be4473b94af474e80b15f4182c7eef4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/152be4473b94af474e80b15f4182c7eef4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont use Resolver when using a proxy
by Philipp Hörist 17 Sep '17

17 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b93098a3 by Philipp Hörist at 2017-09-17T14:02:01+02:00 Dont use Resolver when using a proxy This leaks the DNS request - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1083,7 +1083,8 @@ class Connection(CommonConnection, ConnectionHandlers): self._hosts = [ {'host': h, 'port': p, 'ssl_port': ssl_p, 'prio': 10, 'weight': 10} ] self._hostname = hostname - if use_srv: + + if use_srv and self._proxy is None: # add request for srv query to the resolve, on result '_on_resolve' # will be called app.resolver.resolve('_xmpp-client._tcp.' + helpers.idn_to_ascii( @@ -1823,9 +1824,10 @@ class Connection(CommonConnection, ConnectionHandlers): self.sm.resuming = False # back to previous state # Discover Stun server(s) - hostname = app.config.get_per('accounts', self.name, 'hostname') - app.resolver.resolve('_stun._udp.' + helpers.idn_to_ascii(hostname), - self._on_stun_resolved) + if self._proxy is None: + hostname = app.config.get_per('accounts', self.name, 'hostname') + app.resolver.resolve('_stun._udp.' + helpers.idn_to_ascii(hostname), + self._on_stun_resolved) def _on_stun_resolved(self, host, result_array): if len(result_array) != 0: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b93098a3792253b277562bf7bceaa8c8ce… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b93098a3792253b277562bf7bceaa8c8ce… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix Resolver Test
by Philipp Hörist 17 Sep '17

17 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c9d5d83 by Philipp Hörist at 2017-09-17T10:43:10+02:00 Fix Resolver Test - - - - - 1 changed file: - gajim/common/resolver.py Changes: ===================================== gajim/common/resolver.py ===================================== --- a/gajim/common/resolver.py +++ b/gajim/common/resolver.py @@ -23,7 +23,7 @@ import functools log = logging.getLogger('gajim.c.resolver') if __name__ == '__main__': - sys.path.append('..') + sys.path.append('../..') from gajim.common import i18n from gajim.common import configpaths configpaths.gajimpaths.init(None) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c9d5d838bd5a451835124712fb67bc742… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c9d5d838bd5a451835124712fb67bc742… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2017