Commits February 2012

commits@gajim.org

3 participants
51 discussions

gajim: fix traceback. Fixes #7103
by Yann Leboulanger 14 Feb '12

14 Feb '12

changeset 77544052e500 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=77544052e500 description: fix traceback. Fixes #7103 diffstat: src/common/zeroconf/client_zeroconf.py | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diffs (25 lines): diff -r ab73b2f90d33 -r 77544052e500 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Tue Feb 14 19:24:16 2012 +0400 +++ b/src/common/zeroconf/client_zeroconf.py Tue Feb 14 19:35:09 2012 +0100 @@ -803,11 +803,19 @@ def on_ok(_waitid): # if timeout: # self._owner.set_timeout(timeout) - to = stanza.getTo() + to = unicode(stanza.getTo()) + to = gajim.get_jid_without_resource(to) + + try: + item = self.roster[to] + except KeyError: + # Contact offline + item = None + conn = None if to in self.recipient_to_hash: conn = self.connections[self.recipient_to_hash[to]] - elif item['address'] in self.ip_to_hash: + elif item and item['address'] in self.ip_to_hash: hash_ = self.ip_to_hash[item['address']] if self.hash_to_port[hash_] == item['port']: conn = self.connections[hash_]

1 0

gajim: PassphraseDialog to be transient for roster window. Fixes...
by Fomin Denis 14 Feb '12

14 Feb '12

changeset ab73b2f90d33 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ab73b2f90d33 description: PassphraseDialog to be transient for roster window. Fixes #7102 diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 827306d1ea47 -r ab73b2f90d33 src/dialogs.py --- a/src/dialogs.py Fri Feb 10 19:07:59 2012 +0400 +++ b/src/dialogs.py Tue Feb 14 19:24:16 2012 +0400 @@ -233,7 +233,7 @@ cancelbutton.connect('clicked', self.on_cancelbutton_clicked) self.xml.connect_signals(self) - self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT) + self.window.set_transient_for(gajim.interface.roster.window) self.window.show_all() self.check = bool(checkbuttontext)

1 0

gajim: refactoring
by Jefry Lagrange 13 Feb '12

13 Feb '12

changeset 01e82472cc5b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=01e82472cc5b description: refactoring diffstat: src/common/jingle_ft.py | 34 +++++++++++++--------------------- 1 files changed, 13 insertions(+), 21 deletions(-) diffs (101 lines): diff -r 2eed9411ae2d -r 01e82472cc5b src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Jan 24 16:51:26 2012 -0500 +++ b/src/common/jingle_ft.py Sun Feb 12 19:36:20 2012 -0500 @@ -34,18 +34,16 @@ STATE_NOT_STARTED = 0 STATE_INITIALIZED = 1 STATE_ACCEPTED = 2 -STATE_TRANSPORT_INFO = 3 -STATE_PROXY_ACTIVATED = 4 # We send the candidates and we are waiting for a reply -STATE_CAND_SENT_PENDING_REPLY = 5 +STATE_CAND_SENT = 3 # We received the candidates and we are waiting to reply -STATE_CAND_RECEIVED_PENDING_REPLY = 6 +STATE_CAND_RECEIVED = 4 # We have sent and received the candidates # This also includes any candidate-error received or sent -STATE_CAND_SENT_AND_RECEIVED = 7 +STATE_CAND_SENT_AND_RECEIVED = 5 +STATE_TRANSPORT_REPLACE = 6 # We are transfering the file -STATE_TRANSFERING = 8 -STATE_TRANSPORT_REPLACE = 9 +STATE_TRANSFERING = 7 class JingleFileTransfer(JingleContent): @@ -200,7 +198,7 @@ if content.getTag('transport').getTag('candidate-error'): self.nominated_cand['peer-cand'] = False - if self.state == STATE_CAND_SENT_PENDING_REPLY: + if self.state == STATE_CAND_SENT: if not self.nominated_cand['our-cand'] and \ not self.nominated_cand['peer-cand']: if not self.weinitiate: @@ -213,7 +211,7 @@ self.start_transfer() raise xmpp.NodeProcessed else: - self.state = STATE_CAND_RECEIVED_PENDING_REPLY + self.state = STATE_CAND_RECEIVED return @@ -236,14 +234,14 @@ return # We save the candidate nominated by peer self.nominated_cand['peer-cand'] = streamhost_used - if self.state == STATE_CAND_SENT_PENDING_REPLY: + if self.state == STATE_CAND_SENT: response = stanza.buildReply('result') response.delChild(response.getQuery()) self.session.connection.connection.send(response) self.start_transfer() raise xmpp.NodeProcessed else: - self.state = STATE_CAND_RECEIVED_PENDING_REPLY + self.state = STATE_CAND_RECEIVED @@ -272,12 +270,6 @@ gajim.socks5queue.connect_to_hosts(self.session.connection.name, self.file_props['sid'], self.send_candidate_used, self._on_connect_error, fingerprint=fingerprint) - elif not self.weinitiate and self.state == STATE_ACCEPTED: - # transport-info iq-result - self.state = STATE_TRANSPORT_INFO - elif self.weinitiate and self.state == STATE_INITIALIZED: - # proxy activated - self.state = STATE_PROXY_ACTIVATED elif self.state == STATE_CAND_SENT_AND_RECEIVED: if not self.nominated_cand['our-cand'] and \ not self.nominated_cand['peer-cand']: @@ -313,10 +305,10 @@ return self.nominated_cand['our-cand'] = streamhost - if self.state == STATE_CAND_RECEIVED_PENDING_REPLY: + if self.state == STATE_CAND_RECEIVED: self.state = STATE_CAND_SENT_AND_RECEIVED else: - self.state = STATE_CAND_SENT_PENDING_REPLY + self.state = STATE_CAND_SENT content = xmpp.Node('content') content.setAttr('creator', 'initiator') @@ -339,10 +331,10 @@ self.nominated_cand['our-cand'] = False self.send_error_candidate() - if self.state == STATE_CAND_RECEIVED_PENDING_REPLY: + if self.state == STATE_CAND_RECEIVED: self.state = STATE_CAND_SENT_AND_RECEIVED else: - self.state = STATE_CAND_SENT_PENDING_REPLY + self.state = STATE_CAND_SENT log.info('connect error, sid=' + sid)

1 0

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

12 Feb '12

changeset e4030fd618fe in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e4030fd618fe description: Sergiy Yegorov.Updated Ukrainian translation. diffstat: po/be.po | 354 ++++++++++++++++++++++++++++---------------------------- po/be(a)latin.po | 354 ++++++++++++++++++++++++++++---------------------------- po/bg.po | 354 ++++++++++++++++++++++++++++---------------------------- po/br.po | 354 ++++++++++++++++++++++++++++---------------------------- po/cs.po | 354 ++++++++++++++++++++++++++++---------------------------- po/da.po | 354 ++++++++++++++++++++++++++++---------------------------- po/de.po | 354 ++++++++++++++++++++++++++++---------------------------- po/el.po | 354 ++++++++++++++++++++++++++++---------------------------- po/en_GB.po | 354 ++++++++++++++++++++++++++++---------------------------- po/eo.po | 354 ++++++++++++++++++++++++++++---------------------------- po/es.po | 354 ++++++++++++++++++++++++++++---------------------------- po/eu.po | 354 ++++++++++++++++++++++++++++---------------------------- po/fr.po | 354 ++++++++++++++++++++++++++++---------------------------- po/gl.po | 354 ++++++++++++++++++++++++++++---------------------------- po/hr.po | 354 ++++++++++++++++++++++++++++---------------------------- po/it.po | 354 ++++++++++++++++++++++++++++---------------------------- po/ja.po | 354 ++++++++++++++++++++++++++++---------------------------- po/kk.po | 354 ++++++++++++++++++++++++++++---------------------------- po/lt.po | 354 ++++++++++++++++++++++++++++---------------------------- po/nb.po | 354 ++++++++++++++++++++++++++++---------------------------- po/nl.po | 354 ++++++++++++++++++++++++++++---------------------------- po/no.po | 354 ++++++++++++++++++++++++++++---------------------------- po/pl.po | 354 ++++++++++++++++++++++++++++---------------------------- po/pt.po | 354 ++++++++++++++++++++++++++++---------------------------- po/pt_BR.po | 354 ++++++++++++++++++++++++++++---------------------------- po/ru.po | 354 ++++++++++++++++++++++++++++---------------------------- po/sk.po | 354 ++++++++++++++++++++++++++++---------------------------- po/sr.po | 354 ++++++++++++++++++++++++++++---------------------------- po/sr(a)Latn.po | 354 ++++++++++++++++++++++++++++---------------------------- po/sv.po | 354 ++++++++++++++++++++++++++++---------------------------- po/uk.po | 354 ++++++++++++++++++++++++++++---------------------------- po/zh_CN.po | 354 ++++++++++++++++++++++++++++---------------------------- po/zh_TW.po | 354 ++++++++++++++++++++++++++++---------------------------- 33 files changed, 5808 insertions(+), 5874 deletions(-) diffs (truncated from 35399 to 300 lines): diff -r 2b5c4d7144de -r e4030fd618fe po/be.po --- a/po/be.po Wed Feb 08 22:06:29 2012 -0500 +++ b/po/be.po Fri Feb 10 19:07:59 2012 +0400 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.10.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-22 18:56+0100\n" +"POT-Creation-Date: 2012-02-12 20:36+0100\n" "PO-Revision-Date: 2009-08-19 23:42+0200\n" "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka(a)gmail.com>\n" "Language-Team: Belarusian <i18n(a)mova.org>\n" @@ -223,8 +223,8 @@ msgstr "Рахункі" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:8 ../src/dialogs.py:3383 -#: ../src/dialogs.py:3429 +#: ../data/gui/accounts_window.ui.h:8 ../src/dialogs.py:3386 +#: ../src/dialogs.py:3432 #, fuzzy msgid "Add" msgstr "Адрас" @@ -294,8 +294,8 @@ msgstr "Злучэнне" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:23 ../src/dialogs.py:3387 -#: ../src/dialogs.py:3484 +#: ../data/gui/accounts_window.ui.h:23 ../src/dialogs.py:3390 +#: ../src/dialogs.py:3487 msgid "Delete" msgstr "Выдаліць" @@ -1535,7 +1535,7 @@ msgid "Bro_wse Rooms" msgstr "_Праглядзець" -#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2333 +#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2336 msgid "Join Group Chat" msgstr "Удзельнічаць у групавой размове" @@ -2505,7 +2505,7 @@ msgid "Order:" msgstr "Парадак:" -#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3978 +#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3981 msgid "Privacy List" msgstr "Спіс прыватнасці" @@ -3379,8 +3379,8 @@ #. Add to roster #: ../src/chat_control.py:1701 ../src/common/contacts.py:158 #: ../src/common/contacts.py:277 ../src/common/helpers.py:67 -#: ../src/common/helpers.py:261 ../src/dialogs.py:1099 ../src/dialogs.py:2227 -#: ../src/dialogs.py:2256 ../src/gui_interface.py:477 +#: ../src/common/helpers.py:261 ../src/dialogs.py:1099 ../src/dialogs.py:2230 +#: ../src/dialogs.py:2259 ../src/gui_interface.py:477 #: ../src/gui_menu_builder.py:254 ../src/gui_menu_builder.py:405 #: ../src/roster_window.py:767 ../src/roster_window.py:1687 #: ../src/roster_window.py:1689 ../src/roster_window.py:2022 @@ -3408,7 +3408,7 @@ msgstr "%(nickname)s з групавой размовы %(room_name)s" #. No key assigned nor a key is used by remote contact -#: ../src/chat_control.py:2162 ../src/dialogs.py:5039 +#: ../src/chat_control.py:2162 ../src/dialogs.py:5042 msgid "No GPG key assigned" msgstr "" @@ -3727,7 +3727,7 @@ #. invalid char #: ../src/command_system/implementation/standard.py:267 ../src/config.py:3392 -#: ../src/dialogs.py:2075 +#: ../src/dialogs.py:2078 #, fuzzy msgid "Invalid nickname" msgstr "Няправільнае імя карыстальніка" @@ -4979,106 +4979,104 @@ msgstr "" #: ../src/common/connection_handlers_events.py:1012 -#: ../src/common/connection_handlers_events.py:1044 -#: ../src/common/connection_handlers_events.py:1060 +#: ../src/common/connection_handlers_events.py:1049 #: ../src/common/connection.py:262 ../src/config.py:2149 ../src/config.py:2158 #: ../src/config.py:2226 ../src/config.py:3663 ../src/dataforms_widget.py:623 -#: ../src/dialogs.py:3091 +#: ../src/dialogs.py:3094 msgid "Invalid Jabber ID" msgstr "Няправільны Jabber ID" #: ../src/common/connection_handlers_events.py:1013 -#: ../src/common/connection_handlers_events.py:1045 -#: ../src/common/connection_handlers_events.py:1061 +#: ../src/common/connection_handlers_events.py:1050 msgid "A message from a non-valid JID arrived, it has been ignored." msgstr "" #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session)) -#: ../src/common/connection_handlers_events.py:1087 +#: ../src/common/connection_handlers_events.py:1075 #: ../src/gui_interface.py:425 ../src/gui_interface.py:439 #, fuzzy, python-format msgid "error while sending %(message)s ( %(error)s )" msgstr "памылка адпраўкі %s ( %s )" -#: ../src/common/connection_handlers_events.py:1520 +#: ../src/common/connection_handlers_events.py:1508 #, python-format msgid "Unknown SSL error: %d" msgstr "" -#: ../src/common/connection_handlers_events.py:2048 ../src/dialogs.py:2778 +#: ../src/common/connection_handlers_events.py:2036 ../src/dialogs.py:2781 #: ../src/notify.py:263 msgid "New Single Message" msgstr "Новае асобнае паведамленне" -#: ../src/common/connection_handlers_events.py:2050 +#: ../src/common/connection_handlers_events.py:2038 #, python-format msgid "New Single Message from %(nickname)s" msgstr "Новае асобнае паведамленне ад %(nickname)s" -#: ../src/common/connection_handlers_events.py:2054 ../src/dialogs.py:2779 +#: ../src/common/connection_handlers_events.py:2042 ../src/dialogs.py:2782 #: ../src/notify.py:264 msgid "New Private Message" msgstr "Новае прыватнае паведамленне" -#: ../src/common/connection_handlers_events.py:2056 +#: ../src/common/connection_handlers_events.py:2044 #, python-format msgid "New Private Message from group chat %s" msgstr "Новае прыватнае паведамленне ў групавой размове %s" -#: ../src/common/connection_handlers_events.py:2059 +#: ../src/common/connection_handlers_events.py:2047 #, python-format msgid "%(nickname)s: %(message)s" msgstr "%(nickname)s: %(message)s" -#: ../src/common/connection_handlers_events.py:2062 +#: ../src/common/connection_handlers_events.py:2050 #, fuzzy, python-format msgid "Messaged by %(nickname)s" msgstr "Новае паведамленне ад %(nickname)s" -#: ../src/common/connection_handlers_events.py:2066 ../src/dialogs.py:2778 +#: ../src/common/connection_handlers_events.py:2054 ../src/dialogs.py:2781 #: ../src/notify.py:263 msgid "New Message" msgstr "Новае паведамленне" -#: ../src/common/connection_handlers_events.py:2068 +#: ../src/common/connection_handlers_events.py:2056 #, python-format msgid "New Message from %(nickname)s" msgstr "Новае паведамленне ад %(nickname)s" -#: ../src/common/connection_handlers_events.py:2197 +#: ../src/common/connection_handlers_events.py:2185 #, python-format msgid "%(nick)s Changed Status" msgstr "%(nick)s змяніў стан" -#: ../src/common/connection_handlers_events.py:2199 +#: ../src/common/connection_handlers_events.py:2187 #: ../src/groupchat_control.py:205 ../src/groupchat_control.py:1766 #: ../src/history_window.py:447 #, python-format msgid "%(nick)s is now %(status)s" msgstr "%(nick)s цяпер %(status)s" -#: ../src/common/connection_handlers_events.py:2204 ../src/dialogs.py:2790 +#: ../src/common/connection_handlers_events.py:2192 ../src/dialogs.py:2793 #: ../src/notify.py:277 msgid "Contact Changed Status" msgstr "Чалавек змяніў стан" -#: ../src/common/connection_handlers_events.py:2206 +#: ../src/common/connection_handlers_events.py:2194 #, python-format msgid "%(nickname)s Signed In" msgstr "%(nickname)s прыйшоў" #. default value -#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2774 +#: ../src/common/connection_handlers_events.py:2199 ../src/dialogs.py:2777 #: ../src/notify.py:259 msgid "Contact Signed In" msgstr "Чалавек прыйшоў" -#: ../src/common/connection_handlers_events.py:2213 +#: ../src/common/connection_handlers_events.py:2201 #, python-format msgid "%(nickname)s Signed Out" msgstr "%(nickname)s сышоў" -#: ../src/common/connection_handlers_events.py:2218 ../src/dialogs.py:2776 +#: ../src/common/connection_handlers_events.py:2206 ../src/dialogs.py:2779 #: ../src/notify.py:261 msgid "Contact Signed Out" msgstr "Чалавек сышоў" @@ -5114,12 +5112,12 @@ "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s" msgstr "" -#: ../src/common/connection_handlers.py:571 ../src/common/connection.py:1551 +#: ../src/common/connection_handlers.py:571 ../src/common/connection.py:1554 #, fuzzy msgid "Invisibility not supported" msgstr "Пашырэнне не падтрымліваецца" -#: ../src/common/connection_handlers.py:572 ../src/common/connection.py:1552 +#: ../src/common/connection_handlers.py:572 ../src/common/connection.py:1555 #, python-format msgid "Account %s doesn't support invisibility." msgstr "" @@ -5258,7 +5256,7 @@ msgid "Application verification failure" msgstr "" -#: ../src/common/connection.py:263 ../src/dialogs.py:3092 +#: ../src/common/connection.py:263 ../src/dialogs.py:3095 #, fuzzy, python-format msgid "It is not possible to send a message to %s, this JID is not valid." msgstr "Немагчыма адправіць пусты файл" @@ -5287,113 +5285,113 @@ "Тэма: %s\n" "%s" -#: ../src/common/connection.py:861 +#: ../src/common/connection.py:864 #, python-format msgid "Connection with account \"%s\" has been lost" msgstr "Злучэнне для рахунка \"%s\" згубленае" -#: ../src/common/connection.py:862 +#: ../src/common/connection.py:865 msgid "Reconnect manually." msgstr "Перадалучыцеся самастойна." #. it's a new account #. wrong answer -#: ../src/common/connection.py:873 +#: ../src/common/connection.py:876 #, fuzzy, python-format msgid "Server %(name)s answered wrongly to register request: %(error)s" msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s" #. requested config has changed since first connection -#: ../src/common/connection.py:915 +#: ../src/common/connection.py:918 #, python-format msgid "Server %s provided a different registration form" msgstr "" -#: ../src/common/connection.py:932 +#: ../src/common/connection.py:935 msgid "Invalid answer" msgstr "Няправільны адказ" -#: ../src/common/connection.py:933 +#: ../src/common/connection.py:936 #, fuzzy, python-format msgid "Transport %(name)s answered wrongly to register request: %(error)s" msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s" -#: ../src/common/connection.py:1208 ../src/common/connection.py:1360 -#: ../src/common/connection.py:1988 +#: ../src/common/connection.py:1211 ../src/common/connection.py:1363 +#: ../src/common/connection.py:1991 #: ../src/common/zeroconf/connection_zeroconf.py:205 #, python-format msgid "Could not connect to \"%s\"" msgstr "Немагчыма злучыцца з \"%s\"" -#: ../src/common/connection.py:1209 ../src/gui_interface.py:534 +#: ../src/common/connection.py:1212 ../src/gui_interface.py:534 msgid "Check your connection or try again later." msgstr "Праверце злучэнне, альбо паспрабуйце пазней." -#: ../src/common/connection.py:1214 +#: ../src/common/connection.py:1217 #, fuzzy, python-format msgid "Server replied: %s" msgstr "Захаваць у: %s" -#: ../src/common/connection.py:1229 +#: ../src/common/connection.py:1232 #, fuzzy msgid "Connection to proxy failed" msgstr "Памылка злучэння" -#: ../src/common/connection.py:1267 ../src/common/connection.py:1339

1 0

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

12 Feb '12

changeset 2b5c4d7144de in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b5c4d7144de 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 9b845a49e621 -r 2b5c4d7144de 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 @@ -821,6 +821,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 12 Feb '12

12 Feb '12

changeset 9b845a49e621 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9b845a49e621 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 ff22a0737205 -r 9b845a49e621 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 @@ -1027,15 +1027,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: @@ -1046,23 +1051,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 12 Feb '12

12 Feb '12

changeset ff22a0737205 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ff22a0737205 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 c6cddacb5a2b -r ff22a0737205 src/dialogs.py --- a/src/dialogs.py Sun Jan 22 20:33:16 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: 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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2012