Commits June 2011

commits@gajim.org

3 participants
49 discussions

gajim: update translation for 0.14 branch
by Yann Leboulanger 30 Jun '11

30 Jun '11

changeset 4f267c122997 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4f267c122997 description: update translation for 0.14 branch diffstat: po/be.po | 1522 ++++++++++++++++++++++++++++--------------------------- po/be(a)latin.po | 1522 ++++++++++++++++++++++++++++--------------------------- po/bg.po | 1522 ++++++++++++++++++++++++++++--------------------------- po/br.po | 1522 ++++++++++++++++++++++++++++--------------------------- po/cs.po | 1528 ++++++++++++++++++++++++++++--------------------------- po/da.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/de.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/el.po | 1532 ++++++++++++++++++++++++++++--------------------------- po/en_GB.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/eo.po | 1522 ++++++++++++++++++++++++++++--------------------------- po/es.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/eu.po | 1522 ++++++++++++++++++++++++++++--------------------------- po/fr.po | 1529 ++++++++++++++++++++++++++++--------------------------- po/gl.po | 1522 ++++++++++++++++++++++++++++--------------------------- po/hr.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/it.po | 1522 ++++++++++++++++++++++++++++--------------------------- po/ja.po | 1246 ++++++++++++++++++++++---------------------- po/kk.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/lt.po | 1532 ++++++++++++++++++++++++++++--------------------------- po/nb.po | 1524 ++++++++++++++++++++++++++++--------------------------- po/nl.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/no.po | 1524 ++++++++++++++++++++++++++++--------------------------- po/pl.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/pt.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/pt_BR.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/ru.po | 1522 ++++++++++++++++++++++++++++--------------------------- po/sk.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/sr.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/sr(a)Latn.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/sv.po | 1522 ++++++++++++++++++++++++++++--------------------------- po/uk.po | 1526 ++++++++++++++++++++++++++++--------------------------- po/zh_CN.po | 1522 ++++++++++++++++++++++++++++--------------------------- 32 files changed, 24494 insertions(+), 24027 deletions(-) diffs (truncated from 138128 to 300 lines): diff -r d43439e33e4e -r 4f267c122997 po/be.po --- a/po/be.po Sun Jun 19 21:37:43 2011 +0200 +++ b/po/be.po Thu Jun 30 08:06:03 2011 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.10.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 11:28+0200\n" +"POT-Creation-Date: 2011-06-22 13:32+0200\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" @@ -126,12 +126,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:18 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694 -#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342 -#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671 -#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513 -#: ../src/dialogs.py:526 ../src/roster_window.py:2890 -#: ../src/roster_window.py:2896 ../src/roster_window.py:2901 +#: ../src/config.py:1293 ../src/config.py:1396 ../src/config.py:1707 +#: ../src/config.py:1712 ../src/config.py:2278 ../src/config.py:2357 +#: ../src/config.py:2370 ../src/config.py:3635 ../src/config.py:3710 +#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:516 +#: ../src/dialogs.py:529 ../src/roster_window.py:2913 +#: ../src/roster_window.py:2919 ../src/roster_window.py:2924 msgid "None" msgstr "Ніякі" @@ -299,9 +299,9 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 -#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592 -#: ../src/notify.py:608 +#: ../src/common/helpers.py:1160 ../src/common/helpers.py:1172 +#: ../src/notify.py:530 ../src/notify.py:553 ../src/notify.py:602 +#: ../src/notify.py:618 msgid "Gajim" msgstr "Gajim" @@ -310,7 +310,7 @@ #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61 #: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121 -#: ../src/roster_window.py:2832 ../src/roster_window.py:5379 +#: ../src/roster_window.py:2855 ../src/roster_window.py:5374 msgid "General" msgstr "Агульная" @@ -366,8 +366,8 @@ msgstr "Звесткі аб Вас, якія захоўваюцца на серверы" #: ../data/gui/accounts_window.ui.h:35 -#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817 -#: ../src/dialogs.py:830 +#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1830 +#: ../src/dialogs.py:832 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -380,8 +380,8 @@ msgid "Mer_ge accounts" msgstr "_Аб'яднаць рахункі" -#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790 -#: ../src/config.py:2356 +#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1803 +#: ../src/config.py:2371 msgid "No key selected" msgstr "Ключ не выбраны" @@ -408,7 +408,7 @@ msgstr "Прыярытэт будзе змяняцца згодна з станам." #. Rename -#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329 +#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5324 msgid "Re_name" msgstr "_Змяніць імя" @@ -525,7 +525,7 @@ msgid "Add New Contact" msgstr "Дадаць новага чалавека" -#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1339 +#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1340 msgid "I would like to add you to my contact list." msgstr "Я хачу дадаць Вас у свой кантактны ліст." @@ -893,8 +893,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:25 -#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348 -#: ../src/roster_window.py:5476 ../src/roster_window.py:5609 +#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5343 +#: ../src/roster_window.py:5470 ../src/roster_window.py:5603 msgid "_Unblock" msgstr "" @@ -988,7 +988,7 @@ msgstr "_Пачаць размову" #. # means number -#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184 +#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4194 msgid "#" msgstr "№" @@ -1096,8 +1096,8 @@ #. Invite to #. Invite to Groupchat -#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284 -#: ../src/roster_window.py:5444 +#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5279 +#: ../src/roster_window.py:5438 msgid "In_vite to" msgstr "За_прасіць" @@ -1111,8 +1111,8 @@ msgid "Remo_ve" msgstr "Вы_даліць" -#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294 -#: ../src/roster_window.py:5533 +#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5289 +#: ../src/roster_window.py:5527 #, fuzzy msgid "Send Cus_tom Status" msgstr "Адправіць асаблівы XML" @@ -1148,8 +1148,8 @@ msgstr "Дазволіць чалавеку _бачыць змены майго стану" #: ../data/gui/contact_context_menu.ui.h:18 -#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356 -#: ../src/roster_window.py:5482 ../src/roster_window.py:5612 +#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5351 +#: ../src/roster_window.py:5476 ../src/roster_window.py:5606 msgid "_Block" msgstr "" @@ -1160,7 +1160,7 @@ #: ../data/gui/contact_context_menu.ui.h:20 #: ../data/gui/gc_control_popup_menu.ui.h:6 #: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21 -#: ../src/roster_window.py:5683 +#: ../src/roster_window.py:5677 msgid "_History" msgstr "_Журнал" @@ -1298,7 +1298,7 @@ msgid "Account row" msgstr "Рахунак" -#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925 +#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:949 msgid "Bold" msgstr "Тлусты" @@ -1336,7 +1336,7 @@ msgid "Inactive" msgstr "Неактыўны" -#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926 +#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:950 msgid "Italic" msgstr "Нахілены" @@ -1387,7 +1387,7 @@ msgid "Configure _Room..." msgstr "Настаўленні _пакоя" -#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782 +#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1781 #, fuzzy msgid "_Bookmark" msgstr "_Змясціць у закладках" @@ -1487,8 +1487,8 @@ msgstr "Gajim - Кіраўнік журналаў размоў" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208 -#: ../src/dialogs.py:3305 +#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3218 +#: ../src/dialogs.py:3315 msgid "Delete" msgstr "Выдаліць" @@ -1547,7 +1547,7 @@ msgid "Bro_wse Rooms" msgstr "_Праглядзець" -#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180 +#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2190 msgid "Join Group Chat" msgstr "Удзельнічаць у групавой размове" @@ -1576,7 +1576,7 @@ msgstr "Пакой:" #: ../data/gui/join_groupchat_window.ui.h:9 -#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807 +#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1820 msgid "Server:" msgstr "Сервер:" @@ -1586,7 +1586,7 @@ msgstr "_Змясціць у закладках" #: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341 -#: ../src/disco.py:1786 +#: ../src/disco.py:1785 msgid "_Join" msgstr "_Далучыцца" @@ -2441,7 +2441,7 @@ msgid "Order:" msgstr "Парадак:" -#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436 +#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3446 msgid "Privacy List" msgstr "Спіс прыватнасці" @@ -2676,8 +2676,8 @@ #. Remove group #. Remove -#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366 -#: ../src/roster_window.py:5492 ../src/roster_window.py:5622 +#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5361 +#: ../src/roster_window.py:5486 ../src/roster_window.py:5616 msgid "_Remove" msgstr "Вы_даліць" @@ -2739,7 +2739,7 @@ msgid "Show _Offline Contacts" msgstr "Паказаць _адлучаных людзей" -#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326 +#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:346 msgid "Show _Roster" msgstr "Паказаць _галоўнае вакно" @@ -2758,7 +2758,7 @@ msgid "_Contents" msgstr "_Змест" -#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502 +#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1501 msgid "_Edit" msgstr "_Змяніць" @@ -2794,7 +2794,7 @@ msgstr "Дадаць _чалавека" #. Information -#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634 +#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5628 #, fuzzy msgid "_Information" msgstr "Асабістыя звесткі" @@ -3105,7 +3105,7 @@ msgid "Text" msgstr "Тэкставае" -#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945 +#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:969 msgid "Color" msgstr "Колер" @@ -3246,134 +3246,134 @@ msgid "Chinese (Ch)" msgstr "Кітайская (Ch)" -#: ../src/chat_control.py:479 +#: ../src/chat_control.py:483 msgid "Spelling language" msgstr "Мова правапісу" #. we are not connected -#: ../src/chat_control.py:511 ../src/chat_control.py:720 +#: ../src/chat_control.py:515 ../src/chat_control.py:731 msgid "A connection is not available" msgstr "Няма злучэння" -#: ../src/chat_control.py:512 ../src/chat_control.py:721 +#: ../src/chat_control.py:516 ../src/chat_control.py:732 msgid "Your message can not be sent until you are connected." msgstr "Вы не можаце адпраўляць паведамленні без злучэння." -#: ../src/chat_control.py:927 +#: ../src/chat_control.py:951 #, fuzzy msgid "Underline"

1 0

gajim: JingleFT IBB fallback
by Jefry Lagrange 28 Jun '11

28 Jun '11

changeset 978fcbe254c1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=978fcbe254c1 description: JingleFT IBB fallback diffstat: src/common/jingle_content.py | 7 ++++- src/common/jingle_ft.py | 18 ++++++++++++- src/common/jingle_session.py | 59 +++++++++++++++++++++++++++++++++++++---- src/common/jingle_transport.py | 36 ++++++++++++++++++++++++- src/common/xmpp/protocol.py | 1 + 5 files changed, 111 insertions(+), 10 deletions(-) diffs (270 lines): diff -r 78cb88309176 -r 978fcbe254c1 src/common/jingle_content.py --- a/src/common/jingle_content.py Fri Jun 24 18:24:42 2011 +0200 +++ b/src/common/jingle_content.py Tue Jun 28 18:31:07 2011 -0400 @@ -16,6 +16,7 @@ """ import xmpp +from jingle_transport import JingleTransportIBB contents = {} @@ -69,7 +70,7 @@ 'session-initiate': [self.__on_transport_info], 'session-terminate': [], 'transport-info': [self.__on_transport_info], - 'transport-replace': [], + 'transport-replace': [self.__on_transport_replace], 'transport-accept': [], 'transport-reject': [], 'iq-result': [], @@ -109,6 +110,10 @@ for callback in self.callbacks[action]: callback(stanza, content, error, action) + def __on_transport_replace(self, stanza, content, error, action): + + content.addChild(node=self.transport.make_transport()) + def __on_transport_info(self, stanza, content, error, action): """ Got a new transport candidate diff -r 78cb88309176 -r 978fcbe254c1 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Fri Jun 24 18:24:42 2011 +0200 +++ b/src/common/jingle_ft.py Tue Jun 28 18:31:07 2011 -0400 @@ -23,6 +23,8 @@ import xmpp from jingle_content import contents, JingleContent from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5 +from jingle_transport import JingleTransportIBB +from jingle_session import JingleStates from common import helpers from common.socks5 import Socks5Receiver from common.connection_handlers_events import FileRequestReceivedEvent @@ -35,6 +37,7 @@ STATE_ACCEPTED = 2 STATE_TRANSPORT_INFO = 3 STATE_PROXY_ACTIVATED = 4 +STATE_TRANSPORT_REPLACE = 5 class JingleFileTransfer(JingleContent): def __init__(self, session, transport=None, file_props=None, @@ -98,6 +101,19 @@ security = content.getTag('security') if not security: # responder can not verify our fingerprint self.use_security = False + + if self.state == STATE_TRANSPORT_REPLACE: + # We ack the session accept + response = stanza.buildReply('result') + con = self.session.connection + con.connection.send(response) + # We send the file + con.files_props[self.file_props['sid']] = self.file_props + fp = open(self.file_props['file-name'], 'r') + con.OpenStream( self.transport.sid, self.session.peerjid, + fp, blocksize=4096) + raise xmpp.NodeProcessed + def __on_session_terminate(self, stanza, content, error, action): log.info("__on_session_terminate") @@ -197,7 +213,7 @@ elif self.weinitiate and self.state == STATE_INITIALIZED: # proxy activated self.state = STATE_PROXY_ACTIVATED - + def send_candidate_used(self, streamhost): """ send candidate-used stanza diff -r 78cb88309176 -r 978fcbe254c1 src/common/jingle_session.py --- a/src/common/jingle_session.py Fri Jun 24 18:24:42 2011 +0200 +++ b/src/common/jingle_session.py Tue Jun 28 18:31:07 2011 -0400 @@ -28,8 +28,10 @@ import gajim #Get rid of that? import xmpp -from jingle_transport import get_jingle_transport +from jingle_transport import get_jingle_transport, JingleTransportIBB from jingle_content import get_jingle_content, JingleContentSetupException +from jingle_content import JingleContent +from jingle_ft import STATE_TRANSPORT_REPLACE from common.connection_handlers_events import * import logging log = logging.getLogger("gajim.c.jingle_session") @@ -213,11 +215,19 @@ if not self.contents: self.end_session() - def modify_content(self, creator, name, *someother): - """ - We do not need this now - """ - pass + def modify_content(self, creator, name, transport = None): + ''' + Currently used for transport replacement + ''' + + content = self.contents[(creator,name)] + transport.set_sid(content.transport.sid) + transport.set_file_props(content.transport.file_props) + content.transport = transport + # The content will have to be resend now that it is modified + content.sent = False + content.accepted = True + def on_session_state_changed(self, content=None): if self.state == JingleStates.ended: @@ -343,18 +353,43 @@ error_name = child.getName() self.__dispatch_error(error_name, text, error.getAttr('type')) # FIXME: Not sure when we would want to do that... + def transport_replace(self): + transport = JingleTransportIBB() + # For debug only, delete this and replace for a function + # that will identify contents by its sid + for creator, name in self.contents.keys(): + self.modify_content(creator, name, transport) + cont = self.contents[(creator, name)] + cont.transport = transport + cont.state = STATE_TRANSPORT_REPLACE + + stanza, jingle = self.__make_jingle('transport-replace') + self.__append_contents(jingle) + self.__broadcast(stanza, jingle, None, 'transport-replace') + self.connection.connection.send(stanza) + #self.collect_iq_id(stanza.getID()) + def __on_transport_replace(self, stanza, jingle, error, action): for content in jingle.iterTags('content'): creator = content['creator'] name = content['name'] if (creator, name) in self.contents: transport_ns = content.getTag('transport').getNamespace() - if transport_ns == xmpp.JINGLE_ICE_UDP: + if transport_ns == xmpp.NS_JINGLE_ICE_UDP: # FIXME: We don't manage anything else than ICE-UDP now... # What was the previous transport?!? # Anyway, content's transport is not modifiable yet pass + elif transport_ns == xmpp.NS_JINGLE_IBB: + + transport = JingleTransportIBB() + self.modify_content(creator, name, transport) + #self.state = JingleStates.pending + self.contents[(creator,name)].state = STATE_TRANSPORT_REPLACE + self.__ack(stanza, jingle, error, action) + self.__session_accept() + else: stanza, jingle = self.__make_jingle('transport-reject') content = jingle.setTag('content', attrs={'creator': creator, @@ -400,6 +435,7 @@ if self.state != JingleStates.pending: raise OutOfOrder self.state = JingleStates.active + def __on_content_accept(self, stanza, jingle, error, action): """ @@ -562,12 +598,19 @@ return (contents, contents_rejected, failure_reason) def __dispatch_error(self, error=None, text=None, type_=None): + + if type_ == 'cancel' and error == 'item-not-found': + # We coudln't connect with sock5stream, we fallback to IBB + self.transport_replace() + return if text: text = '%s (%s)' % (error, text) if type_ != 'modify': gajim.nec.push_incoming_event(JingleErrorReceivedEvent(None, conn=self.connection, jingle_session=self, reason=text or error)) + + def __reason_from_stanza(self, stanza): # TODO: Move to GUI? @@ -595,6 +638,8 @@ attrs['initiator'] = self.initiator elif action == 'session-accept': attrs['responder'] = self.responder + elif action == 'transport-replace': + attrs['initiator'] = self.initiator jingle = stanza.addChild('jingle', attrs=attrs, namespace=xmpp.NS_JINGLE) if reason is not None: jingle.addChild(node=reason) diff -r 78cb88309176 -r 978fcbe254c1 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Fri Jun 24 18:24:42 2011 +0200 +++ b/src/common/jingle_transport.py Tue Jun 28 18:31:07 2011 -0400 @@ -165,7 +165,7 @@ for addr in socket.getaddrinfo(socket.gethostname(), None): if not addr[4][0] in local_ip_cand and not addr[4][0].startswith('127'): c = {'host': addr[4][0]} - c['candidate_id'] = conn.connection.getAnID() + c['candidate_id'] = self.connection.connection.getAnID() c['port'] = port c['type'] = 'direct' c['jid'] = self.ourjid @@ -272,6 +272,39 @@ return sesn.send_transport_info(content) + +class JingleTransportIBB(JingleTransport): + + def __init__(self, node=None, block_sz=None): + + JingleTransport.__init__(self, TransportType.streaming) + + if block_sz: + self.block_sz = block_sz + else: + self.block_sz = '4096' + + self.connection = None + self.sid = None + if node and node.getAttr('sid'): + self.sid = node.getAttr('sid') + + + def set_sid(self, sid): + self.sid = sid + + def make_transport(self): + + transport = JingleTransport.make_transport(self) + transport.setNamespace(xmpp.NS_JINGLE_IBB) + transport.setAttr('block-size', self.block_sz) + transport.setAttr('sid', self.sid) + return transport + + def set_file_props(self, file_props): + self.file_props = file_props + + import farsight class JingleTransportICEUDP(JingleTransport): @@ -347,3 +380,4 @@ transports[xmpp.NS_JINGLE_ICE_UDP] = JingleTransportICEUDP transports[xmpp.NS_JINGLE_BYTESTREAM] = JingleTransportSocks5 +transports[xmpp.NS_JINGLE_IBB] = JingleTransportIBB diff -r 78cb88309176 -r 978fcbe254c1 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Fri Jun 24 18:24:42 2011 +0200 +++ b/src/common/xmpp/protocol.py Tue Jun 28 18:31:07 2011 -0400 @@ -91,6 +91,7 @@ NS_JINGLE_RAW_UDP = 'urn:xmpp:jingle:transports:raw-udp:1' # XEP-0177 NS_JINGLE_ICE_UDP = 'urn:xmpp:jingle:transports:ice-udp:1' # XEP-0176 NS_JINGLE_BYTESTREAM ='urn:xmpp:jingle:transports:s5b:1' # XEP-0260 +NS_JINGLE_IBB = 'urn:xmpp:jingle:transports:ibb:1' # XEP-0261 NS_LAST = 'jabber:iq:last' NS_LOCATION = 'http://jabber.org/protocol/geoloc' # XEP-0080 NS_MESSAGE = 'message' # Jabberd2

1 0

gajim: coding style
by Denis Fomin 25 Jun '11

25 Jun '11

changeset 5b0d36675b14 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5b0d36675b14 description: coding style diffstat: src/htmltextview.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 06c3327a94b2 -r 5b0d36675b14 src/htmltextview.py --- a/src/htmltextview.py Sun Jun 26 00:24:37 2011 +0400 +++ b/src/htmltextview.py Sun Jun 26 00:28:42 2011 +0400 @@ -941,9 +941,10 @@ gtk.gdk.SELECTION_PRIMARY)) def on_left_mouse_button_release(self, widget, event): - bounds = self.get_buffer().get_selection_bounds() if event.button != 1: return + + bounds = self.get_buffer().get_selection_bounds() if bounds: # textview can be hidden while we add a new line in it. if self.has_screen():

1 0

gajim: do not use clipboard on every 'mark set' signal received
by Denis Fomin 25 Jun '11

25 Jun '11

changeset 06c3327a94b2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=06c3327a94b2 description: do not use clipboard on every 'mark set' signal received diffstat: src/htmltextview.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (25 lines): diff -r a91b5a001282 -r 06c3327a94b2 src/htmltextview.py --- a/src/htmltextview.py Wed Jun 22 20:33:19 2011 +0200 +++ b/src/htmltextview.py Sun Jun 26 00:24:37 2011 +0400 @@ -855,7 +855,8 @@ self.connect('realize', self.on_html_text_view_realized) self.connect('unrealize', self.on_html_text_view_unrealized) self.connect('copy-clipboard', self.on_html_text_view_copy_clipboard) - self.get_buffer().connect_after('mark-set', self.on_text_buffer_mark_set) + self.id_ = self.connect('button-release-event', + self.on_left_mouse_button_release) self.get_buffer().create_tag('eol', scale = pango.SCALE_XX_SMALL) self.tooltip = tooltips.BaseTooltip() self.config = gajim.config @@ -939,8 +940,10 @@ self.get_buffer().add_selection_clipboard(self.get_clipboard( gtk.gdk.SELECTION_PRIMARY)) - def on_text_buffer_mark_set(self, location, mark, unused_data): + def on_left_mouse_button_release(self, widget, event): bounds = self.get_buffer().get_selection_bounds() + if event.button != 1: + return if bounds: # textview can be hidden while we add a new line in it. if self.has_screen():

1 0

gajim: use event system for jingle FT
by Yann Leboulanger 24 Jun '11

24 Jun '11

changeset 78cb88309176 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=78cb88309176 description: use event system for jingle FT diffstat: src/chat_control.py | 2 +- src/common/connection_handlers_events.py | 91 +++++++++++++++++++++++-------- src/common/jingle_ft.py | 53 +----------------- src/common/jingle_xtls.py | 3 +- src/common/socks5.py | 5 +- 5 files changed, 76 insertions(+), 78 deletions(-) diffs (238 lines): diff -r 463f142cae9a -r 78cb88309176 src/chat_control.py --- a/src/chat_control.py Fri Jun 24 16:35:10 2011 +0200 +++ b/src/chat_control.py Fri Jun 24 18:24:42 2011 +0200 @@ -53,7 +53,7 @@ from common.pep import MOODS, ACTIVITIES from common.xmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from common.xmpp.protocol import NS_RECEIPTS, NS_ESESSION -from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_ICE_UDP +from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER from common.connection_handlers_events import MessageOutgoingEvent from command_system.implementation.middleware import ChatCommandProcessor diff -r 463f142cae9a -r 78cb88309176 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Jun 24 16:35:10 2011 +0200 +++ b/src/common/connection_handlers_events.py Fri Jun 24 18:24:42 2011 +0200 @@ -34,6 +34,7 @@ from common.zeroconf import zeroconf from common.logger import LOG_DB_PATH from common.pep import SUPPORTED_PERSONAL_USER_EVENTS +from common.jingle_transport import JingleTransportSocks5 import gtkgui_helpers @@ -1818,6 +1819,10 @@ name = 'file-request-received' base_network_events = [] + def init(self): + self.jingle_content = None + self.FT_content = None + def generate(self): self.get_id() self.fjid = self.conn._ft_get_from(self.stanza) @@ -1825,28 +1830,36 @@ self.file_props = {'type': 'r'} self.file_props['sender'] = self.fjid self.file_props['request-id'] = self.id_ - si = self.stanza.getTag('si') - profile = si.getAttr('profile') - if profile != xmpp.NS_FILE: - self.conn.send_file_rejection(self.file_props, code='400', typ='profile') - raise xmpp.NodeProcessed - feature_tag = si.getTag('feature', namespace=xmpp.NS_FEATURE) - if not feature_tag: - return - form_tag = feature_tag.getTag('x', namespace=xmpp.NS_DATA) - if not form_tag: - return - self.dataform = dataforms.ExtendForm(node=form_tag) - for f in self.dataform.iter_fields(): - if f.var == 'stream-method' and f.type == 'list-single': - values = [o[1] for o in f.options] - self.file_props['stream-methods'] = ' '.join(values) - if xmpp.NS_BYTESTREAM in values or xmpp.NS_IBB in values: - break + if self.jingle_content: + self.file_props['session-type'] = 'jingle' + self.file_props['stream-methods'] = xmpp.NS_BYTESTREAM + file_tag = self.jingle_content.getTag('description').getTag( + 'offer').getTag('file') else: - self.conn.send_file_rejection(self.file_props, code='400', typ='stream') - raise xmpp.NodeProcessed - file_tag = si.getTag('file') + si = self.stanza.getTag('si') + profile = si.getAttr('profile') + if profile != xmpp.NS_FILE: + self.conn.send_file_rejection(self.file_props, code='400', + typ='profile') + raise xmpp.NodeProcessed + feature_tag = si.getTag('feature', namespace=xmpp.NS_FEATURE) + if not feature_tag: + return + form_tag = feature_tag.getTag('x', namespace=xmpp.NS_DATA) + if not form_tag: + return + self.dataform = dataforms.ExtendForm(node=form_tag) + for f in self.dataform.iter_fields(): + if f.var == 'stream-method' and f.type == 'list-single': + values = [o[1] for o in f.options] + self.file_props['stream-methods'] = ' '.join(values) + if xmpp.NS_BYTESTREAM in values or xmpp.NS_IBB in values: + break + else: + self.conn.send_file_rejection(self.file_props, code='400', + typ='stream') + raise xmpp.NodeProcessed + file_tag = si.getTag('file') for attribute in file_tag.getAttrs(): if attribute in ('name', 'size', 'hash', 'date'): val = file_tag.getAttr(attribute) @@ -1857,13 +1870,41 @@ if file_desc_tag is not None: self.file_props['desc'] = file_desc_tag.getData() - mime_type = si.getAttr('mime-type') - if mime_type is not None: - self.file_props['mime-type'] = mime_type + if not self.jingle_content: + mime_type = si.getAttr('mime-type') + if mime_type is not None: + self.file_props['mime-type'] = mime_type self.file_props['receiver'] = self.conn._ft_get_our_jid() - self.file_props['sid'] = unicode(si.getAttr('id')) self.file_props['transfered_size'] = [] + if self.jingle_content: + self.FT_content.use_security = bool(self.jingle_content.getTag( + 'security')) + self.file_props['session-sid'] = unicode(self.stanza.getTag( + 'jingle').getAttr('sid')) + + self.FT_content.file_props = self.file_props + if not self.FT_content.transport: + self.FT_content.transport = JingleTransportSocks5() + self.FT_content.transport.set_our_jid( + self.FT_content.session.ourjid) + self.FT_content.transport.set_connection( + self.FT_content.session.connection) + self.file_props['sid'] = self.FT_content.transport.sid + self.FT_content.session.connection.files_props[ + self.file_props['sid']] = self.file_props + self.FT_content.transport.set_file_props(self.file_props) + if self.file_props.has_key('streamhosts'): + self.file_props['streamhosts'].extend( + self.FT_content.transport.remote_candidates) + else: + self.file_props['streamhosts'] = \ + self.FT_content.transport.remote_candidates + for host in self.file_props['streamhosts']: + host['initiator'] = self.FT_content.session.initiator + host['target'] = self.FT_content.session.responder + else: + self.file_props['sid'] = unicode(si.getAttr('id')) return True class FileRequestErrorEvent(nec.NetworkIncomingEvent): diff -r 463f142cae9a -r 78cb88309176 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Fri Jun 24 16:35:10 2011 +0200 +++ b/src/common/jingle_ft.py Fri Jun 24 18:24:42 2011 +0200 @@ -25,6 +25,7 @@ from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5 from common import helpers from common.socks5 import Socks5Receiver +from common.connection_handlers_events import FileRequestReceivedEvent import logging log = logging.getLogger('gajim.c.jingle_ft') @@ -87,55 +88,9 @@ self.media = 'file' def __on_session_initiate(self, stanza, content, error, action): - jid = unicode(stanza.getFrom()) - log.info("jid:%s" % jid) - - file_props = {'type': 'r'} - file_props['sender'] = jid - file_props['request-id'] = unicode(stanza.getAttr('id')) - - file_props['session-type'] = 'jingle' - - self.use_security = bool(content.getTag('security')) - # TODO: extract fingerprint element, encryption method element for later - # use - - file_tag = content.getTag('description').getTag('offer').getTag('file') - for attribute in file_tag.getAttrs(): - if attribute in ('name', 'size', 'hash', 'date'): - val = file_tag.getAttr(attribute) - if val is None: - continue - file_props[attribute] = val - file_desc_tag = file_tag.getTag('desc') - if file_desc_tag is not None: - file_props['desc'] = file_desc_tag.getData() - - file_props['receiver'] = self.session.ourjid - log.info("ourjid: %s" % self.session.ourjid) - file_props['session-sid'] = unicode(stanza.getTag('jingle').getAttr('sid')) - file_props['transfered_size'] = [] - - self.file_props = file_props - - if self.transport is None: - self.transport = JingleTransportSocks5() - self.transport.set_our_jid(self.session.ourjid) - self.transport.set_connection(self.session.connection) - self.file_props['sid'] = self.transport.sid - self.session.connection.files_props[file_props['sid']] = file_props - self.transport.set_file_props(self.file_props) - if self.file_props.has_key('streamhosts'): - self.file_props['streamhosts'].extend( - self.transport.remote_candidates) - else: - self.file_props['streamhosts'] = self.transport.remote_candidates - for host in self.file_props['streamhosts']: - host['initiator'] = self.session.initiator - host['target'] = self.session.responder - log.info("FT request: %s" % file_props) - - self.session.connection.dispatch('FILE_REQUEST', (jid, file_props)) + gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, + conn=self.session.connection, stanza=stanza, jingle_content=content, + FT_content=self)) def __on_session_accept(self, stanza, content, error, action): log.info("__on_session_accept") diff -r 463f142cae9a -r 78cb88309176 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Fri Jun 24 16:35:10 2011 +0200 +++ b/src/common/jingle_xtls.py Fri Jun 24 18:24:42 2011 +0200 @@ -104,7 +104,8 @@ store = ctx.get_cert_store() for f in os.listdir(os.path.expanduser(gajim.MY_PEER_CERTS_PATH)): load_cert_file(os.path.join(os.path.expanduser(gajim.MY_PEER_CERTS_PATH), f), store) - print 'certificate file' + f + ' loaded', 'fingerprint', fingerprint + log.debug('certificate file ' + f + ' loaded fingerprint ' + \ + fingerprint) return ctx def send_cert(con, jid_from, sid): diff -r 463f142cae9a -r 78cb88309176 src/common/socks5.py --- a/src/common/socks5.py Fri Jun 24 16:35:10 2011 +0200 +++ b/src/common/socks5.py Fri Jun 24 18:24:42 2011 +0200 @@ -753,10 +753,11 @@ self.queue = parent Socks5.__init__(self, idlequeue, host, port, None, None, None) self._sock = _sock - if not self.fingerprint is None: + if self.fingerprint is not None: self._sock = OpenSSL.SSL.Connection( jingle_xtls.get_context('server'), self._sock) - self._sock.setblocking(False) + else: + self._sock.setblocking(False) self.fd = _sock.fileno() self._recv = _sock.recv self._send = _sock.send

1 0

gajim: fix some bad merge
by Yann Leboulanger 24 Jun '11

24 Jun '11

changeset 463f142cae9a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=463f142cae9a description: fix some bad merge diffstat: src/common/connection_handlers.py | 307 -------------------------------------- src/common/jingle.py | 2 +- 2 files changed, 1 insertions(+), 308 deletions(-) diffs (truncated from 327 to 300 lines): diff -r adbea99d8a4c -r 463f142cae9a src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Jun 20 23:03:06 2011 +0200 +++ b/src/common/connection_handlers.py Fri Jun 24 16:35:10 2011 +0200 @@ -2128,310 +2128,3 @@ con.RegisterHandler('iq', self._PubkeyGetCB, 'get', common.xmpp.NS_PUBKEY_PUBKEY) con.RegisterHandler('iq', self._PubkeyResultCB, 'result', common.xmpp.NS_PUBKEY_PUBKEY) -class HelperEvent: - def get_jid_resource(self): - if self.id_ in self.conn.groupchat_jids: - self.fjid = self.conn.groupchat_jids[self.id_] - del self.conn.groupchat_jids[self.id_] - else: - self.fjid = helpers.get_full_jid_from_iq(self.iq_obj) - self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) - - def get_id(self): - self.id_ = self.iq_obj.getID() - -class HttpAuthReceivedEvent(nec.NetworkIncomingEvent): - name = 'http-auth-received' - base_network_events = [] - - def generate(self): - if not self.conn: - self.conn = self.base_event.conn - if not self.iq_obj: - self.iq_obj = self.base_event.xmpp_iq - - self.opt = gajim.config.get_per('accounts', self.conn.name, 'http_auth') - self.iq_id = self.iq_obj.getTagAttr('confirm', 'id') - self.method = self.iq_obj.getTagAttr('confirm', 'method') - self.url = self.iq_obj.getTagAttr('confirm', 'url') - # In case it's a message with a body - self.msg = self.iq_obj.getTagData('body') - return True - -class LastResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'last-result-received' - base_network_events = [] - - def generate(self): - if not self.conn: - self.conn = self.base_event.conn - if not self.iq_obj: - self.iq_obj = self.base_event.xmpp_iq - - self.get_id() - self.get_jid_resource() - if self.id_ in self.conn.last_ids: - self.conn.last_ids.remove(self.id_) - - self.status = '' - self.seconds = -1 - - if self.iq_obj.getType() == 'error': - return True - - qp = self.iq_obj.getTag('query') - sec = qp.getAttr('seconds') - self.status = qp.getData() - try: - self.seconds = int(sec) - except Exception: - return - - return True - -class VersionResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'version-result-received' - base_network_events = [] - - def generate(self): - if not self.conn: - self.conn = self.base_event.conn - if not self.iq_obj: - self.iq_obj = self.base_event.xmpp_iq - - self.get_id() - self.get_jid_resource() - if self.id_ in self.conn.version_ids: - self.conn.version_ids.remove(self.id_) - - self.client_info = '' - self.os_info = '' - - if self.iq_obj.getType() == 'error': - return True - - qp = self.iq_obj.getTag('query') - if qp.getTag('name'): - self.client_info += qp.getTag('name').getData() - if qp.getTag('version'): - self.client_info += ' ' + qp.getTag('version').getData() - if qp.getTag('os'): - self.os_info += qp.getTag('os').getData() - - return True - -class TimeResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'time-result-received' - base_network_events = [] - - def generate(self): - if not self.conn: - self.conn = self.base_event.conn - if not self.iq_obj: - self.iq_obj = self.base_event.xmpp_iq - - self.get_id() - self.get_jid_resource() - if self.id_ in self.conn.entity_time_ids: - self.conn.entity_time_ids.remove(self.id_) - - self.time_info = '' - - if self.iq_obj.getType() == 'error': - return True - - qp = self.iq_obj.getTag('time') - if not qp: - # wrong answer - return - tzo = qp.getTag('tzo').getData() - if tzo.lower() == 'z': - tzo = '0:0' - tzoh, tzom = tzo.split(':') - utc_time = qp.getTag('utc').getData() - ZERO = datetime.timedelta(0) - class UTC(datetime.tzinfo): - def utcoffset(self, dt): - return ZERO - def tzname(self, dt): - return "UTC" - def dst(self, dt): - return ZERO - - class contact_tz(datetime.tzinfo): - def utcoffset(self, dt): - return datetime.timedelta(hours=int(tzoh), minutes=int(tzom)) - def tzname(self, dt): - return "remote timezone" - def dst(self, dt): - return ZERO - - try: - t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%SZ') - t = t.replace(tzinfo=UTC()) - self.time_info = t.astimezone(contact_tz()).strftime('%c') - except ValueError, e: - log.info('Wrong time format: %s' % str(e)) - return - - return True - -class GMailQueryReceivedEvent(nec.NetworkIncomingEvent): - name = 'gmail-notify' - base_network_events = [] - - def generate(self): - if not self.conn: - self.conn = self.base_event.conn - if not self.iq_obj: - self.iq_obj = self.base_event.xmpp_iq - - if not self.iq_obj.getTag('mailbox'): - return - mb = self.iq_obj.getTag('mailbox') - if not mb.getAttr('url'): - return - self.conn.gmail_url = mb.getAttr('url') - if mb.getNamespace() != common.xmpp.NS_GMAILNOTIFY: - return - self.newmsgs = mb.getAttr('total-matched') - if not self.newmsgs: - return - if self.newmsgs == '0': - return - # there are new messages - self.gmail_messages_list = [] - if mb.getTag('mail-thread-info'): - gmail_messages = mb.getTags('mail-thread-info') - for gmessage in gmail_messages: - unread_senders = [] - for sender in gmessage.getTag('senders').getTags( - 'sender'): - if sender.getAttr('unread') != '1': - continue - if sender.getAttr('name'): - unread_senders.append(sender.getAttr('name') + \ - '< ' + sender.getAttr('address') + '>') - else: - unread_senders.append(sender.getAttr('address')) - - if not unread_senders: - continue - gmail_subject = gmessage.getTag('subject').getData() - gmail_snippet = gmessage.getTag('snippet').getData() - tid = int(gmessage.getAttr('tid')) - if not self.conn.gmail_last_tid or \ - tid > self.conn.gmail_last_tid: - self.conn.gmail_last_tid = tid - self.gmail_messages_list.append({ - 'From': unread_senders, - 'Subject': gmail_subject, - 'Snippet': gmail_snippet, - 'url': gmessage.getAttr('url'), - 'participation': gmessage.getAttr('participation'), - 'messages': gmessage.getAttr('messages'), - 'date': gmessage.getAttr('date')}) - self.conn.gmail_last_time = int(mb.getAttr('result-time')) - - self.jid = gajim.get_jid_from_account(self.name) - log.debug(('You have %s new gmail e-mails on %s.') % (self.newmsgs, - self.jid)) - return True - -class RosterItemExchangeEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'roster-item-exchange-received' - base_network_events = [] - - def generate(self): - if not self.conn: - self.conn = self.base_event.conn - if not self.iq_obj: - self.iq_obj = self.base_event.xmpp_iq - - self.get_id() - self.get_jid_resource() - self.exchange_items_list = {} - items_list = self.iq_obj.getTag('x').getChildren() - if not items_list: - return - self.action = items_list[0].getAttr('action') - if self.action is None: - self.action = 'add' - for item in self.iq_obj.getTag('x', namespace=common.xmpp.NS_ROSTERX).\ - getChildren(): - try: - jid = helpers.parse_jid(item.getAttr('jid')) - except common.helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % item.getAttr('jid')) - continue - name = item.getAttr('name') - contact = gajim.contacts.get_contact(self.conn.name, jid) - groups = [] - same_groups = True - for group in item.getTags('group'): - groups.append(group.getData()) - # check that all suggested groups are in the groups we have for this - # contact - if not contact or group not in contact.groups: - same_groups = False - if contact: - # check that all groups we have for this contact are in the - # suggested groups - for group in contact.groups: - if group not in groups: - same_groups = False - if contact.sub in ('both', 'to') and same_groups: - continue - self.exchange_items_list[jid] = [] - self.exchange_items_list[jid].append(name) - self.exchange_items_list[jid].append(groups) - if exchange_items_list: - return True - -class VersionRequestEvent(nec.NetworkIncomingEvent): - name = 'version-request-received' - base_network_events = [] - - def generate(self): - if not self.conn: - self.conn = self.base_event.conn - if not self.iq_obj: - self.iq_obj = self.base_event.xmpp_iq - - return True - -class LastRequestEvent(nec.NetworkIncomingEvent): - name = 'last-request-received' - base_network_events = [] - - def generate(self): - if not self.conn: - self.conn = self.base_event.conn - if not self.iq_obj: - self.iq_obj = self.base_event.xmpp_iq - - return True - -class TimeRequestEvent(nec.NetworkIncomingEvent): - name = 'time-request-received' - base_network_events = [] - - def generate(self): - if not self.conn: - self.conn = self.base_event.conn - if not self.iq_obj: - self.iq_obj = self.base_event.xmpp_iq

1 0

gajim: improve demandimport usage
by Yann Leboulanger 22 Jun '11

22 Jun '11

changeset a91b5a001282 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a91b5a001282 description: improve demandimport usage diffstat: src/common/gajim.py | 2 +- src/gajim.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diffs (25 lines): diff -r 3cfd33c1f171 -r a91b5a001282 src/common/gajim.py --- a/src/common/gajim.py Wed Jun 22 20:29:15 2011 +0200 +++ b/src/common/gajim.py Wed Jun 22 20:33:19 2011 +0200 @@ -166,7 +166,7 @@ HAVE_FARSIGHT = True try: - import farsight + farsight = __import__('farsight') import gst import glib try: diff -r 3cfd33c1f171 -r a91b5a001282 src/gajim.py --- a/src/gajim.py Wed Jun 22 20:29:15 2011 +0200 +++ b/src/gajim.py Wed Jun 22 20:33:19 2011 +0200 @@ -40,8 +40,7 @@ demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.glib', 'dbus.service', 'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto', - 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', - 'farsight'] + 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic'] import os import sys

1 0

gajim: check that we have rst plugin before supposing we can do ...
by Yann Leboulanger 22 Jun '11

22 Jun '11

changeset 3cfd33c1f171 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3cfd33c1f171 description: check that we have rst plugin before supposing we can do jingle. Fixes #6910 diffstat: src/common/gajim.py | 13 ++++- src/features_window.py | 120 ++++++++++++++++++++++++------------------------ src/gajim.py | 3 +- 3 files changed, 73 insertions(+), 63 deletions(-) diffs (166 lines): diff -r 25647b0c6935 -r 3cfd33c1f171 src/common/gajim.py --- a/src/common/gajim.py Mon Jun 20 23:15:29 2011 +0200 +++ b/src/common/gajim.py Wed Jun 22 20:29:15 2011 +0200 @@ -166,8 +166,17 @@ HAVE_FARSIGHT = True try: - __import__('farsight') - __import__('gst') + import farsight + import gst + import glib + try: + conference = gst.element_factory_make('fsrtpconference') + session = conference.new_session(farsight.MEDIA_TYPE_AUDIO) + del session + del conference + except glib.GError: + HAVE_FARSIGHT = False + except ImportError: HAVE_FARSIGHT = False gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} diff -r 25647b0c6935 -r 3cfd33c1f171 src/features_window.py --- a/src/features_window.py Mon Jun 20 23:15:29 2011 +0200 +++ b/src/features_window.py Wed Jun 22 20:29:15 2011 +0200 @@ -47,66 +47,66 @@ # {name: (available_function, unix_text, windows_text)} self.features = { - _('SSL certificate validation'): (self.pyopenssl_available, - _('A library used to validate server certificates to ensure a secure connection.'), - _('Requires python-pyopenssl.'), - _('Requires python-pyopenssl.')), - _('Bonjour / Zeroconf'): (self.zeroconf_available, - _('Serverless chatting with autodetected clients in a local network.'), - _('Requires python-avahi.'), - _('Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour).')), - _('Command line'): (self.dbus_available, - _('A script to control Gajim via commandline.'), - _('Requires python-dbus.'), - _('Feature not available under Windows.')), - _('OpenGPG message encryption'): (self.gpg_available, - _('Encrypting chat messages with gpg keys.'), - _('Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/).'), - _('Requires gpg.exe in PATH.')), - _('Network-manager'): (self.network_manager_available, - _('Autodetection of network status.'), - _('Requires gnome-network-manager and python-dbus.'), - _('Feature not available under Windows.')), - _('Session Management'): (self.session_management_available, - _('Gajim session is stored on logout and restored on login.'), - _('Requires python-gnome2.'), - _('Feature not available under Windows.')), - _('Password encryption'): (self.some_keyring_available, - _('Passwords can be stored securely and not just in plaintext.'), - _('Requires gnome-keyring and python-gnome2-desktop, or kwalletcli.'), - _('Feature not available under Windows.')), - _('SRV'): (self.srv_available, - _('Ability to connect to servers which are using SRV records.'), - _('Requires dnsutils.'), - _('Requires nslookup to use SRV records.')), - _('Spell Checker'): (self.speller_available, - _('Spellchecking of composed messages.'), - _('Requires libgtkspell.'), - _('Feature not available under Windows.')), - _('Notification'): (self.notification_available, - _('Passive popups notifying for new events.'), - _('Requires python-notify or instead python-dbus in conjunction with notification-daemon.'), - _('Feature not available under Windows.')), - _('Automatic status'): (self.idle_available, - _('Ability to measure idle time, in order to set auto status.'), - _('Requires libxss library.'), - _('Requires python2.5.')), - _('LaTeX'): (self.latex_available, - _('Transform LaTeX expressions between $$ $$.'), - _('Requires texlive-latex-base and (dvipng or ImageMagick). You have to set \'use_latex\' to True in the Advanced Configuration Editor.'), - _('Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). You have to set \'use_latex\' to True in the Advanced Configuration Editor.')), - _('End to End message encryption'): (self.pycrypto_available, - _('Encrypting chat messages.'), - _('Requires python-crypto.'), - _('Requires python-crypto.')), - _('RST Generator'): (self.docutils_available, - _('Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html).'), - _('Requires python-docutils.'), - _('Requires python-docutils.')), - _('Audio / Video'): (self.farsight_available, - _('Ability to start audio and video chat.'), - _('Requires python-farsight.'), - _('Feature not available under Windows.')), + _('SSL certificate validation'): (self.pyopenssl_available, + _('A library used to validate server certificates to ensure a secure connection.'), + _('Requires python-pyopenssl.'), + _('Requires python-pyopenssl.')), + _('Bonjour / Zeroconf'): (self.zeroconf_available, + _('Serverless chatting with autodetected clients in a local network.'), + _('Requires python-avahi.'), + _('Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour).')), + _('Command line'): (self.dbus_available, + _('A script to control Gajim via commandline.'), + _('Requires python-dbus.'), + _('Feature not available under Windows.')), + _('OpenGPG message encryption'): (self.gpg_available, + _('Encrypting chat messages with gpg keys.'), + _('Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/).'), + _('Requires gpg.exe in PATH.')), + _('Network-manager'): (self.network_manager_available, + _('Autodetection of network status.'), + _('Requires gnome-network-manager and python-dbus.'), + _('Feature not available under Windows.')), + _('Session Management'): (self.session_management_available, + _('Gajim session is stored on logout and restored on login.'), + _('Requires python-gnome2.'), + _('Feature not available under Windows.')), + _('Password encryption'): (self.some_keyring_available, + _('Passwords can be stored securely and not just in plaintext.'), + _('Requires gnome-keyring and python-gnome2-desktop, or kwalletcli.'), + _('Feature not available under Windows.')), + _('SRV'): (self.srv_available, + _('Ability to connect to servers which are using SRV records.'), + _('Requires dnsutils.'), + _('Requires nslookup to use SRV records.')), + _('Spell Checker'): (self.speller_available, + _('Spellchecking of composed messages.'), + _('Requires libgtkspell.'), + _('Feature not available under Windows.')), + _('Notification'): (self.notification_available, + _('Passive popups notifying for new events.'), + _('Requires python-notify or instead python-dbus in conjunction with notification-daemon.'), + _('Feature not available under Windows.')), + _('Automatic status'): (self.idle_available, + _('Ability to measure idle time, in order to set auto status.'), + _('Requires libxss library.'), + _('Requires python2.5.')), + _('LaTeX'): (self.latex_available, + _('Transform LaTeX expressions between $$ $$.'), + _('Requires texlive-latex-base and (dvipng or ImageMagick). You have to set \'use_latex\' to True in the Advanced Configuration Editor.'), + _('Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). You have to set \'use_latex\' to True in the Advanced Configuration Editor.')), + _('End to End message encryption'): (self.pycrypto_available, + _('Encrypting chat messages.'), + _('Requires python-crypto.'), + _('Requires python-crypto.')), + _('RST Generator'): (self.docutils_available, + _('Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html).'), + _('Requires python-docutils.'), + _('Requires python-docutils.')), + _('Audio / Video'): (self.farsight_available, + _('Ability to start audio and video chat.'), + _('Requires python-farsight and gstreamer-plugins-bad.'), + _('Feature not available under Windows.')), } # name, supported diff -r 25647b0c6935 -r 3cfd33c1f171 src/gajim.py --- a/src/gajim.py Mon Jun 20 23:15:29 2011 +0200 +++ b/src/gajim.py Wed Jun 22 20:29:15 2011 +0200 @@ -40,7 +40,8 @@ demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.glib', 'dbus.service', 'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto', - 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic'] + 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', + 'farsight'] import os import sys

1 0

gajim: merge from trunk
by Yann Leboulanger 20 Jun '11

20 Jun '11

changeset adbea99d8a4c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=adbea99d8a4c description: merge from trunk diffstat: .hgtags | 1 + ChangeLog | 10 +- README.html | 19 +- autogen.sh | 8 +- configure.ac | 20 +- data/gui/account_creation_wizard_window.ui | 1 + data/gui/accounts_window.ui | 3 + data/gui/add_new_contact_window.ui | 2 + data/gui/adhoc_commands_window.ui | 1 + data/gui/advanced_configuration_window.ui | 1 + data/gui/advanced_notifications_window.ui | 951 - data/gui/archiving_preferences_window.ui | 9 +- data/gui/blocked_contacts_window.ui | 1 + data/gui/chat_control.ui | 1071 +- data/gui/chat_to_muc_window.ui | 1 + data/gui/data_form_window.ui | 7 +- data/gui/edit_groups_dialog.ui | 2 +- data/gui/features_window.ui | 1 + data/gui/filetransfers.ui | 5 +- data/gui/gajim_themes_window.ui | 4 +- data/gui/gc_control_popup_menu.ui | 13 + data/gui/gc_occupants_menu.ui | 13 + data/gui/groupchat_control.ui | 787 +- data/gui/groups_post_window.ui | 1 + data/gui/history_manager.ui | 4 +- data/gui/item_archiving_preferences_window.ui | 5 +- data/gui/join_groupchat_window.ui | 4 + data/gui/manage_bookmarks_window.ui | 24 +- data/gui/manage_pep_services_window.ui | 1 + data/gui/manage_proxies_window.ui | 5 +- data/gui/manage_sounds_window.ui | 1 + data/gui/message_window.ui | 2 - data/gui/plugins_window.ui | 80 +- data/gui/preferences_window.ui | 109 +- data/gui/privacy_list_window.ui | 9 +- data/gui/privacy_lists_window.ui | 3 +- data/gui/profile_window.ui | 1 + data/gui/remove_account_window.ui | 1 + data/gui/roster_item_exchange_window.ui | 1 + data/gui/roster_window.ui | 47 +- data/gui/search_window.ui | 1 + data/gui/service_discovery_window.ui | 1 + data/gui/service_registration_window.ui | 1 + data/gui/subscription_request_window.ui | 2 + data/gui/synchronise_select_account_dialog.ui | 2 +- data/gui/synchronise_select_contacts_dialog.ui | 2 +- data/gui/vcard_information_window.ui | 8 +- data/gui/zeroconf_information_window.ui | 1 + data/iconsets/dcraven/32x32/chat.png | 0 data/iconsets/dcraven/32x32/dnd.png | 0 data/iconsets/dcraven/32x32/error.png | 0 data/iconsets/dcraven/32x32/not_in_roster.png | 0 data/iconsets/dcraven/32x32/offline.png | 0 data/iconsets/dcraven/32x32/online.png | 0 data/other/cacerts.pem | 23 + data/other/servers.xml | 482 +- debian/README.Debian | 3 + debian/changelog | 24 +- debian/control | 11 +- debian/copyright | 3 +- debian/dirs | 8 - debian/patches/00_debian-copying.diff | 21 + debian/patches/00_debian-copying.patch | 20 - debian/patches/01_configure-ac.diff | 33 + debian/patches/series | 2 + debian/rules | 28 +- gajim.nsi | 55 +- icons/hicolor/48x48/actions/gajim-warning.png | 0 launch.sh | 5 +- m4/python.m4 | 4 +- plugins/Makefile.am | 11 +- plugins/acronyms_expander.py | 102 - plugins/acronyms_expander/__init__.py | 1 + plugins/acronyms_expander/acronyms_expander.py | 96 + plugins/acronyms_expander/manifest.ini | 9 + plugins/banner_tweaks/manifest.ini | 10 + plugins/banner_tweaks/plugin.py | 16 +- plugins/dbus_plugin/manifest.ini | 10 + plugins/dbus_plugin/plugin.py | 28 +- plugins/events_dump/manifest.ini | 8 + plugins/events_dump/plugin.py | 6 - plugins/ftp_manager/__init__.py | 1 + plugins/ftp_manager/config_dialog.ui | 281 + plugins/ftp_manager/ftp_manager.py | 460 + plugins/ftp_manager/manifest.ini | 7 + plugins/google_translation/manifest.ini | 8 + plugins/google_translation/plugin.py | 76 +- plugins/length_notifier/length_notifier.py | 6 - plugins/length_notifier/manifest.ini | 9 + plugins/new_events_example/manifest.ini | 11 + plugins/new_events_example/plugin.py | 63 +- plugins/roster_buttons/manifest.ini | 10 + plugins/roster_buttons/plugin.py | 6 - plugins/snarl_notifications/manifest.ini | 11 + plugins/snarl_notifications/plugin.py | 31 +- plugins/triggers/__init__.py | 1 + plugins/triggers/config_dialog.ui | 900 + plugins/triggers/manifest.ini | 7 + plugins/triggers/triggers.py | 637 + plugins/whiteboard/__init__.py | 1 + plugins/whiteboard/brush_tool.png | 0 plugins/whiteboard/line_tool.png | 0 plugins/whiteboard/manifest.ini | 7 + plugins/whiteboard/oval_tool.png | 0 plugins/whiteboard/plugin.py | 477 + plugins/whiteboard/whiteboard.png | 0 plugins/whiteboard/whiteboard_widget.py | 419 + plugins/whiteboard/whiteboard_widget.ui | 192 + po/be.po | 3053 +++-- po/be(a)latin.po | 3056 +++-- po/bg.po | 3066 +++-- po/br.po | 3054 +++-- po/cs.po | 4838 +++---- po/da.po | 3041 +++-- po/de.po | 3079 +++-- po/el.po | 3070 +++-- po/en_GB.po | 3107 +++-- po/eo.po | 3122 +++-- po/es.po | 3077 +++-- po/eu.po | 3063 +++-- po/fr.po | 5246 ++++----- po/gl.po | 3066 +++-- po/hr.po | 3134 +++-- po/hu.po | 10012 ++++++++++++++++++ po/it.po | 3048 +++-- po/ja.po | 3030 ++-- po/kk.po | 3695 ++++-- po/lt.po | 3018 ++-- po/nb.po | 3066 +++-- po/nl.po | 3095 +++-- po/no.po | 3066 +++-- po/pl.po | 4301 ++++--- po/pt.po | 3097 +++-- po/pt_BR.po | 3071 +++-- po/ru.po | 4110 ++++--- po/sk.po | 3060 +++-- po/sr.po | 3162 +++-- po/sr(a)Latn.po | 3123 +++-- po/sv.po | 3077 +++-- po/uk.po | 5928 ++++++---- po/zh_CN.po | 8944 +++++++-------- po/zh_TW.po | 9686 +++++++++++++++++ setup_win32.py | 51 +- src/chat_control.py | 465 +- src/command_system/implementation/middleware.py | 4 +- src/common/GnuPG.py | 241 - src/common/GnuPGInterface.py | 673 - src/common/caps_cache.py | 42 +- src/common/check_paths.py | 31 +- src/common/config.py | 43 +- src/common/configpaths.py | 2 +- src/common/connection.py | 554 +- src/common/connection_handlers.py | 1957 +-- src/common/connection_handlers_events.py | 2071 +++ src/common/dataforms.py | 4 +- src/common/defs.py | 7 +- src/common/demandimport.py | 145 + src/common/exceptions.py | 12 + src/common/gajim.py | 43 +- src/common/ged.py | 33 +- src/common/gnupg.py | 973 + src/common/gpg.py | 130 + src/common/helpers.py | 151 +- src/common/jingle.py | 38 +- src/common/jingle_rtp.py | 9 +- src/common/jingle_session.py | 49 +- src/common/latex.py | 25 +- src/common/logger.py | 28 + src/common/logging_helpers.py | 5 +- src/common/message_archiving.py | 93 +- src/common/multimedia_helpers.py | 57 +- src/common/nec.py | 79 +- src/common/optparser.py | 13 +- src/common/passwords.py | 3 +- src/common/pep.py | 35 +- src/common/protocol/bytestream.py | 77 +- src/common/protocol/caps.py | 89 +- src/common/pubsub.py | 45 +- src/common/resolver.py | 4 +- src/common/sleepy.py | 1 + src/common/stanza_session.py | 6 +- src/common/xmpp/bosh.py | 9 +- src/common/xmpp/client_nb.py | 5 + src/common/xmpp/dispatcher_nb.py | 1 + src/common/xmpp/features_nb.py | 9 +- src/common/xmpp/idlequeue.py | 13 +- src/common/xmpp/protocol.py | 368 +- src/common/xmpp/tls_nb.py | 10 +- src/common/xmpp/transports_nb.py | 6 +- src/common/zeroconf/connection_handlers_zeroconf.py | 79 +- src/common/zeroconf/connection_zeroconf.py | 141 +- src/common/zeroconf/roster_zeroconf.py | 2 + src/common/zeroconf/zeroconf_avahi.py | 11 +- src/config.py | 363 +- src/conversation_textview.py | 84 +- src/dataforms_widget.py | 28 +- src/dialogs.py | 1305 +- src/disco.py | 122 +- src/features_window.py | 34 +- src/filetransfers_window.py | 20 +- src/gajim-remote-plugin.py | 548 - src/gajim-remote.py | 7 +- src/gajim.py | 55 +- src/groupchat_control.py | 641 +- src/gtkgui_helpers.py | 54 +- src/gui_interface.py | 1950 +-- src/gui_menu_builder.py | 15 +- src/history_manager.py | 271 +- src/history_window.py | 11 +- src/htmltextview.py | 346 +- src/ipython_view.py | 6 + src/message_control.py | 43 +- src/message_textview.py | 15 +- src/message_window.py | 50 +- src/notify.py | 142 +- src/plugins/gui.py | 108 +- src/plugins/helpers.py | 17 +- src/plugins/plugin.py | 11 +- src/plugins/pluginmanager.py | 344 +- src/profile_window.py | 42 +- src/remote_control.py | 107 +- src/roster_window.py | 790 +- src/search_window.py | 46 +- src/secrets.py | 2 +- src/session.py | 310 +- src/statusicon.py | 52 +- src/vcard.py | 22 + test/integration/test_roster.py | 5 +- test/integration/test_xmpp_client_nb.py | 2 +- test/lib/__init__.py | 3 + test/lib/gajim_mocks.py | 4 +- test/runtests.py | 26 +- test/unit/test_gui_interface.py | 59 - 233 files changed, 95473 insertions(+), 63077 deletions(-) diffs (truncated from 302701 to 300 lines): diff -r 0c8aedd47e68 -r adbea99d8a4c .hgtags --- a/.hgtags Thu Aug 26 16:56:46 2010 +0200 +++ b/.hgtags Mon Jun 20 23:03:06 2011 +0200 @@ -3,3 +3,4 @@ 604c5de0dfe72dfa76b3014c410a50daae381cbe gajim-0.12 7752eadd1f8c31a3dc282c15d87767a7ba1bd217 gajim-0.12-alpha1 a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 +91ceabbf74309d7bbd79b43552b89768842b4e8a gajim-0.14.1 diff -r 0c8aedd47e68 -r adbea99d8a4c ChangeLog --- a/ChangeLog Thu Aug 26 16:56:46 2010 +0200 +++ b/ChangeLog Mon Jun 20 23:03:06 2011 +0200 @@ -1,4 +1,12 @@ -Gajim 0.14 (XX) +Gajim 0.14.1 (26 October 2010) + + * Fix changing account name + * Fix sending XHTML + * Fix GnomeKayring usage + * Fix some GPG bugs + * Minor bugfixes + +Gajim 0.14 (02 September 2010) * Jingle audio / video chat * Improve Startup time diff -r 0c8aedd47e68 -r adbea99d8a4c README.html --- a/README.html Thu Aug 26 16:56:46 2010 +0200 +++ b/README.html Mon Jun 20 23:03:06 2011 +0200 @@ -16,11 +16,8 @@ <ul> <li>python2.5 or higher</li> <li>pygtk2.16 or higher</li> -<li>pysqlite2 (if you have python 2.5, you already have this)</li> </ul> -<p><strong>Note to packagers</strong> Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gnomepythonextras (aka gnome-python-desktop) which is gnome dep, but you will miss gnomekeyring integration.</p> - <h2>Optional Runtime Requirements</h2> <ul> <li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) (>=0.9) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> @@ -29,7 +26,8 @@ <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li> -<li>gnome-python-desktop (for GnomeKeyring support)</li> +<li>gnome-python-desktop (for GnomeKeyring support as password storage)</li> +<li>kwalletcli (for support of KDE Wallet as password storage)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> <li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li> <li>python-dbus bindings (>=0.81)</li> @@ -40,8 +38,6 @@ <h2>Compile-time Requirements</h2> <ul> -<li>python-dev</li> -<li>python-gtk2-dev</li> <li>intltool (>= 0.40.1)</li> </ul> @@ -52,15 +48,10 @@ <li>tar jxvf gajim-version.tar.bz2</li> <li>cd gajim</li> <li>./configure</li> -<li>make (builds all modules)</li> +<li>make (builds translations)</li> <li>su -c make install</li> </ol> -<p>To specify what modules to build do:</p> -<pre> - make help -</pre> - <p>To specify where to install do:</p> <pre> ./configure --prefix=custom_path @@ -68,7 +59,7 @@ <h2>Running Gajim</h2> <p>Just do <em>gajim</em> or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.<br/><br/> -or if you didn't 'make install' you can also run from gajim folder with<em>./launch.sh</em></p> +or if you use hg version and you didn't 'make install' you can also run from gajim folder with<em>./launch.sh</em></p> <hr /> <h3>Note for hg users</h3> <p>You will need GNU autotools in order to install Gajim from svn. This includes:</p> @@ -120,7 +111,7 @@ <br/> <br/> <br/> -(C) 2003-2010<br/> +(C) 2003-2011<br/> The Gajim Team<br/> http://gajim.org<br/> <br/> diff -r 0c8aedd47e68 -r adbea99d8a4c autogen.sh --- a/autogen.sh Thu Aug 26 16:56:46 2010 +0200 +++ b/autogen.sh Mon Jun 20 23:03:06 2011 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.13.90.1" + gajimversion="0.14.0.1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" @@ -8,7 +8,7 @@ fi echo "define([AC_PACKAGE_VERSION], [${gajimversion}${hgversion}])" > m4/hgversion.m4 - AM_ARGS="--add-missing --gnu --copy" + AM_ARGS="--add-missing --gnu --copy -Wno-portability" CONF_ARGS="" if test x`uname -s 2>/dev/null` = 'xDarwin' -a -f /Library/Frameworks/GTK+.framework/Versions/Current/env; then . /Library/Frameworks/GTK+.framework/Versions/Current/env @@ -20,7 +20,7 @@ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ po/POTFILES.in; done \ && ls -1 data/gajim.desktop.in.in \ - src/*py src/common/*py src/common/zeroconf/*.py | grep -v ipython_view.py >> \ + src/*py src/common/*py src/common/zeroconf/*.py src/plugins/*.py| grep -v ipython_view.py >> \ po/POTFILES.in || exit 1 if test -z `which pkg-config 2>/dev/null`;then echo "***Error: pkg-config not found***" @@ -36,6 +36,6 @@ && aclocal -I ./m4 \ && $LIBTOOLIZE --copy --force --automake \ && autoheader \ - && autoconf \ + && autoconf \ && automake ${AM_ARGS} \ && ./configure ${CONF_ARGS} $@ diff -r 0c8aedd47e68 -r adbea99d8a4c configure.ac --- a/configure.ac Thu Aug 26 16:56:46 2010 +0200 +++ b/configure.ac Mon Jun 20 23:03:06 2011 +0200 @@ -9,9 +9,6 @@ AM_INIT_AUTOMAKE([1.8]) AM_MAINTAINER_MODE -dnl Make Objective-C work with automake -AM_CONDITIONAL([am__fastdepOBJC], false) - IT_PROG_INTLTOOL([0.35.0]) PKG_PROG_PKG_CONFIG([0.19]) @@ -36,25 +33,10 @@ AM_NLS -dnl **** -dnl pygtk and gtk+ -dnl **** -PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0]) -AC_SUBST(PYGTK_CFLAGS) -AC_SUBST(PYGTK_LIBS) -PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` -AC_SUBST(PYGTK_DEFS) - -AM_PATH_PYTHON([2.5]) -if test "x$PYTHON" = "x:"; then - AC_MSG_ERROR([Python not found]) -fi - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" AC_SUBST(ACLOCAL_AMFLAGS) -AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -AC_SUBST([PYTHON_INCLUDES]) +AM_PATH_PYTHON([2.5]) dnl **** dnl enable installation in python-2.x/site-packages/gajim diff -r 0c8aedd47e68 -r adbea99d8a4c data/gui/account_creation_wizard_window.ui --- a/data/gui/account_creation_wizard_window.ui Thu Aug 26 16:56:46 2010 +0200 +++ b/data/gui/account_creation_wizard_window.ui Mon Jun 20 23:03:06 2011 +0200 @@ -6,6 +6,7 @@ <property name="border_width">12</property> <property name="title" translatable="yes">Gajim: Account Creation Wizard</property> <property name="resizable">False</property> + <property name="type_hint">dialog</property> <signal name="destroy" handler="on_wizard_window_destroy"/> <child> <object class="GtkVBox" id="vbox77"> diff -r 0c8aedd47e68 -r adbea99d8a4c data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Thu Aug 26 16:56:46 2010 +0200 +++ b/data/gui/accounts_window.ui Mon Jun 20 23:03:06 2011 +0200 @@ -18,6 +18,7 @@ <property name="border_width">12</property> <property name="title" translatable="yes">Accounts</property> <property name="default_width">800</property> + <property name="type_hint">dialog</property> <signal name="destroy" handler="on_accounts_window_destroy"/> <signal name="key_press_event" handler="on_accounts_window_key_press_event"/> <child> @@ -484,6 +485,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">Choose Client Cert</property> + <signal name="clicked" handler="on_browse_for_client_cert_button_clicked"/> </object> <packing> <property name="expand">False</property> @@ -719,6 +721,7 @@ </child> </object> <packing> + <property name="expand">False</property> <property name="position">0</property> </packing> </child> diff -r 0c8aedd47e68 -r adbea99d8a4c data/gui/add_new_contact_window.ui --- a/data/gui/add_new_contact_window.ui Thu Aug 26 16:56:46 2010 +0200 +++ b/data/gui/add_new_contact_window.ui Mon Jun 20 23:03:06 2011 +0200 @@ -6,6 +6,7 @@ <property name="border_width">6</property> <property name="title" translatable="yes">Add New Contact</property> <property name="resizable">False</property> + <property name="type_hint">dialog</property> <signal name="destroy" handler="on_add_new_contact_window_destroy"/> <signal name="key_press_event" handler="on_add_new_contact_window_key_press_event"/> <child> @@ -100,6 +101,7 @@ <property name="visible">True</property> <property name="no_show_all">True</property> <property name="model">liststore2</property> + <signal name="changed" handler="on_protocol_jid_combobox_changed"/> <child> <object class="GtkCellRendererText" id="cellrenderertext2"/> <attributes> diff -r 0c8aedd47e68 -r adbea99d8a4c data/gui/adhoc_commands_window.ui --- a/data/gui/adhoc_commands_window.ui Thu Aug 26 16:56:46 2010 +0200 +++ b/data/gui/adhoc_commands_window.ui Mon Jun 20 23:03:06 2011 +0200 @@ -6,6 +6,7 @@ <property name="visible">True</property> <property name="border_width">6</property> <property name="title" translatable="yes">Ad-hoc Commands - Gajim</property> + <property name="type_hint">dialog</property> <signal name="destroy" handler="on_adhoc_commands_window_destroy"/> <child> <object class="GtkVBox" id="vbox1"> diff -r 0c8aedd47e68 -r adbea99d8a4c data/gui/advanced_configuration_window.ui --- a/data/gui/advanced_configuration_window.ui Thu Aug 26 16:56:46 2010 +0200 +++ b/data/gui/advanced_configuration_window.ui Mon Jun 20 23:03:06 2011 +0200 @@ -8,6 +8,7 @@ <property name="role">ace</property> <property name="default_width">650</property> <property name="default_height">540</property> + <property name="type_hint">dialog</property> <signal name="destroy" handler="on_advanced_configuration_window_destroy"/> <child> <object class="GtkVBox" id="vbox70"> diff -r 0c8aedd47e68 -r adbea99d8a4c data/gui/advanced_notifications_window.ui --- a/data/gui/advanced_notifications_window.ui Thu Aug 26 16:56:46 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,951 +0,0 @@ -<?xml version="1.0"?> -<interface> - <requires lib="gtk+" version="2.16"/> -  - <object class="GtkListStore" id="liststore1"> - <columns> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">contact(s)</col> - </row> - <row> - <col id="0" translatable="yes">group(s)</col> - </row> - <row> - <col id="0" translatable="yes">everybody</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore2"> - <columns> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Receive a Message</col> - </row> - <row> - <col id="0" translatable="yes">Contact Disconnected </col> - </row> - <row> - <col id="0" translatable="yes">Contact Change Status </col> - </row> - <row> - <col id="0" translatable="yes">Group Chat Message Highlight </col> - </row> - <row> - <col id="0" translatable="yes">Group Chat Message Received </col> - </row> - <row> - <col id="0" translatable="yes">File Transfer Request </col> - </row> - <row> - <col id="0" translatable="yes">File Transfer Started </col>

1 0

gajim: [Milouse] updated french translation
by Yann Leboulanger 20 Jun '11

20 Jun '11

changeset 25647b0c6935 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=25647b0c6935 description: [Milouse] updated french translation diffstat: po/fr.po | 6506 ++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 3797 insertions(+), 2709 deletions(-) diffs (truncated from 10971 to 300 lines): diff -r e37675d6eaf0 -r 25647b0c6935 po/fr.po --- a/po/fr.po Sun Jun 19 21:19:20 2011 +0200 +++ b/po/fr.po Mon Jun 20 23:15:29 2011 +0200 @@ -1,27 +1,27 @@ # French translations for gajim package # Copyright (C) 2004-2006 THE gajim'S COPYRIGHT HOLDER # This file is distributed under the same license as the gajim package. -# +# # See: http://live.gnome.org/GnomeFr/Traduire for translation guidelines -# +# msgid "" msgstr "" "Project-Id-Version: gajim 0.12 svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-01 20:39+0200\n" -"PO-Revision-Date: 2009-11-15 15:50+0100\n" +"POT-Creation-Date: 2011-06-20 23:14+0200\n" +"PO-Revision-Date: 2011-05-30 08:28+0100\n" "Last-Translator: Florent Le Coz <louizatakk(a)fedoraproject.org>\n" "Language-Team: <>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-SearchPath-0: .\n" "X-Poedit-Basepath: /home/louiz/gajim\n" "X-Poedit-Country: FRANCE\n" "X-Poedit-Language: French\n" +"X-Poedit-SearchPath-0: .\n" #: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 msgid "Join _Group Chat..." @@ -31,7 +31,7 @@ msgid "_Add Contact..." msgstr "_Ajouter un contact..." -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18 +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:20 msgid "_Discover Services" msgstr "_Découvrir les services" @@ -51,7 +51,7 @@ msgid "_Personal Events" msgstr "Évènements P_ersonnels" -#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24 +#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:25 msgid "_Start Chat..." msgstr "Commencer une _discussion..." @@ -113,7 +113,8 @@ #: ../data/gui/account_creation_wizard_window.ui.h:15 #: ../data/gui/accounts_window.ui.h:28 msgid "If checked, Gajim will remember the password for this account" -msgstr "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte" +msgstr "" +"Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte" #: ../data/gui/account_creation_wizard_window.ui.h:16 msgid "Manage..." @@ -121,12 +122,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:17 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694 -#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344 -#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688 -#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514 -#: ../src/dialogs.py:527 ../src/roster_window.py:2956 -#: ../src/roster_window.py:2962 ../src/roster_window.py:2967 +#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703 +#: ../src/config.py:1708 ../src/config.py:2274 ../src/config.py:2353 +#: ../src/config.py:2366 ../src/config.py:3644 ../src/config.py:3719 +#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 +#: ../src/dialogs.py:532 ../src/roster_window.py:3096 +#: ../src/roster_window.py:3102 ../src/roster_window.py:3107 msgid "None" msgstr "Aucun" @@ -156,7 +157,7 @@ "au réseau Jabber." #: ../data/gui/account_creation_wizard_window.ui.h:24 -#: ../data/gui/roster_window.ui.h:16 +#: ../data/gui/roster_window.ui.h:18 msgid "_Advanced" msgstr "_Avancées" @@ -175,6 +176,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:28 #: ../data/gui/accounts_window.ui.h:64 +#: ../data/gui/manage_bookmarks_window.ui.h:8 msgid "_Password:" msgstr "Mot de _passe : " @@ -183,6 +185,7 @@ msgstr "_Port :" #: ../data/gui/account_creation_wizard_window.ui.h:30 +#: ../data/gui/manage_bookmarks_window.ui.h:9 msgid "_Server:" msgstr "_Serveur :" @@ -239,8 +242,12 @@ msgstr "Chan_ger le mot de passe" #: ../data/gui/accounts_window.ui.h:14 -msgid "Check this so Gajim will ask you before sending your password over an insecure connection." -msgstr "Cochez cette case pour que Gajim vous demande avant d'envoyer votre mot de passe via une connexion non-sécurisée" +msgid "" +"Check this so Gajim will ask you before sending your password over an " +"insecure connection." +msgstr "" +"Cochez cette case pour que Gajim vous demande avant d'envoyer votre mot de " +"passe via une connexion non-sécurisée" #: ../data/gui/accounts_window.ui.h:15 msgid "Choose Client Cert" @@ -256,7 +263,8 @@ #: ../data/gui/accounts_window.ui.h:18 msgid "Click to request authorization to all contacts of another account" -msgstr "Cliquez pour demander l'autorisation à tous les contacts d'un autre compte" +msgstr "" +"Cliquez pour demander l'autorisation à tous les contacts d'un autre compte" #: ../data/gui/accounts_window.ui.h:19 msgid "Client certificate" @@ -282,57 +290,80 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 -#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600 -#: ../src/notify.py:616 +#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160 +#: ../src/notify.py:474 ../src/notify.py:497 ../src/notify.py:546 +#: ../src/notify.py:562 msgid "Gajim" msgstr "Gajim" #. FIXME: Ugly workaround. -#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to -#. General) +#. FIXME: Ugly workaround. +#. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57 -#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122 -#: ../src/roster_window.py:2898 ../src/roster_window.py:5451 +#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56 +#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124 +#: ../src/roster_window.py:3038 ../src/roster_window.py:5643 msgid "General" msgstr "Général" #: ../data/gui/accounts_window.ui.h:26 -msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working." -msgstr "Si cette case est cochée, Gajim va diffuser des adresses IP en plus de la vôtre, les transferts de fichiers ont ainsi plus de chance de fonctionner." +msgid "" +"If checked, Gajim will also broadcast some more IPs except from just your " +"IP, so file transfer has higher chances of working." +msgstr "" +"Si cette case est cochée, Gajim va diffuser des adresses IP en plus de la " +"vôtre, les transferts de fichiers ont ainsi plus de chance de fonctionner." #: ../data/gui/accounts_window.ui.h:27 msgid "If checked, Gajim will get the password from a GPG agent like seahorse" -msgstr "Si cette case est cochée, Gajim obtiendra le mot de passe depuis un agent GPG comme seahorse" +msgstr "" +"Si cette case est cochée, Gajim obtiendra le mot de passe depuis un agent " +"GPG comme seahorse" #: ../data/gui/accounts_window.ui.h:29 -msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection" -msgstr "Si coché, Gajim enverra des paquets de maintien de connection pour prévenir des temps de latence pouvant entraîner des déconnexions" +msgid "" +"If checked, Gajim will send keep-alive packets to prevent connection timeout " +"which results in disconnection" +msgstr "" +"Si coché, Gajim enverra des paquets de maintien de connection pour prévenir " +"des temps de latence pouvant entraîner des déconnexions" #: ../data/gui/accounts_window.ui.h:30 -msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account" -msgstr "Si cette case est cochée, au démarrage, Gajim se connectera automatiquement à jabber en utilisant ce compte" +msgid "" +"If checked, Gajim, when launched, will automatically connect to jabber using " +"this account" +msgstr "" +"Si cette case est cochée, au démarrage, Gajim se connectera automatiquement " +"à jabber en utilisant ce compte" #: ../data/gui/accounts_window.ui.h:31 -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 accordingly" -msgstr "Si cette case est cochée, toute modification de l'état global (accessible à l'aide du bouton en bas de la fenêtre principale) sera répercutée sur l'état de ce compte" +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 " +"accordingly" +msgstr "" +"Si cette case est cochée, toute modification de l'état global (accessible à " +"l'aide du bouton en bas de la fenêtre principale) sera répercutée sur l'état " +"de ce compte" #: ../data/gui/accounts_window.ui.h:32 msgid "" -"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n" +"If the default port that is used for incoming messages is unfitting for your " +"setup you can select another one here.\n" "You might consider to change possible firewall settings." msgstr "" -"Si le port par défaut utilisé pour les messages entrants n'est pas adapté à vos besoins, vous pouvez en spécifier un ici.\n" -"Vous devriez considérer modifier les paramètres de votre pare-feu si vous en avez un." +"Si le port par défaut utilisé pour les messages entrants n'est pas adapté à " +"vos besoins, vous pouvez en spécifier un ici.\n" +"Vous devriez considérer modifier les paramètres de votre pare-feu si vous en " +"avez un." #: ../data/gui/accounts_window.ui.h:34 msgid "Information about you, as stored in the server" msgstr "Les informations vous concernant, stockées sur le serveur" #: ../data/gui/accounts_window.ui.h:35 -#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817 -#: ../src/dialogs.py:831 +#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826 +#: ../src/dialogs.py:837 msgid "Jabber ID:" msgstr "Identifiant Jabber :" @@ -345,8 +376,8 @@ msgid "Mer_ge accounts" msgstr "_Regrouper les comptes" -#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790 -#: ../src/config.py:2358 +#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799 +#: ../src/config.py:2367 msgid "No key selected" msgstr "Pas de clé sélectionnée" @@ -359,15 +390,21 @@ msgstr "Priori_té :" #: ../data/gui/accounts_window.ui.h:42 -msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events" -msgstr "La priorité est utilisée par Jabber pour déterminer qui reçoit les événements du serveur quand plusieurs clients sont connectés avec le même compte. Le client ayant la plus haute priorité recevra les messages" +msgid "" +"Priority is used in Jabber to determine who gets the events from the jabber " +"server when two or more clients are connected using the same account; The " +"client with the highest priority gets the events" +msgstr "" +"La priorité est utilisée par Jabber pour déterminer qui reçoit les " +"événements du serveur quand plusieurs clients sont connectés avec le même " +"compte. Le client ayant la plus haute priorité recevra les messages" #: ../data/gui/accounts_window.ui.h:43 msgid "Priority will change automatically according to your status." msgstr "La priorité va changer automatiquement selon votre état." #. Rename -#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401 +#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5593 msgid "Re_name" msgstr "Re_nommer" @@ -376,8 +413,18 @@ msgstr "Ressour_ce: " #: ../data/gui/accounts_window.ui.h:46 -msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" -msgstr "La ressource est envoyée au serveur Jabber pour différencier les clients connectés au même serveur avec le même compte. Vous pouvez donc être connecté avec le même compte avec les ressources « Maison » et « Travail » en même temps. La ressource avec la plus haute priorité recevra les messages (voir plus bas)." +msgid "" +"Resource is sent to the Jabber server in order to separate the same JID in " +"two or more parts depending on the number of the clients connected in the " +"same server with the same account. So you might be connected in the same " +"account with resource 'Home' and 'Work' at the same time. The resource which " +"has the highest priority will get the events. (see below)" +msgstr "" +"La ressource est envoyée au serveur Jabber pour différencier les clients " +"connectés au même serveur avec le même compte. Vous pouvez donc être " +"connecté avec le même compte avec les ressources « Maison » et « Travail » " +"en même temps. La ressource avec la plus haute priorité recevra les messages " +"(voir plus bas)." #: ../data/gui/accounts_window.ui.h:47 msgid "Save conversation _logs for all contacts" @@ -402,7 +449,7 @@ #: ../data/gui/accounts_window.ui.h:53 msgid "The path to the client certificate and key in PKCS#12 format" -msgstr "" +msgstr "Chemin vers le certificat client et la clé au format PKCS#12"

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2011