Commits December 2011

commits@gajim.org

3 participants
147 discussions

gajim: test_ft_proxies_on_startup is a per_account option
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset 05332cbe3388 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=05332cbe3388 description: test_ft_proxies_on_startup is a per_account option diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (19 lines): diff -r f58419147bf8 -r 05332cbe3388 src/common/config.py --- a/src/common/config.py Sun Oct 23 20:26:28 2011 +0200 +++ b/src/common/config.py Sun Oct 23 21:06:25 2011 +0200 @@ -290,7 +290,6 @@ 'use_stun_server': [opt_bool, False, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')], 'stun_server': [opt_str, '', _('STUN server to use when using jingle')], 'show_affiliation_in_groupchat': [opt_bool, True, _('If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')], - 'test_ft_proxies_on_startup': [opt_bool, True, _('If True, Gajim will test file transfer proxies on startup to be sure it works. Openfire\'s proxies are known to fail this test even if they work.')], } __options_per_key = { @@ -351,6 +350,7 @@ # proxy65 for FT 'file_transfer_proxies': [opt_str, 'proxy.eu.jabber.org, proxy.jabber.ru, proxy.jabbim.cz'], 'use_ft_proxies': [opt_bool, True, _('If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer.'), True], + 'test_ft_proxies_on_startup': [opt_bool, True, _('If True, Gajim will test file transfer proxies on startup to be sure it works. Openfire\'s proxies are known to fail this test even if they work.')], 'msgwin-x-position': [opt_int, -1], # Default is to let the wm decide 'msgwin-y-position': [opt_int, -1], # Default is to let the wm decide 'msgwin-width': [opt_int, 480],

1 0

gajim: remove old unused function
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset 49b3bd055081 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=49b3bd055081 description: remove old unused function diffstat: src/common/connection_handlers.py | 49 --------------------------------------- 1 files changed, 0 insertions(+), 49 deletions(-) diffs (59 lines): diff -r 05332cbe3388 -r 49b3bd055081 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Oct 23 21:06:25 2011 +0200 +++ b/src/common/connection_handlers.py Sun Oct 30 13:26:41 2011 +0100 @@ -1674,55 +1674,6 @@ self.connection.SendAndCallForResponse(iq, self._on_bob_received, {'cid': cid}) - # process and dispatch a groupchat message - def dispatch_gc_message(self, msg, frm, msgtxt, jid, tim): - has_timestamp = bool(msg.timestamp) - - statusCode = msg.getStatusCode() - - displaymarking = None - seclabel = msg.getTag('securitylabel') - if seclabel and seclabel.getNamespace() == common.xmpp.NS_SECLABEL: - # Ignore message from room in which we are not - displaymarking = seclabel.getTag('displaymarking') - - if jid not in self.last_history_time: - return - - captcha = msg.getTag('captcha', namespace=common.xmpp.NS_CAPTCHA) - if captcha: - captcha = captcha.getTag('x', namespace=common.xmpp.NS_DATA) - found = helpers.replace_dataform_media(captcha, msg) - if not found: - self.get_bob_data(uri_data, frm, self.dispatch_gc_message, - [msg, frm, msgtxt, jid, tim], 0) - return - self.dispatch('GC_MSG', (frm, msgtxt, tim, has_timestamp, - msg.getXHTML(), statusCode, displaymarking, captcha)) - - tim_int = int(float(mktime(tim))) - if gajim.config.should_log(self.name, jid) and not \ - tim_int <= self.last_history_time[jid] and msgtxt and frm.find('/') >= 0: - # if frm.find('/') < 0, it means message comes from room itself - # usually it hold description and can be send at each connection - # so don't store it in logs - try: - gajim.logger.write('gc_msg', frm, msgtxt, tim=tim) - # store in memory time of last message logged. - # this will also be saved in rooms_last_message_time table - # when we quit this muc - self.last_history_time[jid] = mktime(tim) - - except exceptions.PysqliteOperationalError, e: - self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) - except exceptions.DatabaseMalformed: - pritext = _('Database Error') - sectext = _('The database file (%s) cannot be read. Try to ' - 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup) ' - 'or remove it (all history will be lost).') % \ - common.logger.LOG_DB_PATH - self.dispatch('DB_ERROR', (pritext, sectext)) - def _presenceCB(self, con, prs): """ Called when we receive a presence

1 0

gajim: fix traceback when we don't use a profile
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset 3ee30b9823d7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3ee30b9823d7 description: fix traceback when we don't use a profile diffstat: src/gajim.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r ac4eca09dd3d -r 3ee30b9823d7 src/gajim.py --- a/src/gajim.py Sun Oct 23 18:55:14 2011 +0200 +++ b/src/gajim.py Sun Oct 23 19:52:32 2011 +0200 @@ -144,7 +144,8 @@ import locale profile, config_path = parseOpts() -config_path = unicode(config_path, locale.getpreferredencoding()) +if config_path: + config_path = unicode(config_path, locale.getpreferredencoding()) del parseOpts profile = unicode(profile, locale.getpreferredencoding())

1 0

gajim: add advanced option to disable testing of file transfer p...
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset f58419147bf8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f58419147bf8 description: add advanced option to disable testing of file transfer proxies on startup diffstat: src/common/config.py | 1 + src/common/connection.py | 4 +++- src/common/connection_handlers.py | 5 ++++- src/common/proxy65_manager.py | 15 ++++++++++++--- 4 files changed, 20 insertions(+), 5 deletions(-) diffs (97 lines): diff -r 3ee30b9823d7 -r f58419147bf8 src/common/config.py --- a/src/common/config.py Sun Oct 23 19:52:32 2011 +0200 +++ b/src/common/config.py Sun Oct 23 20:26:28 2011 +0200 @@ -290,6 +290,7 @@ 'use_stun_server': [opt_bool, False, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')], 'stun_server': [opt_str, '', _('STUN server to use when using jingle')], 'show_affiliation_in_groupchat': [opt_bool, True, _('If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')], + 'test_ft_proxies_on_startup': [opt_bool, True, _('If True, Gajim will test file transfer proxies on startup to be sure it works. Openfire\'s proxies are known to fail this test even if they work.')], } __options_per_key = { diff -r 3ee30b9823d7 -r f58419147bf8 src/common/connection.py --- a/src/common/connection.py Sun Oct 23 19:52:32 2011 +0200 +++ b/src/common/connection.py Sun Oct 23 20:26:28 2011 +0200 @@ -1719,8 +1719,10 @@ gajim.config.get_per('accounts', self.name, 'use_ft_proxies'): our_fjid = helpers.parse_jid(our_jid + '/' + \ self.server_resource) + testit = gajim.config.get_per('accounts', self.name, + 'test_ft_proxies_on_startup') gajim.proxy65_manager.resolve(obj.fjid, self.connection, - our_fjid, self.name) + our_fjid, default=self.name, testit=testit) if common.xmpp.NS_MUC in obj.features and is_muc: type_ = transport_type or 'jabber' self.muc_jid[type_] = obj.fjid diff -r 3ee30b9823d7 -r f58419147bf8 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Oct 23 19:52:32 2011 +0200 +++ b/src/common/connection_handlers.py Sun Oct 23 20:26:28 2011 +0200 @@ -1889,10 +1889,13 @@ 'file_transfer_proxies') our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name) + \ '/' + self.server_resource) + testit = gajim.config.get_per('accounts', self.name, + 'test_ft_proxies_on_startup') if cfg_proxies: proxies = [e.strip() for e in cfg_proxies.split(',')] for proxy in proxies: - gajim.proxy65_manager.resolve(proxy, self.connection, our_jid) + gajim.proxy65_manager.resolve(proxy, self.connection, our_jid, + testit=testit) def _on_roster_set(self, roster): gajim.nec.push_incoming_event(RosterReceivedEvent(None, conn=self, diff -r 3ee30b9823d7 -r f58419147bf8 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Sun Oct 23 19:52:32 2011 +0200 +++ b/src/common/proxy65_manager.py Sun Oct 23 20:26:28 2011 +0200 @@ -55,15 +55,17 @@ # dict {account: proxy} default proxy for account self.default_proxies = {} - def resolve(self, proxy, connection, sender_jid, default=None): + def resolve(self, proxy, connection, sender_jid, default=None, + testit=True): """ Start + if testit=False, Gajim won't try to resolve it """ if proxy in self.proxies: resolver = self.proxies[proxy] else: # proxy is being ressolved for the first time - resolver = ProxyResolver(proxy, sender_jid) + resolver = ProxyResolver(proxy, sender_jid, testit) self.proxies[proxy] = resolver resolver.add_connection(connection) if default: @@ -115,6 +117,9 @@ self.host = str(host) self.port = int(port) self.jid = unicode(jid) + if not self.testit: + self.state = S_FINISHED + return self.state = S_INITIAL log.info('start resolving %s:%s' % (self.host, self.port)) self.receiver_tester = ReceiverTester(self.host, self.port, self.jid, @@ -209,7 +214,10 @@ query.setNamespace(common.xmpp.NS_BYTESTREAM) connection.send(iq) - def __init__(self, proxy, sender_jid): + def __init__(self, proxy, sender_jid, testit): + """ + if testit is False, don't test it, only get IP/port + """ self.proxy = proxy self.state = S_INITIAL self.active_connection = None @@ -221,6 +229,7 @@ self.port = None self.sid = helpers.get_random_string_16() self.sender_jid = sender_jid + self.testit = testit class HostTester(Socks5, IdleObject): """

1 0

gajim: fix some encoding problems when looking for plugin config...
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset ac4eca09dd3d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ac4eca09dd3d description: fix some encoding problems when looking for plugin config with non-ascii chars in path. Fixes #7015 diffstat: src/gajim.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (27 lines): diff -r a9ebbf95ae2e -r ac4eca09dd3d src/gajim.py --- a/src/gajim.py Sun Oct 23 13:48:00 2011 +0200 +++ b/src/gajim.py Sun Oct 23 18:55:14 2011 +0200 @@ -142,10 +142,11 @@ config_path_ = a return profile_, config_path_ +import locale profile, config_path = parseOpts() +config_path = unicode(config_path, locale.getpreferredencoding()) del parseOpts -import locale profile = unicode(profile, locale.getpreferredencoding()) import common.configpaths @@ -155,8 +156,8 @@ del profile if os.name == 'nt': - plugins_locale_dir = str(os.path.join(common.configpaths.gajimpaths[ - 'PLUGINS_USER'], 'locale')) + plugins_locale_dir = os.path.join(common.configpaths.gajimpaths[ + 'PLUGINS_USER'], 'locale').encode(locale.getpreferredencoding()) libintl.bindtextdomain('gajim_plugins', plugins_locale_dir) libintl.bind_textdomain_codeset('gajim_plugins', 'UTF-8')

1 0

gajim: [Sergiy Yegorov] updated ukrainian translation
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset 651115e7683a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=651115e7683a description: [Sergiy Yegorov] updated ukrainian translation diffstat: po/uk.po | 3400 ++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 1763 insertions(+), 1637 deletions(-) diffs (truncated from 8317 to 300 lines): diff -r 8b5e5a4445ab -r 651115e7683a po/uk.po --- a/po/uk.po Thu Oct 20 14:12:21 2011 +0300 +++ b/po/uk.po Sat Oct 22 10:58:09 2011 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Gajim - A Jabber Instant Messager 0.14.0.1-2fa5ddcd1adf\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:14+0100\n" -"PO-Revision-Date: 2011-03-06 10:45+0200\n" +"POT-Creation-Date: 2011-10-22 10:57+0200\n" +"PO-Revision-Date: 2011-10-19 12:08+0300\n" "Last-Translator: Sergiy Yegorov <prapor(a)unixzone.org.ua>\n" "Language-Team: Ukrainian <kde-i18n-doc(a)kde.org>\n" "Language: uk\n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 1.1\n" +"X-Generator: Lokalize 1.2\n" #: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 msgid "Join _Group Chat..." @@ -27,7 +27,7 @@ msgid "_Add Contact..." msgstr "_Додати контакт..." -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18 +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19 msgid "_Discover Services" msgstr "Ви_явити служби" @@ -119,12 +119,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:17 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1295 ../src/config.py:1398 ../src/config.py:1709 -#: ../src/config.py:1714 ../src/config.py:2280 ../src/config.py:2359 -#: ../src/config.py:2372 ../src/config.py:3649 ../src/config.py:3724 -#: ../src/dialogs.py:312 ../src/dialogs.py:314 ../src/dialogs.py:520 -#: ../src/dialogs.py:533 ../src/roster_window.py:3047 -#: ../src/roster_window.py:3053 ../src/roster_window.py:3058 +#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703 +#: ../src/config.py:1708 ../src/config.py:2284 ../src/config.py:2363 +#: ../src/config.py:2376 ../src/config.py:3655 ../src/config.py:3730 +#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 +#: ../src/dialogs.py:532 ../src/roster_window.py:3092 +#: ../src/roster_window.py:3098 ../src/roster_window.py:3103 msgid "None" msgstr "Немає" @@ -154,7 +154,7 @@ "запис." #: ../data/gui/account_creation_wizard_window.ui.h:24 -#: ../data/gui/roster_window.ui.h:16 +#: ../data/gui/roster_window.ui.h:17 msgid "_Advanced" msgstr "Д_одатково" @@ -167,12 +167,12 @@ msgstr "Назва _вузла:" #: ../data/gui/account_creation_wizard_window.ui.h:27 -#: ../data/gui/accounts_window.ui.h:62 +#: ../data/gui/accounts_window.ui.h:61 msgid "_Jabber ID:" msgstr "_Jabber ID:" #: ../data/gui/account_creation_wizard_window.ui.h:28 -#: ../data/gui/accounts_window.ui.h:64 +#: ../data/gui/accounts_window.ui.h:63 #: ../data/gui/manage_bookmarks_window.ui.h:8 msgid "_Password:" msgstr "_Password:" @@ -235,10 +235,14 @@ msgstr "_З'єднуватись після запуску Gajim" #: ../data/gui/accounts_window.ui.h:13 +msgid "Certificate is e_ncrypted" +msgstr "Сертифікат зашифровано" + +#: ../data/gui/accounts_window.ui.h:14 msgid "Chan_ge Password" msgstr "_Змінити пароль" -#: ../data/gui/accounts_window.ui.h:14 +#: ../data/gui/accounts_window.ui.h:15 msgid "" "Check this so Gajim will ask you before sending your password over an " "insecure connection." @@ -246,10 +250,6 @@ "Позначте цей пункт, щоб Gajim запитував вас перед надсиланням пароля через " "незахищеним з’єднанням." -#: ../data/gui/accounts_window.ui.h:15 -msgid "Choose Client Cert" -msgstr "Оберіть клієнтський сертифікат" - #: ../data/gui/accounts_window.ui.h:16 msgid "Choose _Key..." msgstr "Обрати _ключ..." @@ -288,9 +288,9 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 -#: ../src/notify.py:546 ../src/notify.py:569 ../src/notify.py:618 -#: ../src/notify.py:634 +#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160 +#: ../src/notify.py:318 ../src/notify.py:341 ../src/notify.py:391 +#: ../src/notify.py:407 msgid "Gajim" msgstr "Gajim" @@ -298,9 +298,9 @@ #. FIXME: Ugly workaround. #. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57 -#: ../src/common/contacts.py:141 ../src/dialogs.py:113 ../src/dialogs.py:125 -#: ../src/roster_window.py:2989 ../src/roster_window.py:5570 +#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56 +#: ../src/common/contacts.py:132 ../src/dialogs.py:112 ../src/dialogs.py:124 +#: ../src/roster_window.py:3034 ../src/roster_window.py:5652 msgid "General" msgstr "Загальне" @@ -360,8 +360,8 @@ msgstr "Відомості про вас, які зберігаються на сервері" #: ../data/gui/accounts_window.ui.h:35 -#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1832 -#: ../src/dialogs.py:838 +#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826 +#: ../src/dialogs.py:837 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -374,8 +374,8 @@ msgid "Mer_ge accounts" msgstr "Об’є_днати облікові записи" -#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1805 -#: ../src/config.py:2373 +#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799 +#: ../src/config.py:2377 msgid "No key selected" msgstr "Не обрано жодного ключа" @@ -402,7 +402,7 @@ msgstr "Пріоритет змінюватиметься залежно від вашого стану." #. Rename -#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5520 +#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5602 msgid "Re_name" msgstr "Пере_йменувати" @@ -446,55 +446,51 @@ msgstr "Синхронізувати контакти" #: ../data/gui/accounts_window.ui.h:53 -msgid "The path to the client certificate and key in PKCS#12 format" -msgstr "Шлях до клієнтського сертифікату та ключа у форматі PKCS#12" - -#: ../data/gui/accounts_window.ui.h:54 msgid "Use G_PG Agent" msgstr "Використовувати _агент GnuPG" -#: ../data/gui/accounts_window.ui.h:55 +#: ../data/gui/accounts_window.ui.h:54 msgid "Use cust_om hostname/port" msgstr "Використовувати інші вузол/порт" -#: ../data/gui/accounts_window.ui.h:56 +#: ../data/gui/accounts_window.ui.h:55 msgid "Use cust_om port:" msgstr "Використовувати інший порт:" -#: ../data/gui/accounts_window.ui.h:57 +#: ../data/gui/accounts_window.ui.h:56 msgid "Use file transfer proxies" msgstr "Використовувати проксі передавання файлів" -#: ../data/gui/accounts_window.ui.h:58 +#: ../data/gui/accounts_window.ui.h:57 msgid "_Client Cert File:" msgstr "Файл клієнтського _сертифікату:" -#: ../data/gui/accounts_window.ui.h:59 +#: ../data/gui/accounts_window.ui.h:58 msgid "_Edit Personal Information..." msgstr "Редагувати особисті відомості..." #. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:59 ../data/gui/xml_console_window.ui.h:11 msgid "_Enable" msgstr "Увімкнути" -#: ../data/gui/accounts_window.ui.h:61 +#: ../data/gui/accounts_window.ui.h:60 msgid "_Hostname: " msgstr "Назва _вузла:" -#: ../data/gui/accounts_window.ui.h:63 +#: ../data/gui/accounts_window.ui.h:62 msgid "_Manage..." msgstr "Керування..." -#: ../data/gui/accounts_window.ui.h:65 +#: ../data/gui/accounts_window.ui.h:64 msgid "_Port: " msgstr "_Порт:" -#: ../data/gui/accounts_window.ui.h:66 +#: ../data/gui/accounts_window.ui.h:65 msgid "_Warn before using an insecure connection" msgstr "_Попереджати перед використанням незахищеного з’єднання" -#: ../data/gui/accounts_window.ui.h:67 +#: ../data/gui/accounts_window.ui.h:66 msgid "_use HTTP__PROXY environment variable" msgstr "використовувати змінну середовища HTTP_PROXY" @@ -510,7 +506,7 @@ msgid "Add New Contact" msgstr "Додати новий контакт" -#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1341 +#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1339 msgid "I would like to add you to my contact list." msgstr "Я хочу додати вас до мого списку контактів." @@ -666,182 +662,6 @@ msgid "_Send Server Message..." msgstr "_Надіслати серверне повідомлення..." -#: ../data/gui/advanced_notifications_window.ui.h:1 -msgid " a window/tab opened with that contact " -msgstr " вікно/закладка відкрите з цим контактом " - -#: ../data/gui/advanced_notifications_window.ui.h:2 -msgid "Actions" -msgstr "Дії" - -#: ../data/gui/advanced_notifications_window.ui.h:3 -msgid "Conditions" -msgstr "Умови" - -#: ../data/gui/advanced_notifications_window.ui.h:4 -#: ../data/gui/preferences_window.ui.h:17 -msgid "Sounds" -msgstr "Звуки" - -#: ../data/gui/advanced_notifications_window.ui.h:5 -msgid "Advanced Actions" -msgstr "Додаткові дії" - -#: ../data/gui/advanced_notifications_window.ui.h:6 -msgid "Advanced Notifications Control" -msgstr "Розширене керування сповіщеннями" - -#: ../data/gui/advanced_notifications_window.ui.h:7 -msgid "All statuses" -msgstr "Усі стани" - -#: ../data/gui/advanced_notifications_window.ui.h:8 -#: ../src/common/commands.py:106 ../src/common/helpers.py:239 -#: ../src/tooltips.py:193 -msgid "Away" -msgstr "Далеко" - -#: ../data/gui/advanced_notifications_window.ui.h:9 -msgid "Busy " -msgstr "У справах " - -#: ../data/gui/advanced_notifications_window.ui.h:10 -msgid "Contact Change Status " -msgstr "Зміна стану контакту" - -#: ../data/gui/advanced_notifications_window.ui.h:11 -msgid "Contact Disconnected " -msgstr "Контакт від'єднано" - -#: ../data/gui/advanced_notifications_window.ui.h:12 -msgid "Don't have " -msgstr "Не має " - -#: ../data/gui/advanced_notifications_window.ui.h:13 -msgid "File Transfer Finished" -msgstr "Перенесення файлу завершено" - -#: ../data/gui/advanced_notifications_window.ui.h:14 -msgid "File Transfer Request " -msgstr "Запит на передавання файла" - -#: ../data/gui/advanced_notifications_window.ui.h:15 -msgid "File Transfer Started "

1 0

gajim: fixes some traceback when doing filetransfer. Fixes #1205
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset a9ebbf95ae2e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a9ebbf95ae2e description: fixes some traceback when doing filetransfer. Fixes #1205 diffstat: src/chat_control.py | 4 ++-- src/common/protocol/bytestream.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diffs (35 lines): diff -r 651115e7683a -r a9ebbf95ae2e src/chat_control.py --- a/src/chat_control.py Sat Oct 22 10:58:09 2011 +0200 +++ b/src/chat_control.py Sun Oct 23 13:48:00 2011 +0200 @@ -3243,7 +3243,7 @@ Show an InfoBar on top of control """ markup = '%s: %s' % (_('File transfer'), file_props['name']) - if file_props['desc']: + if 'desc' in file_props and file_props['desc']: markup += ' (%s)' % file_props['desc'] markup += '\n%s: %s' % (_('Size'), helpers.convert_bytes( file_props['size'])) @@ -3272,7 +3272,7 @@ def _got_file_completed(self, file_props): markup = '%s: %s' % (_('File transfer completed'), file_props['name']) - if file_props['desc']: + if 'desc' in file_props and file_props['desc']: markup += ' (%s)' % file_props['desc'] b1 = gtk.Button(_('_Open Containing Folder')) b1.connect('clicked', self._on_open_ft_folder, file_props) diff -r 651115e7683a -r a9ebbf95ae2e src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sat Oct 22 10:58:09 2011 +0200 +++ b/src/common/protocol/bytestream.py Sun Oct 23 13:48:00 2011 +0200 @@ -620,6 +620,10 @@ self.send_success_connect_reply, None) raise xmpp.NodeProcessed + if file_props is None: + log.warn('Gajim got streamhosts for unknown transfer. Ignoring it.') + raise xmpp.NodeProcessed + file_props['streamhosts'] = streamhosts if file_props['type'] == 'r': gajim.socks5queue.connect_to_hosts(self.name, sid,

1 0

gajim: add comment
by Fomin Denis 01 Dec '11

01 Dec '11

changeset 8b5e5a4445ab in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8b5e5a4445ab description: add comment diffstat: src/roster_window.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 84ebc01b8027 -r 8b5e5a4445ab src/roster_window.py --- a/src/roster_window.py Thu Oct 20 13:49:16 2011 +0300 +++ b/src/roster_window.py Thu Oct 20 14:12:21 2011 +0300 @@ -2388,6 +2388,7 @@ accounts_to_disconnect.append(acct) if not self.quit_on_next_offline: + # all accounts offline, quit self.quit_gtkgui_interface() return

1 0

gajim: don't call quit_gtkgui_interface twice
by Fomin Denis 01 Dec '11

01 Dec '11

changeset 84ebc01b8027 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=84ebc01b8027 description: don't call quit_gtkgui_interface twice diffstat: src/roster_window.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (21 lines): diff -r c6104c524b86 -r 84ebc01b8027 src/roster_window.py --- a/src/roster_window.py Mon Oct 17 18:00:27 2011 +0200 +++ b/src/roster_window.py Thu Oct 20 13:49:16 2011 +0300 @@ -2387,13 +2387,14 @@ self.quit_on_next_offline += 1 accounts_to_disconnect.append(acct) + if not self.quit_on_next_offline: + self.quit_gtkgui_interface() + return + for acct in accounts_to_disconnect: self.send_status(acct, 'offline', message) self.send_pep(acct, pep_dict) - if not self.quit_on_next_offline: - self.quit_gtkgui_interface() - def on_continue2(message, pep_dict): # check if there is an active file transfer from common.protocol.bytestream import (is_transfer_active)

1 0

gajim: remove buttons from infobar just before adding new instea...
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset c6104c524b86 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c6104c524b86 description: remove buttons from infobar just before adding new instead of when hidding infobar diffstat: src/chat_control.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diffs (30 lines): diff -r c08418f0aeec -r c6104c524b86 src/chat_control.py --- a/src/chat_control.py Mon Oct 17 17:55:43 2011 +0200 +++ b/src/chat_control.py Mon Oct 17 18:00:27 2011 +0200 @@ -3199,8 +3199,16 @@ return markup, buttons, args, type_ = self.info_bar_queue[0] self.info_bar_label.set_markup(markup) + + # Remove old buttons + area = self.info_bar.get_action_area() + for b in area.get_children(): + area.remove(b) + + # Add new buttons for button in buttons: self.info_bar.add_action_widget(button, 0) + self.info_bar.set_message_type(type_) self.info_bar.set_no_show_all(False) self.info_bar.show_all() @@ -3318,9 +3326,6 @@ self.info_bar_queue.remove(ib_msg) if i == 0: # We are removing the one currently displayed - area = self.info_bar.get_action_area() - for b in area.get_children(): - area.remove(b) self.info_bar.hide() # show next one? gobject.idle_add(self._info_bar_show_message)

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 December 2011