Commits

commits@gajim.org

17632 discussions

gajim: Sergiy Yegorov.Updated Ukrainian translation.
by Fomin Denis 10 Feb '12

10 Feb '12

changeset 827306d1ea47 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=827306d1ea47 description: Sergiy Yegorov.Updated Ukrainian translation. diffstat: po/uk.po | 2600 ++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 1456 insertions(+), 1144 deletions(-) diffs (truncated from 6436 to 300 lines): diff -r f374dbed485b -r 827306d1ea47 po/uk.po --- a/po/uk.po Wed Feb 08 22:06:29 2012 -0500 +++ b/po/uk.po Fri Feb 10 19:07:59 2012 +0400 @@ -2,13 +2,13 @@ # Copyright (C) 2010 THE Gajim - A Jabber Instant Messager'S COPYRIGHT HOLDER # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package. # -# Sergiy Yegorov <prapor(a)unixzone.org.ua>, 2010, 2011. +# Sergiy Yegorov <prapor(a)unixzone.org.ua>, 2010, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Gajim - A Jabber Instant Messager 0.14.0.1-2fa5ddcd1adf\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-22 10:57+0200\n" -"PO-Revision-Date: 2011-10-19 12:08+0300\n" +"POT-Creation-Date: 2012-02-03 01:18+0200\n" +"PO-Revision-Date: 2012-02-03 01:43+0200\n" "Last-Translator: Sergiy Yegorov <prapor(a)unixzone.org.ua>\n" "Language-Team: Ukrainian <kde-i18n-doc(a)kde.org>\n" "Language: uk\n" @@ -107,7 +107,7 @@ msgstr "Я бажаю _зареєструвати новий обліковий запис" #: ../data/gui/account_creation_wizard_window.ui.h:15 -#: ../data/gui/accounts_window.ui.h:28 +#: ../data/gui/accounts_window.ui.h:30 msgid "If checked, Gajim will remember the password for this account" msgstr "" "Якщо буде позначено цей пункт, Gajim запам'ятає пароль цього облікового " @@ -118,13 +118,14 @@ msgstr "Керування..." #: ../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: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 +#: ../data/gui/accounts_window.ui.h:41 ../data/gui/change_mood_dialog.ui.h:3 +#: ../src/config.py:1265 ../src/config.py:1279 ../src/config.py:1284 +#: ../src/config.py:1332 ../src/config.py:1435 ../src/config.py:1746 +#: ../src/config.py:1751 ../src/config.py:2327 ../src/config.py:2406 +#: ../src/config.py:2419 ../src/config.py:3699 ../src/config.py:3774 #: ../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 +#: ../src/dialogs.py:532 ../src/roster_window.py:3139 +#: ../src/roster_window.py:3145 ../src/roster_window.py:3150 msgid "None" msgstr "Немає" @@ -133,7 +134,7 @@ msgstr "Прокс_і:" #: ../data/gui/account_creation_wizard_window.ui.h:19 -#: ../data/gui/accounts_window.ui.h:48 +#: ../data/gui/accounts_window.ui.h:50 msgid "Save pass_word" msgstr "Зберегти _пароль" @@ -167,12 +168,12 @@ msgstr "Назва _вузла:" #: ../data/gui/account_creation_wizard_window.ui.h:27 -#: ../data/gui/accounts_window.ui.h:61 +#: ../data/gui/accounts_window.ui.h:63 msgid "_Jabber ID:" msgstr "_Jabber ID:" #: ../data/gui/account_creation_wizard_window.ui.h:28 -#: ../data/gui/accounts_window.ui.h:63 +#: ../data/gui/accounts_window.ui.h:65 #: ../data/gui/manage_bookmarks_window.ui.h:8 msgid "_Password:" msgstr "_Password:" @@ -214,35 +215,41 @@ msgid "Accounts" msgstr "Облікові записи" -#: ../data/gui/accounts_window.ui.h:8 +#. Change label for accept_button to action name instead of 'OK'. +#: ../data/gui/accounts_window.ui.h:8 ../src/dialogs.py:3384 +#: ../src/dialogs.py:3430 +msgid "Add" +msgstr "Додати" + +#: ../data/gui/accounts_window.ui.h:9 msgid "Administration operations" msgstr "Адміністративні дії" -#: ../data/gui/accounts_window.ui.h:9 +#: ../data/gui/accounts_window.ui.h:10 msgid "Anonymous authentication" msgstr "Анонімна аутентифікація" -#: ../data/gui/accounts_window.ui.h:10 +#: ../data/gui/accounts_window.ui.h:11 msgid "Auto-reconnect when connection is lost" msgstr "Автоматично відновлювати втрачене з'єднання" -#: ../data/gui/accounts_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:12 msgid "Browse..." msgstr "Перегляд..." -#: ../data/gui/accounts_window.ui.h:12 +#: ../data/gui/accounts_window.ui.h:13 msgid "C_onnect on Gajim startup" msgstr "_З'єднуватись після запуску Gajim" -#: ../data/gui/accounts_window.ui.h:13 +#: ../data/gui/accounts_window.ui.h:14 msgid "Certificate is e_ncrypted" msgstr "Сертифікат зашифровано" -#: ../data/gui/accounts_window.ui.h:14 +#: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" msgstr "_Змінити пароль" -#: ../data/gui/accounts_window.ui.h:15 +#: ../data/gui/accounts_window.ui.h:16 msgid "" "Check this so Gajim will ask you before sending your password over an " "insecure connection." @@ -250,47 +257,53 @@ "Позначте цей пункт, щоб Gajim запитував вас перед надсиланням пароля через " "незахищеним з’єднанням." -#: ../data/gui/accounts_window.ui.h:16 +#: ../data/gui/accounts_window.ui.h:17 msgid "Choose _Key..." msgstr "Обрати _ключ..." -#: ../data/gui/accounts_window.ui.h:17 +#: ../data/gui/accounts_window.ui.h:18 msgid "Click to change account's password" msgstr "Натисніть. щоб змінити пароль цього облікового запису" -#: ../data/gui/accounts_window.ui.h:18 +#: ../data/gui/accounts_window.ui.h:19 msgid "Click to request authorization to all contacts of another account" msgstr "" "Натисніть, щоб запитати уповноваження від усіх контактів іншого облікового " "запису" -#: ../data/gui/accounts_window.ui.h:19 +#: ../data/gui/accounts_window.ui.h:20 msgid "Client certificate" msgstr "Клієнтський сертифікат" -#: ../data/gui/accounts_window.ui.h:20 +#: ../data/gui/accounts_window.ui.h:21 msgid "Co_nnect on Gajim startup" msgstr "_З'єднуватись після запуску Gajim" -#: ../data/gui/accounts_window.ui.h:21 +#: ../data/gui/accounts_window.ui.h:22 msgid "Connection" msgstr "З'єднання" -#: ../data/gui/accounts_window.ui.h:22 +#. Change label for accept_button to action name instead of 'OK'. +#: ../data/gui/accounts_window.ui.h:23 ../src/dialogs.py:3388 +#: ../src/dialogs.py:3485 +msgid "Delete" +msgstr "Вилучити" + +#: ../data/gui/accounts_window.ui.h:24 #: ../data/gui/zeroconf_information_window.ui.h:2 msgid "E-Mail:" msgstr "Ел. пошта:" -#: ../data/gui/accounts_window.ui.h:23 +#: ../data/gui/accounts_window.ui.h:25 #: ../data/gui/zeroconf_information_window.ui.h:3 msgid "First Name:" msgstr "Ім'я:" #. No configured account -#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 -#: ../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 +#: ../data/gui/accounts_window.ui.h:26 ../data/gui/roster_window.ui.h:5 +#: ../src/common/helpers.py:1168 ../src/common/helpers.py:1180 +#: ../src/notify.py:314 ../src/notify.py:337 ../src/notify.py:387 +#: ../src/notify.py:403 msgid "Gajim" msgstr "Gajim" @@ -298,13 +311,14 @@ #. 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:56 +#: ../data/gui/accounts_window.ui.h:27 ../data/gui/preferences_window.ui.h:57 #: ../src/common/contacts.py:132 ../src/dialogs.py:112 ../src/dialogs.py:124 -#: ../src/roster_window.py:3034 ../src/roster_window.py:5652 +#: ../src/roster_window.py:3081 ../src/roster_window.py:4148 +#: ../src/roster_window.py:5738 msgid "General" msgstr "Загальне" -#: ../data/gui/accounts_window.ui.h:26 +#: ../data/gui/accounts_window.ui.h:28 msgid "" "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." @@ -313,13 +327,13 @@ "адреси. окрім вашої, тому передавання файлів працюватиме з більшою " "ймовірністю." -#: ../data/gui/accounts_window.ui.h:27 +#: ../data/gui/accounts_window.ui.h:29 msgid "If checked, Gajim will get the password from a GPG agent like seahorse" msgstr "" "Якщо буде позначено цей пункт, Gajim буде отримувати пароль від агента GPG, " "наприклад, seahorse." -#: ../data/gui/accounts_window.ui.h:29 +#: ../data/gui/accounts_window.ui.h:31 msgid "" "If checked, Gajim will send keep-alive packets to prevent connection timeout " "which results in disconnection" @@ -327,7 +341,7 @@ "Якщо буде позначено цей пункт, Gajim надсилатиме порожні пакети для " "запобігання простою з'єднання (такий простій може призводити до від'єднання)" -#: ../data/gui/accounts_window.ui.h:30 +#: ../data/gui/accounts_window.ui.h:32 msgid "" "If checked, Gajim, when launched, will automatically connect to jabber using " "this account" @@ -335,7 +349,7 @@ "Якщо буде позначено цей пункт, Gajim під час запуску буде автоматично " "намагатись з'єднатися з вказаним обліковим записом на сервері jabber" -#: ../data/gui/accounts_window.ui.h:31 +#: ../data/gui/accounts_window.ui.h:33 msgid "" "If checked, any change to the global status (handled by the combobox at the " "bottom of the roster window) will change the status of this account " @@ -345,7 +359,7 @@ "спадним списком у нижній частині вікна реєстру) призведе до відповідних змін " "стану цього облікового запису" -#: ../data/gui/accounts_window.ui.h:32 +#: ../data/gui/accounts_window.ui.h:34 msgid "" "If the default port that is used for incoming messages is unfitting for your " "setup you can select another one here.\n" @@ -355,39 +369,39 @@ "налаштувань, ви можете налаштувати інший.\n" "Можливо, вам також доведеться змінити параметри брандмауера." -#: ../data/gui/accounts_window.ui.h:34 +#: ../data/gui/accounts_window.ui.h:36 msgid "Information about you, as stored in the server" msgstr "Відомості про вас, які зберігаються на сервері" -#: ../data/gui/accounts_window.ui.h:35 -#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826 +#: ../data/gui/accounts_window.ui.h:37 +#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1869 #: ../src/dialogs.py:837 msgid "Jabber ID:" msgstr "Jabber ID:" -#: ../data/gui/accounts_window.ui.h:36 +#: ../data/gui/accounts_window.ui.h:38 #: ../data/gui/zeroconf_information_window.ui.h:5 msgid "Last Name:" msgstr "Прізвище:" -#: ../data/gui/accounts_window.ui.h:37 +#: ../data/gui/accounts_window.ui.h:39 msgid "Mer_ge accounts" msgstr "Об’є_днати облікові записи" -#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799 -#: ../src/config.py:2377 +#: ../data/gui/accounts_window.ui.h:40 ../src/config.py:1842 +#: ../src/config.py:2420 msgid "No key selected" msgstr "Не обрано жодного ключа" -#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35 +#: ../data/gui/accounts_window.ui.h:42 ../data/gui/profile_window.ui.h:35 msgid "Personal Information" msgstr "Особисті відомості" -#: ../data/gui/accounts_window.ui.h:41 +#: ../data/gui/accounts_window.ui.h:43 msgid "Priori_ty:" msgstr "Пріорите_т:" -#: ../data/gui/accounts_window.ui.h:42 +#: ../data/gui/accounts_window.ui.h:44 msgid "" "Priority is used in Jabber to determine who gets the events from the jabber "

1 0

gajim: visibly disconnect when loosing connection. Fixes #7091
by Jefry Lagrange 09 Feb '12

09 Feb '12

changeset f374dbed485b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f374dbed485b description: visibly disconnect when loosing connection. Fixes #7091 diffstat: src/common/connection.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r bc578921d50e -r f374dbed485b src/common/connection.py --- a/src/common/connection.py Tue Feb 07 20:46:42 2012 +0100 +++ b/src/common/connection.py Wed Feb 08 22:06:29 2012 -0500 @@ -810,6 +810,9 @@ if not (self.sm and self.sm.resumption): gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) + else: + gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, + show='error')) self.disconnect() if gajim.config.get_per('accounts', self.name, 'autoreconnect'): self.connected = -1

1 0

gajim: [Zash] update Carbon XEP (XEP-0280) to 0.6 version. Fixes...
by Yann Leboulanger 07 Feb '12

07 Feb '12

changeset bc578921d50e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bc578921d50e description: [Zash] update Carbon XEP (XEP-0280) to 0.6 version. Fixes #7093 diffstat: src/common/connection_handlers_events.py | 34 ++++++++++--------------------- 1 files changed, 11 insertions(+), 23 deletions(-) diffs (54 lines): diff -r b347d0a5eabe -r bc578921d50e src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Feb 05 21:30:54 2012 +0100 +++ b/src/common/connection_handlers_events.py Tue Feb 07 20:46:42 2012 +0100 @@ -1016,15 +1016,20 @@ return self.jid = gajim.get_jid_without_resource(self.fjid) - forward_tag = self.stanza.getTag('forwarded', namespace=xmpp.NS_FORWARD) + carbon_marker = self.stanza.getTag('sent', namespace=xmpp.NS_CARBONS) + if not carbon_marker: + carbon_marker = self.stanza.getTag('received', namespace=xmpp.NS_CARBONS) # Be sure it comes from one of our resource, else ignore forward element - if forward_tag and self.jid == gajim.get_jid_from_account(account): - received_tag = forward_tag.getTag('received', - namespace=xmpp.NS_CARBONS) - sent_tag = forward_tag.getTag('sent', namespace=xmpp.NS_CARBONS) - if received_tag: + if carbon_marker and self.jid == gajim.get_jid_from_account(account): + forward_tag = self.stanza.getTag('forwarded', namespace=xmpp.NS_FORWARD) + if forward_tag: msg = forward_tag.getTag('message') self.stanza = xmpp.Message(node=msg) + if carbon_marker.getName() == 'sent': + to = self.stanza.getTo() + self.stanza.setTo(self.stanza.getFrom()) + self.stanza.setFrom(to) + self.sent = True try: self.get_jid_resource() except helpers.InvalidFormat: @@ -1035,23 +1040,6 @@ 'has been ignored.'))) return self.forwarded = True - elif sent_tag: - msg = forward_tag.getTag('message') - self.stanza = xmpp.Message(node=msg) - to = self.stanza.getTo() - self.stanza.setTo(self.stanza.getFrom()) - self.stanza.setFrom(to) - try: - self.get_jid_resource() - except helpers.InvalidFormat: - gajim.nec.push_incoming_event(InformationEvent(None, - conn=self.conn, level='error', - pri_txt=_('Invalid Jabber ID'), - sec_txt=_('A message from a non-valid JID arrived, it ' - 'has been ignored.'))) - return - self.forwarded = True - self.sent = True self.enc_tag = self.stanza.getTag('x', namespace=xmpp.NS_ENCRYPTED)

1 0

gajim: add destroy function to CommonInputDialog class. Fixes #7092
by Yann Leboulanger 05 Feb '12

05 Feb '12

changeset b347d0a5eabe in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b347d0a5eabe description: add destroy function to CommonInputDialog class. Fixes #7092 diffstat: src/dialogs.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 94c7a7736449 -r b347d0a5eabe src/dialogs.py --- a/src/dialogs.py Sun Jan 22 18:51:25 2012 +0100 +++ b/src/dialogs.py Sun Feb 05 21:30:54 2012 +0100 @@ -1937,6 +1937,9 @@ def on_cancelbutton_clicked(self, widget): self.dialog.destroy() + def destroy(self): + self.dialog.destroy() + class InputDialog(CommonInputDialog): """ Class for Input dialog

1 0

gajim: better way to handle non supported hash algorithms
by Jefry Lagrange 24 Jan '12

24 Jan '12

changeset 2eed9411ae2d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2eed9411ae2d description: better way to handle non supported hash algorithms diffstat: src/common/jingle_ft.py | 8 ++++++-- src/common/xmpp/protocol.py | 10 ++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diffs (48 lines): diff -r d57f00841330 -r 2eed9411ae2d src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Jan 24 10:04:14 2012 -0500 +++ b/src/common/jingle_ft.py Tue Jan 24 16:51:26 2012 -0500 @@ -118,11 +118,15 @@ if self.session.hash_algo == None: return try: - file = open(self.file_props['file-name'], 'r') + file_ = open(self.file_props['file-name'], 'r') except: + # can't open file return h = xmpp.Hashes() - hash_ = h.calculateHash(self.session.hash_algo, file) + hash_ = h.calculateHash(self.session.hash_algo, file_) + if not hash_: + # Hash alogrithm not supported + return self.file_props['hash'] = hash_ h.addHash(hash_, self.session.hash_algo) checksum = xmpp.Node(tag='checksum', diff -r d57f00841330 -r 2eed9411ae2d src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Tue Jan 24 10:04:14 2012 -0500 +++ b/src/common/xmpp/protocol.py Tue Jan 24 16:51:26 2012 -0500 @@ -1078,10 +1078,7 @@ elif algo == 'sha-512': hl = hashlib.sha512() - if hl == None: - # Raise exception - raise Exception('Hash algorithm not supported') - else: + if hl: hl.update(file_string) hash_ = hl.hexdigest() else: # if it is a file @@ -1095,10 +1092,7 @@ elif algo == 'sha-512': hl = hashlib.sha512() - if hl == None: - # Raise exception - raise Exception('Hash algorithm not supported') - else: + if hl: for line in file_string: hl.update(line) hash_ = hl.hexdigest()

1 0

gajim: coding standards
by Jefry Lagrange 24 Jan '12

24 Jan '12

changeset d57f00841330 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d57f00841330 description: coding standards diffstat: src/common/jingle_ft.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r 8c3e77b63eef -r d57f00841330 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Jan 24 07:28:40 2012 +0100 +++ b/src/common/jingle_ft.py Tue Jan 24 10:04:14 2012 -0500 @@ -122,9 +122,9 @@ except: return h = xmpp.Hashes() - hash = h.calculateHash(self.session.hash_algo, file) - self.file_props['hash'] = hash - h.addHash(hash, self.session.hash_algo) + hash_ = h.calculateHash(self.session.hash_algo, file) + self.file_props['hash'] = hash_ + h.addHash(hash_, self.session.hash_algo) checksum = xmpp.Node(tag='checksum', payload=[xmpp.Node(tag='file', payload=[h])]) checksum.setNamespace(xmpp.NS_JINGLE_FILE_TRANSFER)

1 0

gajim: coding standards
by Yann Leboulanger 24 Jan '12

24 Jan '12

changeset 8c3e77b63eef in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8c3e77b63eef description: coding standards diffstat: src/common/xmpp/protocol.py | 14 +++++++------- src/gui_interface.py | 22 ++++++++++++---------- 2 files changed, 19 insertions(+), 17 deletions(-) diffs (113 lines): diff -r d342571e82e0 -r 8c3e77b63eef src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Mon Jan 23 22:28:07 2012 -0500 +++ b/src/common/xmpp/protocol.py Tue Jan 24 07:28:40 2012 +0100 @@ -1066,7 +1066,7 @@ instead of doing it all over the place in Gajim. """ hl = None - hash = None + hash_ = None # file_string can be a string or a file if type(file_string) == str: # if it is a string if algo == 'md5': @@ -1083,7 +1083,7 @@ raise Exception('Hash algorithm not supported') else: hl.update(file_string) - hash = hl.hexdigest() + hash_ = hl.hexdigest() else: # if it is a file if algo == 'md5': @@ -1101,25 +1101,25 @@ else: for line in file_string: hl.update(line) - hash = hl.hexdigest() + hash_ = hl.hexdigest() - return hash + return hash_ - def addHash(self, hash, algo): + def addHash(self, hash_, algo): """ More than one hash can be added. Although it is permitted, it should not be done for big files because it could slow down Gajim. """ attrs = {} attrs['algo'] = algo - self.addChild('hash', attrs, [hash]) + self.addChild('hash', attrs, [hash_]) class Acks(Node): """ Acknowledgement elements for Stream Management """ def __init__(self, nsp=NS_STREAM_MGMT): - Node.__init__(self, None, {}, [], None, None,False, None) + Node.__init__(self, None, {}, [], None, None, False, None) self.setNamespace(nsp) def buildAnswer(self, handled): diff -r d342571e82e0 -r 8c3e77b63eef src/gui_interface.py --- a/src/gui_interface.py Mon Jan 23 22:28:07 2012 -0500 +++ b/src/gui_interface.py Tue Jan 24 07:28:40 2012 +0100 @@ -909,18 +909,20 @@ self.last_ftwindow_update = time.time() self.instances['file_transfers'].set_progress(file_props['type'], file_props['sid'], file_props['received-len']) + def __compare_hashes(self, account, file_props): session = gajim.connections[account].get_jingle_session(jid=None, - sid=file_props['session-sid']) + sid=file_props['session-sid']) h = Hashes() try: - file = open(file_props['file-name'], 'r') + file_ = open(file_props['file-name'], 'r') except: return - hash = h.calculateHash(session.hash_algo, file) + hash_ = h.calculateHash(session.hash_algo, file_) + file_.close() # If the hash we received and the hash of the file are the same, # then the file is not corrupt - if session.file_hash == hash: + if session.file_hash == hash_: print "they are te same" # End jingle session if session: @@ -930,18 +932,18 @@ ft = self.instances['file_transfers'] if file_props['error'] == 0: ft.set_progress(file_props['type'], file_props['sid'], - file_props['received-len']) + file_props['received-len']) else: ft.set_status(file_props['type'], file_props['sid'], 'stop') if 'stalled' in file_props and file_props['stalled'] or \ - 'paused' in file_props and file_props['paused']: + 'paused' in file_props and file_props['paused']: return - + if file_props['type'] == 'r': # we receive a file jid = unicode(file_props['sender']) # Compare hashes in a new thread - self.hashThread = Thread(target=self.__compare_hashes, - args=(account, file_props)) + self.hashThread = Thread(target=self.__compare_hashes, + args=(account, file_props)) self.hashThread.start() gajim.socks5queue.remove_receiver(file_props['sid'], True, True) else: # we send a file @@ -969,7 +971,7 @@ elif file_props['error'] in (-1, -6): msg_type = 'file-stopped' event_type = _('File Transfer Stopped') - + if event_type == '': # FIXME: ugly workaround (this can happen Gajim sent, Gaim recvs) # this should never happen but it does. see process_result() in

1 0

gajim: check file integrity when transfer is completed
by Jefry Lagrange 24 Jan '12

24 Jan '12

changeset d342571e82e0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d342571e82e0 description: check file integrity when transfer is completed diffstat: src/common/jingle.py | 2 +- src/common/jingle_ft.py | 10 +++++----- src/common/jingle_session.py | 7 ++++++- src/common/xmpp/protocol.py | 3 +-- src/gui_interface.py | 28 ++++++++++++++++++++++------ 5 files changed, 35 insertions(+), 15 deletions(-) diffs (149 lines): diff -r 9682f6b115e3 -r d342571e82e0 src/common/jingle.py --- a/src/common/jingle.py Sun Jan 15 19:53:40 2012 -0500 +++ b/src/common/jingle.py Mon Jan 23 22:28:07 2012 -0500 @@ -157,7 +157,7 @@ transport = JingleTransportIBB() c = JingleFileTransfer(jingle, transport=transport, file_props=file_props, use_security=use_security) - c.hash_algo = self.__hash_support(contact) + jingle.hash_algo = self.__hash_support(contact) jingle.add_content('file' + helpers.get_random_string_16(), c) jingle.start_session() return c.transport.sid diff -r 9682f6b115e3 -r d342571e82e0 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sun Jan 15 19:53:40 2012 -0500 +++ b/src/common/jingle_ft.py Mon Jan 23 22:28:07 2012 -0500 @@ -103,9 +103,7 @@ self.media = 'file' self.nominated_cand = {} - # Hash algorithm that we are using to calculate the integrity of the - # file. Could be 'md5', 'sha-1', etc... - self.hash_algo = None + def __on_session_initiate(self, stanza, content, error, action): gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, @@ -117,14 +115,16 @@ self.hashThread.start() def __calcHash(self): - if self.hash_algo == None: + if self.session.hash_algo == None: return try: file = open(self.file_props['file-name'], 'r') except: return h = xmpp.Hashes() - h.calculateHash(self.hash_algo, file) + hash = h.calculateHash(self.session.hash_algo, file) + self.file_props['hash'] = hash + h.addHash(hash, self.session.hash_algo) checksum = xmpp.Node(tag='checksum', payload=[xmpp.Node(tag='file', payload=[h])]) checksum.setNamespace(xmpp.NS_JINGLE_FILE_TRANSFER) diff -r 9682f6b115e3 -r d342571e82e0 src/common/jingle_session.py --- a/src/common/jingle_session.py Sun Jan 15 19:53:40 2012 -0500 +++ b/src/common/jingle_session.py Mon Jan 23 22:28:07 2012 -0500 @@ -98,6 +98,9 @@ self.accepted = True # is this session accepted by user + # Hash algorithm that we are using to calculate the integrity of the + # file. Could be 'md5', 'sha-1', etc... + self.hash_algo = None self.file_hash = None # callbacks to call on proper contents # use .prepend() to add new callbacks, especially when you're going @@ -424,9 +427,11 @@ for hash in hashes.getChildren(): algo = hash.getAttr('algo') if algo in xmpp.Hashes.supported: + self.hash_algo = algo data = hash.getData() + # This only works because there is only one session + # per file in jingleFT self.file_hash = data - print data raise xmpp.NodeProcessed self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info', type_='modify') raise xmpp.NodeProcessed diff -r 9682f6b115e3 -r d342571e82e0 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Sun Jan 15 19:53:40 2012 -0500 +++ b/src/common/xmpp/protocol.py Mon Jan 23 22:28:07 2012 -0500 @@ -1067,7 +1067,6 @@ """ hl = None hash = None - # file_string can be a string or a file if type(file_string) == str: # if it is a string if algo == 'md5': @@ -1104,7 +1103,7 @@ hl.update(line) hash = hl.hexdigest() - self.addHash(hash, algo) + return hash def addHash(self, hash, algo): """ diff -r 9682f6b115e3 -r d342571e82e0 src/gui_interface.py --- a/src/gui_interface.py Sun Jan 15 19:53:40 2012 -0500 +++ b/src/gui_interface.py Mon Jan 23 22:28:07 2012 -0500 @@ -71,6 +71,7 @@ import common.sleepy from common.xmpp import idlequeue +from common.xmpp import Hashes from common.zeroconf import connection_zeroconf from common import resolver from common import caps_cache @@ -908,6 +909,22 @@ self.last_ftwindow_update = time.time() self.instances['file_transfers'].set_progress(file_props['type'], file_props['sid'], file_props['received-len']) + def __compare_hashes(self, account, file_props): + session = gajim.connections[account].get_jingle_session(jid=None, + sid=file_props['session-sid']) + h = Hashes() + try: + file = open(file_props['file-name'], 'r') + except: + return + hash = h.calculateHash(session.hash_algo, file) + # If the hash we received and the hash of the file are the same, + # then the file is not corrupt + if session.file_hash == hash: + print "they are te same" + # End jingle session + if session: + session.end_session() def handle_event_file_rcv_completed(self, account, file_props): ft = self.instances['file_transfers'] @@ -919,18 +936,17 @@ if 'stalled' in file_props and file_props['stalled'] or \ 'paused' in file_props and file_props['paused']: return - + if file_props['type'] == 'r': # we receive a file jid = unicode(file_props['sender']) + # Compare hashes in a new thread + self.hashThread = Thread(target=self.__compare_hashes, + args=(account, file_props)) + self.hashThread.start() gajim.socks5queue.remove_receiver(file_props['sid'], True, True) else: # we send a file jid = unicode(file_props['receiver']) gajim.socks5queue.remove_sender(file_props['sid'], True, True) - # End jingle session - session = gajim.connections[account].get_jingle_session(jid, - sid=file_props['session-sid']) - if session: - session.end_session() if helpers.allow_popup_window(account): if file_props['error'] == 0:

1 0

gajim-website: update downloads page
by Yann Leboulanger 23 Jan '12

23 Jan '12

changeset e7722fc3b896 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=e7722fc3b896 description: update downloads page diffstat: downloads.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 29be426dde91 -r e7722fc3b896 downloads.php --- a/downloads.php Sun Jan 22 22:16:09 2012 +0100 +++ b/downloads.php Mon Jan 23 21:22:57 2012 +0100 @@ -148,7 +148,7 @@ print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-1.exe\">"._("Gajim installer")."</a>.\n"; #print _("The installer doesn't contain translations because of a") . " <a href=\"https://bugzilla.gnome.org/show_bug.cgi?id=574520\">" . _("GTK bug") . "</a>.\n"; print (" <br/>\n"); -print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-beta4-1.exe\">"._("Gajim installer")."</a> "; +print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-beta4-2.exe\">"._("Gajim installer")."</a> "; printf(_("for %s version "), "0.15-beta4"); print (".\n"); print (" <br/>\n");

1 0

gajim-website: Jabber -> Jabber/XMPP
by Yann Leboulanger 22 Jan '12

22 Jan '12

changeset 29be426dde91 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=29be426dde91 description: Jabber -> Jabber/XMPP diffstat: index.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b0fe9c1f13a4 -r 29be426dde91 index.php --- a/index.php Sun Jan 22 20:42:35 2012 +0100 +++ b/index.php Sun Jan 22 22:16:09 2012 +0100 @@ -4,7 +4,7 @@ require_once ("Design.php"); - Entete (_("Gajim, a Jabber client"), "GAJIM"); + Entete (_("Gajim, a Jabber/XMPP client"), "GAJIM"); $tpl = new Template("templates"); $tpl->set_file("page","index.tpl");

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