Commits September 2009

commits@gajim.org

5 participants
120 discussions

gajim: [Florob] handle new error code in groupchat. Fixes #5285
by Yann Leboulanger 30 Sep '09

30 Sep '09

changeset 1f328f481264 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1f328f481264 description: [Florob] handle new error code in groupchat. Fixes #5285 diffstat: src/common/connection_handlers.py | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diffs (56 lines): diff -r 116459faef6c -r 1f328f481264 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Sep 30 17:02:51 2009 +0200 +++ b/src/common/connection_handlers.py Wed Sep 30 17:21:58 2009 +0200 @@ -2264,32 +2264,43 @@ if is_gc: if ptype == 'error': - errmsg = prs.getError() + errcon = prs.getError() + errmsg = prs.getErrorMsg() errcode = prs.getErrorCode() room_jid, nick = gajim.get_room_and_nick_from_fjid(who) - if errcode == '502': # Internal Timeout: + if errcode == '502': + # Internal Timeout: self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, prio, keyID, timestamp, None)) - elif errcode == '401': # password required to join + elif (errcode == '503'): + # maximum user number reached + self.dispatch('ERROR', (_('Unable to join group chat'), + _('Maximum number of users for %s has been reached') % \ + room_jid)) + elif (errcode == '401') or (errcon == 'not-authorized'): + # password required to join self.dispatch('GC_PASSWORD_REQUIRED', (room_jid, nick)) - elif errcode == '403': # we are banned + elif (errcode == '403') or (errcon == 'forbidden'): + # we are banned self.dispatch('ERROR', (_('Unable to join group chat'), _('You are banned from group chat %s.') % room_jid)) - elif errcode == '404': # group chat does not exist + elif (errcode == '404') or (errcon == 'item-not-found'): + # group chat does not exist self.dispatch('ERROR', (_('Unable to join group chat'), _('Group chat %s does not exist.') % room_jid)) - elif errcode == '405': + elif (errcode == '405') or (errcon == 'not-allowed'): self.dispatch('ERROR', (_('Unable to join group chat'), _('Group chat creation is restricted.'))) - elif errcode == '406': + elif (errcode == '406') or (errcon == 'not-acceptable'): self.dispatch('ERROR', (_('Unable to join group chat'), _('Your registered nickname must be used in group chat %s.') \ % room_jid)) - elif errcode == '407': + elif (errcode == '407') or (errcon == 'registration-required'): self.dispatch('ERROR', (_('Unable to join group chat'), _('You are not in the members list in groupchat %s.') % \ room_jid)) - elif errcode == '409': # nick conflict + elif (errcode == '409') or (errcon == 'conflict'): + # nick conflict room_jid = gajim.get_room_from_fjid(who) self.dispatch('ASK_NEW_NICK', (room_jid,)) else: # print in the window the error

1 0

gajim: use python sha and hmac built-in modules rather than thos...
by Yann Leboulanger 30 Sep '09

30 Sep '09

changeset 116459faef6c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=116459faef6c description: use python sha and hmac built-in modules rather than those in python-crypto. Fixes #5294 diffstat: src/common/crypto.py | 4 ++-- src/common/stanza_session.py | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diffs (109 lines): diff -r 86374d2c4cc8 -r 116459faef6c src/common/crypto.py --- a/src/common/crypto.py Tue Sep 29 14:52:25 2009 +0200 +++ b/src/common/crypto.py Wed Sep 30 17:02:51 2009 +0200 @@ -22,7 +22,7 @@ import os import math -from Crypto.Hash import SHA256 +from hashlib import sha256 # convert a large integer to a big-endian bitstring def encode_mpi(n): @@ -58,7 +58,7 @@ return 256 * decode_mpi(s[:-1]) + ord(s[-1]) def sha256(string): - sh = SHA256.new() + sh = sha256() sh.update(string) return sh.digest() diff -r 86374d2c4cc8 -r 116459faef6c src/common/stanza_session.py --- a/src/common/stanza_session.py Tue Sep 29 14:52:25 2009 +0200 +++ b/src/common/stanza_session.py Wed Sep 30 17:02:51 2009 +0200 @@ -33,10 +33,11 @@ import time import base64 import os +from hashlib import sha256 +from hmac import HMAC if gajim.HAVE_PYCRYPTO: from Crypto.Cipher import AES - from Crypto.Hash import HMAC, SHA256 from Crypto.PublicKey import RSA from common import crypto @@ -249,7 +250,7 @@ def sign(self, string): if self.negotiated['sign_algs'] == (XmlDsig + 'rsa-sha256'): - hash_ = crypto.sha256(string) + hash_ = sha256(string) return crypto.encode_mpi(gajim.pubkey.sign(hash_, '')[0]) def encrypt_stanza(self, stanza): @@ -370,7 +371,7 @@ if (not 1 < e < (p - 1)): raise NegotiationError('invalid DH value') - return crypto.sha256(crypto.encode_mpi(crypto.powmod(e, y, p))) + return sha256(crypto.encode_mpi(crypto.powmod(e, y, p))) def c7lize_mac_id(self, form): kids = form.getChildren() @@ -434,7 +435,7 @@ mac_o_calculated = self.hmac(self.ks_o, content) if self.negotiated['recv_pubkey']: - hash_ = crypto.sha256(mac_o_calculated) + hash_ = sha256(mac_o_calculated) if not eir_pubkey.verify(hash_, signature): raise NegotiationError('public key signature verification failed!') @@ -582,7 +583,7 @@ self.sas_algs = 'sas28x5' self.cipher = AES - self.hash_alg = SHA256 + self.hash_alg = sha256 self.compression = None for name in form.asDict(): @@ -826,7 +827,7 @@ e = crypto.decode_mpi(base64.b64decode(form['dhkeys'])) p = dh.primes[self.modp] - if crypto.sha256(crypto.encode_mpi(e)) != self.negotiated['He']: + if sha256(crypto.encode_mpi(e)) != self.negotiated['He']: raise NegotiationError('SHA256(e) != He') k = self.get_shared_secret(e, self.y, p) @@ -853,7 +854,7 @@ # (we're not using one) oss = '' - k = crypto.sha256(k + srs + oss) + k = sha256(k + srs + oss) self.kc_s, self.km_s, self.ks_s = self.generate_responder_keys(k) self.kc_o, self.km_o, self.ks_o = self.generate_initiator_keys(k) @@ -905,7 +906,7 @@ break oss = '' - k = crypto.sha256(self.k + srs + oss) + k = sha256(self.k + srs + oss) del self.k self.do_retained_secret(k, srs) @@ -983,7 +984,7 @@ dhs.append(base64.b64encode(crypto.encode_mpi(e))) name = 'dhkeys' else: - He = crypto.sha256(crypto.encode_mpi(e)) + He = sha256(crypto.encode_mpi(e)) dhs.append(base64.b64encode(He)) name = 'dhhashes'

1 0

gajim: merge default branch to jingle
by Thibaut GIRKA 29 Sep '09

29 Sep '09

changeset 18a2f3b3c524 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=18a2f3b3c524 description: merge default branch to jingle diffstat: po/pt_BR.po | 2663 ++++++++++++++++---------------- src/commands/framework.py | 13 +- src/commands/implementation.py | 2 +- src/commands/middleware.py | 6 +- src/common/connection.py | 23 +- src/common/gajim.py | 2 +- src/common/helpers.py | 5 + src/common/i18n.py | 18 + src/common/xmpp/roster_nb.py | 10 + src/common/zeroconf/connection_zeroconf.py | 5 + src/common/zeroconf/roster_zeroconf.py | 4 + src/conversation_textview.py | 25 +- src/dialogs.py | 10 + src/gajim.py | 90 +- src/groupchat_control.py | 14 +- src/htmltextview.py | 206 +- src/music_track_listener.py | 20 - src/notify.py | 2 +- src/remote_control.py | 5 +- src/roster_window.py | 82 +- src/session.py | 2 +- 21 files changed, 1634 insertions(+), 1573 deletions(-) diffs (truncated from 7596 to 300 lines): diff -r 22894f7e41f2 -r 18a2f3b3c524 po/pt_BR.po --- a/po/pt_BR.po Mon Sep 28 22:31:28 2009 +0200 +++ b/po/pt_BR.po Tue Sep 29 20:49:40 2009 +0200 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-19 20:36+0200\n" -"PO-Revision-Date: 2009-08-20 00:00+0200\n" +"POT-Creation-Date: 2009-09-24 09:09+0200\n" +"PO-Revision-Date: 2009-09-23 09:56-0300\n" "Last-Translator: Djavan Fagundes <dnoway(a)gmail.com>\n" "Language-Team: Português Brasileiro <gajim-devel(a)gajim.org>\n" "MIME-Version: 1.0\n" @@ -99,7 +99,7 @@ #: ../data/glade/account_creation_wizard_window.glade.h:7 msgid "@" -msgstr "" +msgstr "@" #: ../data/glade/account_creation_wizard_window.glade.h:8 msgid "" @@ -112,11 +112,11 @@ #: ../data/glade/account_creation_wizard_window.glade.h:11 #, fuzzy msgid "Anon_ymous authentication" -msgstr "Usar autenticação" +msgstr "Usar aut_enticação de proxy" #: ../data/glade/account_creation_wizard_window.glade.h:12 msgid "Connect when I press Finish" -msgstr "Conectar quando eu clicar em Fim" +msgstr "Conectar quando eu clicar em Concluir" #: ../data/glade/account_creation_wizard_window.glade.h:13 msgid "Gajim: Account Creation Wizard" @@ -219,6 +219,7 @@ #: ../data/glade/account_modification_window.glade.h:4 #: ../data/glade/accounts_window.glade.h:6 +#: ../data/glade/join_groupchat_window.glade.h:1 msgid "Account" msgstr "Conta" @@ -286,8 +287,8 @@ #. No configured account #: ../data/glade/account_modification_window.glade.h:16 #: ../data/glade/accounts_window.glade.h:21 -#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212 -#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568 +#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217 +#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568 #: ../src/notify.py:607 ../src/notify.py:619 msgid "Gajim" msgstr "Gajim" @@ -298,8 +299,8 @@ #: ../data/glade/account_modification_window.glade.h:17 #: ../data/glade/accounts_window.glade.h:22 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98 -#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719 -#: ../src/roster_window.py:5277 +#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2686 +#: ../src/roster_window.py:5270 msgid "General" msgstr "Geral" @@ -324,7 +325,7 @@ "which results in disconnection" msgstr "" "Se marcado, o Gajim enviará pacotes keep-alive para prevenir timeout na " -"conexão, fazendo-a cair" +"conexão, evitando-a cair" #: ../data/glade/account_modification_window.glade.h:22 msgid "" @@ -359,25 +360,21 @@ msgstr "Informações sobre você são gravadas no servidor" #: ../data/glade/account_modification_window.glade.h:27 -#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547 -#: ../src/config.py:2092 +#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1578 +#: ../src/config.py:2122 msgid "No key selected" msgstr "Nenhuma chave selecionada" #. None means no proxy profile selected -#. boshuseproxy_checkbutton.set_active(False) -#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton) -#. useauth_checkbutton.set_active(False) -#. self.on_useauth_checkbutton_toggled(useauth_checkbutton) #: ../data/glade/account_modification_window.glade.h:29 #: ../data/glade/accounts_window.glade.h:37 -#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103 -#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457 -#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091 -#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293 +#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1104 +#: ../src/config.py:1207 ../src/config.py:1483 ../src/config.py:1488 +#: ../src/config.py:2029 ../src/config.py:2108 ../src/config.py:2121 +#: ../src/config.py:3257 ../src/config.py:3330 ../src/dialogs.py:293 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511 -#: ../src/roster_window.py:2789 ../src/roster_window.py:2795 -#: ../src/roster_window.py:2800 +#: ../src/roster_window.py:2756 ../src/roster_window.py:2762 +#: ../src/roster_window.py:2767 msgid "None" msgstr "Nenhum" @@ -483,9 +480,8 @@ msgstr "Proxy" #: ../data/glade/accounts_window.glade.h:5 -#, fuzzy msgid "A_djust to status" -msgstr "_Ajustar para status" +msgstr "Aj_ustar para status" #: ../data/glade/accounts_window.glade.h:7 msgid "Accounts" @@ -494,7 +490,7 @@ #: ../data/glade/accounts_window.glade.h:9 #, fuzzy msgid "Anonymous authentication" -msgstr "Usar autenticação" +msgstr "Usar aut_enticação de proxy" #: ../data/glade/accounts_window.glade.h:13 msgid "" @@ -505,9 +501,8 @@ "através de uma conexão não-segura." #: ../data/glade/accounts_window.glade.h:17 -#, fuzzy msgid "Co_nnect on Gajim startup" -msgstr "C_onectar na inicialização do Gajim" +msgstr "Co_nectar na inicialização do Gajim" #: ../data/glade/accounts_window.glade.h:19 #: ../data/glade/zeroconf_information_window.glade.h:2 @@ -534,7 +529,7 @@ "Considere a possível modificação das regras do seu firewall." #: ../data/glade/accounts_window.glade.h:32 -#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571 +#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1602 #: ../src/dialogs.py:784 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -549,57 +544,47 @@ msgstr "Mes_clar contas" #. Rename -#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228 +#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5221 msgid "Re_name" msgstr "Re_nomear" #: ../data/glade/accounts_window.glade.h:47 -#, fuzzy msgid "Send _keep-alive packets" msgstr "Enviar pacotes para manter a conexão (keep-alive)" #: ../data/glade/accounts_window.glade.h:49 -#, fuzzy msgid "Synchroni_ze account status with global status" -msgstr "_Sincronizar status da conta com status global" +msgstr "Sincroni_zar status da conta com status global" #: ../data/glade/accounts_window.glade.h:51 -#, fuzzy msgid "Use G_PG Agent" -msgstr "Usar o _Agente GPG" +msgstr "Usar o Agente G_PG" #: ../data/glade/accounts_window.glade.h:52 -#, fuzzy msgid "Use cust_om hostname/port" -msgstr "Usa nome de máquina/porta customizados" +msgstr "Usa nome de máquina/porta personalizad_os" #: ../data/glade/accounts_window.glade.h:53 -#, fuzzy msgid "Use cust_om port:" -msgstr "Usar servidor/porta personalizado" +msgstr "Usar porta pers_onalizada:" #: ../data/glade/accounts_window.glade.h:55 -#, fuzzy msgid "_Edit Personal Information..." -msgstr "Editar detalhes pessoais..." +msgstr "_Editar detalhes pessoais..." #: ../data/glade/accounts_window.glade.h:56 -#, fuzzy msgid "_Enable" -msgstr "Habilitar" +msgstr "Ha_bilitar" #: ../data/glade/accounts_window.glade.h:57 -#, fuzzy msgid "_Hostname: " msgstr "_Nome do computador:" #: ../data/glade/accounts_window.glade.h:59 -#, fuzzy msgid "_Manage..." -msgstr "Gerenciar..." +msgstr "Gere_nciar..." #: ../data/glade/accounts_window.glade.h:61 -#, fuzzy msgid "_Port: " msgstr "_Porta:" @@ -608,9 +593,8 @@ msgstr "A_visar antes de usar uma conexão não-segura" #: ../data/glade/accounts_window.glade.h:63 -#, fuzzy msgid "_use HTTP__PROXY environment variable" -msgstr "Usar variável de ambiente HTTP_PROXY" +msgstr "_usar variável de ambiente HTTP__PROXY" #: ../data/glade/accounts_window.glade.h:64 msgid "gtk-add" @@ -649,7 +633,7 @@ "protocol. Click on register button to\n" "proceed." msgstr "" -"Você deve estar registrado a este \n" +"Você deve estar registrado para este \n" "transporte para poder adicionar \n" "contatos deste protocolo. Clique no \n" "botão Registrar para aceitar." @@ -812,7 +796,7 @@ msgstr "Totos os status" #: ../data/glade/advanced_notifications_window.glade.h:8 -#: ../src/common/commands.py:101 ../src/common/helpers.py:214 +#: ../src/common/commands.py:101 ../src/common/helpers.py:219 msgid "Away" msgstr "Afastado" @@ -829,7 +813,7 @@ msgstr "Possui " #: ../data/glade/advanced_notifications_window.glade.h:12 -#: ../src/common/helpers.py:224 +#: ../src/common/helpers.py:229 msgid "Invisible" msgstr "Invisível" @@ -838,7 +822,7 @@ msgstr "Executar um comando" #: ../data/glade/advanced_notifications_window.glade.h:14 -#: ../src/common/helpers.py:197 +#: ../src/common/helpers.py:202 msgid "Not Available" msgstr "Não disponível" @@ -1056,7 +1040,6 @@ #: ../data/glade/chat_control_popup_menu.glade.h:2 #: ../data/glade/gc_occupants_menu.glade.h:3 -#: ../data/glade/zeroconf_contact_context_menu.glade.h:4 msgid "Send _File" msgstr "Enviar _arquivo" @@ -1077,9 +1060,7 @@ #: ../data/glade/gc_control_popup_menu.glade.h:6 #: ../data/glade/gc_occupants_menu.glade.h:8 #: ../data/glade/roster_contact_context_menu.glade.h:17 -#: ../data/glade/roster_window.glade.h:21 -#: ../data/glade/zeroconf_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:5924 +#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5928 msgid "_History" msgstr "_Histórico" @@ -1212,7 +1193,7 @@ #: ../data/glade/gajim_themes_window.glade.h:1 msgid "Chatstate Tab Colors" -msgstr "Aba cores do bate-papo" +msgstr "Aba de cores do bate-papo" #: ../data/glade/gajim_themes_window.glade.h:2 msgid "" @@ -1226,13 +1207,13 @@ "Linha contato\n" "Banner de conversa" -#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770 +#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:810 msgid "Bold" msgstr "Negrito"

1 0

gajim: don't use same var for different things in the same funct...
by Yann Leboulanger 29 Sep '09

29 Sep '09

changeset 86374d2c4cc8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=86374d2c4cc8 description: don't use same var for different things in the same function! Fixes #5235 diffstat: src/groupchat_control.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (23 lines): diff -r 1e79c3861f98 -r 86374d2c4cc8 src/groupchat_control.py --- a/src/groupchat_control.py Tue Sep 29 13:51:20 2009 +0200 +++ b/src/groupchat_control.py Tue Sep 29 14:52:25 2009 +0200 @@ -1229,15 +1229,15 @@ # Stop all E2E sessions nick_list = gajim.contacts.get_nick_list(self.account, self.room_jid) - for nick in nick_list: - fjid = self.room_jid + '/' + nick - ctrl = gajim.interface.msg_win_mgr.get_control(fjid, + for nick_ in nick_list: + fjid_ = self.room_jid + '/' + nick_ + ctrl = gajim.interface.msg_win_mgr.get_control(fjid_, self.account) if ctrl and ctrl.session and \ ctrl.session.enable_encryption: thread_id = ctrl.session.thread_id ctrl.session.terminate_e2e() - gajim.connections[self.account].delete_session(fjid, + gajim.connections[self.account].delete_session(fjid_, thread_id) ctrl.no_autonegotiation = False else:

1 0

gajim: prevent traceback when closing single message window. Fix...
by Yann Leboulanger 29 Sep '09

29 Sep '09

changeset 1e79c3861f98 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1e79c3861f98 description: prevent traceback when closing single message window. Fixes #5292 diffstat: src/dialogs.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 5edf059fa111 -r 1e79c3861f98 src/dialogs.py --- a/src/dialogs.py Tue Sep 29 11:08:42 2009 +0200 +++ b/src/dialogs.py Tue Sep 29 13:51:20 2009 +0200 @@ -2505,6 +2505,9 @@ self.instances.remove(self) c = gajim.contacts.get_contact_with_highest_priority(self.account, self.from_whom) + if not c: + # Groupchat is maybe already destroyed + return if c.is_groupchat() and not self.from_whom in \ gajim.interface.minimized_controls[self.account] and self.action == \ 'receive' and gajim.events.get_nb_roster_events(self.account,

1 0

gajim: request bookmarks via XML if server announce it supports ...
by Yann Leboulanger 29 Sep '09

29 Sep '09

changeset 5edf059fa111 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5edf059fa111 description: request bookmarks via XML if server announce it supports pubsub but doesn't answer in the next 30 seconds. Fixes #5198 diffstat: src/common/connection.py | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diffs (36 lines): diff -r fe87434867d1 -r 5edf059fa111 src/common/connection.py --- a/src/common/connection.py Mon Sep 28 08:20:24 2009 +0300 +++ b/src/common/connection.py Tue Sep 29 11:08:42 2009 +0200 @@ -1603,6 +1603,16 @@ iq2.addChild(name='gajim', namespace='gajim:prefs') self.connection.send(iq) + def _request_bookmarks_xml(self): + iq = common.xmpp.Iq(typ='get') + iq2 = iq.addChild(name='query', namespace=common.xmpp.NS_PRIVATE) + iq2.addChild(name='storage', namespace='storage:bookmarks') + self.connection.send(iq) + + def _check_bookmarks_received(self): + if not self.bookmarks: + self._request_bookmarks_xml() + def get_bookmarks(self, storage_type=None): '''Get Bookmarks from storage or PubSub if supported as described in XEP 0048 @@ -1611,11 +1621,11 @@ return if self.pubsub_supported and storage_type != 'xml': self.send_pb_retrieve('', 'storage:bookmarks') + # some server (ejabberd) are so slow to answer that we request via XML + # if we don't get answer in the next 30 seconds + gajim.idlequeue.set_alarm(self._check_bookmarks_received, 30) else: - iq = common.xmpp.Iq(typ='get') - iq2 = iq.addChild(name='query', namespace=common.xmpp.NS_PRIVATE) - iq2.addChild(name='storage', namespace='storage:bookmarks') - self.connection.send(iq) + self._request_bookmarks_xml() def store_bookmarks(self, storage_type=None): ''' Send bookmarks to the storage namespace or PubSub if supported

1 0

gajim: Second typo corrected... I need to sleep...
by Thibaut GIRKA 28 Sep '09

28 Sep '09

changeset 22894f7e41f2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=22894f7e41f2 description: Second typo corrected... I need to sleep... diffstat: src/common/jingle.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2f419e456092 -r 22894f7e41f2 src/common/jingle.py --- a/src/common/jingle.py Mon Sep 28 22:23:48 2009 +0200 +++ b/src/common/jingle.py Mon Sep 28 22:31:28 2009 +0200 @@ -762,7 +762,7 @@ def __candidate(self, candidate): types = {farsight.CANDIDATE_TYPE_HOST: 'host', farsight.CANDIDATE_TYPE_SRFLX: 'srflx', - farsight.CANDIDATE_TYPE_PRFLX: 'prlfx', + farsight.CANDIDATE_TYPE_PRFLX: 'prflx', farsight.CANDIDATE_TYPE_RELAY: 'relay', farsight.CANDIDATE_TYPE_MULTICAST: 'multicast'} attrs = {

1 0

gajim: Fixed a typo ; Prepared tie breaking and content-info han...
by Thibaut GIRKA 28 Sep '09

28 Sep '09

changeset 2f419e456092 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2f419e456092 description: Fixed a typo ; Prepared tie breaking and content-info handling diffstat: src/common/jingle.py | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diffs (65 lines): diff -r ea637f2d4192 -r 2f419e456092 src/common/jingle.py --- a/src/common/jingle.py Sun Sep 27 22:56:09 2009 +0200 +++ b/src/common/jingle.py Mon Sep 28 22:23:48 2009 +0200 @@ -115,7 +115,7 @@ 'content-modify': [self.__defaultCB], #TODO 'content-reject': [self.__defaultCB, self.__contentRemoveCB], #TODO 'content-remove': [self.__defaultCB, self.__contentRemoveCB], - 'description-info': [self.__defaultCB], #TODO + 'description-info': [self.__broadcastCB, self.__defaultCB], #TODO 'security-info': [self.__defaultCB], #TODO 'session-accept': [self.__sessionAcceptCB, self.__contentAcceptCB, self.__broadcastCB, self.__defaultCB], @@ -680,12 +680,18 @@ 'content-accept': [self.__transportInfoCB], 'content-add': [self.__transportInfoCB], 'content-modify': [], + 'content-reject': [], 'content-remove': [], + 'description-info': [], + 'security-info': [], 'session-accept': [self.__transportInfoCB], 'session-info': [], 'session-initiate': [self.__transportInfoCB], 'session-terminate': [], 'transport-info': [self.__transportInfoCB], + 'transport-replace': [], + 'transport-accept': [], + 'transport-reject': [], 'iq-result': [], 'iq-error': [], # these are called when *we* sent these stanzas @@ -738,6 +744,8 @@ 'multicast': farsight.CANDIDATE_TYPE_MULTICAST} if 'type' in candidate and candidate['type'] in types: cand.type = types[candidate['type']] + else: + print 'Unknown type %s', candidate['type'] candidates.append(cand) #FIXME: connectivity should not be etablished yet # Instead, it should be etablished after session-accept! @@ -753,7 +761,7 @@ def __candidate(self, candidate): types = {farsight.CANDIDATE_TYPE_HOST: 'host', - farsight.CANDIDATE_TYPE_SRFLX: 'srlfx', + farsight.CANDIDATE_TYPE_SRFLX: 'srflx', farsight.CANDIDATE_TYPE_PRFLX: 'prlfx', farsight.CANDIDATE_TYPE_RELAY: 'relay', farsight.CANDIDATE_TYPE_MULTICAST: 'multicast'} @@ -882,6 +890,7 @@ elif name == 'farsight-codecs-changed': if self.is_ready(): self.session.on_session_state_changed(self) + #TODO: description-info elif name == 'farsight-local-candidates-prepared': self.candidates_ready = True if self.is_ready(): @@ -1087,6 +1096,7 @@ # do we need to create a new jingle object if (jid, sid) not in self.__sessions: + #TODO: tie-breaking and other things... newjingle = JingleSession(con=self, weinitiate=False, jid=jid, sid=sid) self.add_jingle(newjingle)

1 0

gajim: workaround for psi, little fixes...
by Thibaut GIRKA 28 Sep '09

28 Sep '09

changeset ea637f2d4192 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ea637f2d4192 description: workaround for psi, little fixes... diffstat: src/common/jingle.py | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diffs (76 lines): diff -r b986fe5b2cf7 -r ea637f2d4192 src/common/jingle.py --- a/src/common/jingle.py Sat Sep 26 23:07:09 2009 +0200 +++ b/src/common/jingle.py Sun Sep 27 22:56:09 2009 +0200 @@ -119,7 +119,7 @@ 'security-info': [self.__defaultCB], #TODO 'session-accept': [self.__sessionAcceptCB, self.__contentAcceptCB, self.__broadcastCB, self.__defaultCB], - 'session-info': [self.__sessionInfoCB, self.__broadcastCB], + 'session-info': [self.__sessionInfoCB, self.__broadcastCB, self.__defaultCB], 'session-initiate': [self.__sessionInitiateCB, self.__broadcastCB, self.__defaultCB], 'session-terminate': [self.__sessionTerminateCB, self.__broadcastAllCB, @@ -359,6 +359,7 @@ raise xmpp.NodeProcessed def __sessionInfoCB(self, stanza, jingle, error, action): + #TODO: ringing, active, (un)hold, (un)mute payload = jingle.getPayload() if len(payload) > 0: self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info') @@ -668,6 +669,7 @@ #self.creator = None #self.name = None self.accepted = False + self.sent = False self.candidates = [] # Local transport candidates self.senders = 'both' #FIXME @@ -697,7 +699,7 @@ def is_ready(self): #print '[%s] %s, %s' % (self.media, self.candidates_ready, # self.p2psession.get_property('codecs-ready')) - return (self.accepted and self.candidates_ready + return (self.accepted and self.candidates_ready and not self.sent and self.p2psession.get_property('codecs-ready')) def stanzaCB(self, stanza, content, error, action): @@ -792,6 +794,8 @@ ''' Add our things to session-initiate stanza. ''' self._fillContent(content) + self.sent = True + if self.candidates and self.candidates[0].username and \ self.candidates[0].password: attrs = {'ufrag': self.candidates[0].username, @@ -843,6 +847,9 @@ self.p2psession = self.conference.new_session(self.farsight_media) participant = self.conference.new_participant(self.session.peerjid) + #FIXME: Consider a workaround, here... + # pidgin and telepathy-gabble don't follow the XEP, and it won't work + # due to bad controlling-mode params = {'controlling-mode': self.session.weinitiate,# 'debug': False} 'stun-ip': '69.0.208.27', 'debug': False} @@ -968,12 +975,15 @@ JingleRTPContent.setup_stream(self) # Configure SPEEX - #FIXME: codec ID is an important thing for psi (and pidgin?) - # So, if it doesn't work with pidgin or psi, LOOK AT THIS + # Workaround for psi (not needed since rev + # 147aedcea39b43402fe64c533d1866a25449888a): + # place 16kHz before 8kHz, as buggy psi versions will take in + # account only the first codec + codecs = [farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX', - farsight.MEDIA_TYPE_AUDIO, 8000), + farsight.MEDIA_TYPE_AUDIO, 16000), farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX', - farsight.MEDIA_TYPE_AUDIO, 16000)] + farsight.MEDIA_TYPE_AUDIO, 8000)] self.p2psession.set_codec_preferences(codecs) # the local parts

1 0

gajim: Fixed a bug with a raw commands
by red-agent 28 Sep '09

28 Sep '09

changeset fe87434867d1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fe87434867d1 description: Fixed a bug with a raw commands diffstat: src/commands/framework.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 67c1a9751347 -r fe87434867d1 src/commands/framework.py --- a/src/commands/framework.py Sun Sep 27 11:52:51 2009 +0200 +++ b/src/commands/framework.py Mon Sep 28 08:20:24 2009 +0300 @@ -531,6 +531,7 @@ args.append((raw, (end, arguments_end))) elif spec_len == 1: args = [(arguments, (0, arguments_end))] + opts = [] else: raise InternalError("Raw command must define a collector") else:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2009