Commits August 2012

commits@gajim.org

3 participants
152 discussions

gajim-website: fix syntax
by Yann Leboulanger 29 Aug '12

29 Aug '12

changeset a7d15154182d in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=a7d15154182d description: fix syntax diffstat: index.php | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diffs (41 lines): diff -r 88317e1d79ef -r a7d15154182d index.php --- a/index.php Wed Aug 29 10:02:26 2012 +0200 +++ b/index.php Wed Aug 29 10:07:06 2012 +0200 @@ -50,29 +50,29 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.15.1") - 1 => sprintf(_("Gajim %s is here!"), "0.15") + 0 => sprintf(_("Gajim %s is here!"), "0.15.1"), + 1 => sprintf(_("Gajim %s is here!"), "0.15"), ); // 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), // 6 => sprintf(_("Beta-release of Gajim %s"), "0.12"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("29 August 2012") - 1 => _("18 March 2012") + 0 => _("29 August 2012"), + 1 => _("18 March 2012"), ); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.15.1") - 1 => sprintf(_("Version %s of Gajim has been released."), "0.15") + 0 => sprintf(_("Version %s of Gajim has been released."), "0.15.1"), + 1 => sprintf(_("Version %s of Gajim has been released."), "0.15"), ); // 6 => sprintf(_("Version %s will arrive very soon."), "0.12"), // 7 => sprintf(_("Version %s will arrive soon."), "0.12")); // 3 => sprintf(_("New Windows Installer with GTK+ included.")), $array_news_whats_new = array( - 0 => sprintf(_("What's new since %s:"), "0.15") - 1 => sprintf(_("What's new since %s:"), "0.14.4") + 0 => sprintf(_("What's new since %s:"), "0.15"), + 1 => sprintf(_("What's new since %s:"), "0.14.4"), ); // 3 => sprintf(_("What's new in it:")),

1 0

gajim-website: prepare website for 0.15.1
by Yann Leboulanger 29 Aug '12

29 Aug '12

changeset 282cf63d92be in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=282cf63d92be description: prepare website for 0.15.1X-Hg-Repo: gajim-website Subject: gajim-website: update po files From: Yann Leboulanger <asterix(a)lagaule.org> changeset 88317e1d79ef in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=88317e1d79ef description: update po files diffstat: downloads.php | 2 +- index.php | 21 ++- locale/bg_BG/LC_MESSAGES/msg.po | 100 +++++++++-------- locale/de_DE/LC_MESSAGES/msg.po | 105 +++++++++-------- locale/eo/LC_MESSAGES/msg.po | 100 +++++++++-------- locale/es_ES/LC_MESSAGES/msg.po | 86 ++++++++------ locale/fr_FR/LC_MESSAGES/msg.po | 94 ++++++++------- locale/he_IL/LC_MESSAGES/msg.po | 226 +++++++++++++++++++++++++-------------- locale/hu_HU/LC_MESSAGES/msg.po | 97 +++++++++-------- locale/it_IT/LC_MESSAGES/msg.po | 100 +++++++++-------- locale/pl_PL/LC_MESSAGES/msg.po | 105 +++++++++-------- locale/pt_BR/LC_MESSAGES/msg.po | 105 +++++++++-------- locale/ru_RU/LC_MESSAGES/msg.po | 106 +++++++++-------- msg.pot | 77 +++++++------ 14 files changed, 734 insertions(+), 590 deletions(-) diffs (truncated from 2467 to 300 lines): diff -r 265abbe71a64 -r 88317e1d79ef downloads.php --- a/downloads.php Tue Aug 28 15:06:29 2012 +0200 +++ b/downloads.php Wed Aug 29 10:02:26 2012 +0200 @@ -5,7 +5,7 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); $download_folder = "0.15"; -$last_version = "0.15"; +$last_version = "0.15.1"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; #printf(_(" A %s version is in test"), "0.15-beta4"); diff -r 265abbe71a64 -r 88317e1d79ef index.php --- a/index.php Tue Aug 28 15:06:29 2012 +0200 +++ b/index.php Wed Aug 29 10:02:26 2012 +0200 @@ -37,7 +37,7 @@ 13 => _("XML console"), 14 => _("Link local (bonjour / zeroconf), BOSH"), 15 => _("Other features via plugins"), - 16 => _("Gajim is available in 25 languages: Basque, Belarusian, Brasilian, British, Bulgarian, Chinese (simplified), Croatian, Czech, Danish, English, Esperanto, French, Galician, German, Italian, Japanese, Lithuanian, Norwegian (Bokmål), Polish, Russian, Serbian, Spanish, Slovak, Swedish and Ukrainian"), + 16 => _("Gajim is available in 29 languages: Basque, Belarusian, Brasilian, British, Bulgarian, Chinese (simplified), Croatian, Czech, Danish, English, Esperanto, French, Galician, German, Hebrew, Hungarian, Italian, Japanese, Kazakh, Lithuanian, Norwegian (Bokmål), Polish, Russian, Serbian, Spanish, Slovak, Swedish, Turkish and Ukrainian"), ); @@ -50,29 +50,40 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.15") + 0 => sprintf(_("Gajim %s is here!"), "0.15.1") + 1 => sprintf(_("Gajim %s is here!"), "0.15") ); // 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), // 6 => sprintf(_("Beta-release of Gajim %s"), "0.12"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("18 March 2012") + 0 => _("29 August 2012") + 1 => _("18 March 2012") ); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.15") + 0 => sprintf(_("Version %s of Gajim has been released."), "0.15.1") + 1 => sprintf(_("Version %s of Gajim has been released."), "0.15") ); // 6 => sprintf(_("Version %s will arrive very soon."), "0.12"), // 7 => sprintf(_("Version %s will arrive soon."), "0.12")); // 3 => sprintf(_("New Windows Installer with GTK+ included.")), $array_news_whats_new = array( - 0 => sprintf(_("What's new since %s:"), "0.14.4") + 0 => sprintf(_("What's new since %s:"), "0.15") + 1 => sprintf(_("What's new since %s:"), "0.14.4") ); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( + 0 => _("Switch to python-farstream"), + 1 => _("Fix several issues"), + 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.1/ChangeLog\">"._("Full ChangeLog")."</a> ", + 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.1\">"._("List of fixed bugs")."</a>", + ); + +$array_news_items[1] = array( 0 => _("Plugin system"), 1 => _("Whiteboard (via a plugin)"), 2 => _("Message archiving"), diff -r 265abbe71a64 -r 88317e1d79ef locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Tue Aug 28 15:06:29 2012 +0200 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Wed Aug 29 10:02:26 2012 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-16 13:15+0200\n" +"POT-Creation-Date: 2012-08-29 09:56+0200\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -175,8 +175,8 @@ msgid " List archives are available " msgstr " Архивите на списъка са достъпни " -#: dev.php:20 docs.php:39 docs.php:45 downloads.php:24 downloads.php:38 -#: downloads.php:162 downloads.php:174 downloads.php:212 downloads.php:232 +#: dev.php:20 docs.php:39 docs.php:45 downloads.php:38 downloads.php:162 +#: downloads.php:174 downloads.php:212 downloads.php:232 msgid "here" msgstr "тук" @@ -360,11 +360,6 @@ msgid " If you use Debian unstable do" msgstr " Ако използвате Дебиан „unstable“, напишете" -#: downloads.php:23 -#, fuzzy, c-format -msgid " The Debian package of %s is " -msgstr " Архивиран изходен код на версията на Gajim има " - #: downloads.php:25 #, fuzzy msgid "" @@ -745,11 +740,11 @@ #: index.php:40 #, fuzzy msgid "" -"Gajim is available in 25 languages: Basque, Belarusian, Brasilian, British, " +"Gajim is available in 29 languages: Basque, Belarusian, Brasilian, British, " "Bulgarian, Chinese (simplified), Croatian, Czech, Danish, English, " -"Esperanto, French, Galician, German, Italian, Japanese, Lithuanian, " -"Norwegian (Bokmål), Polish, Russian, Serbian, Spanish, Slovak, Swedish and " -"Ukrainian" +"Esperanto, French, Galician, German, Hebrew, Hungarian, Italian, Japanese, " +"Kazakh, Lithuanian, Norwegian (Bokmål), Polish, Russian, Serbian, Spanish, " +"Slovak, Swedish, Turkish and Ukrainian" msgstr "" "Gajim е достъпен на 24 езика: баски, белоруски, бразилски португалски, " "бретонски, британски английски, български, китайски (опростен), хърватски, " @@ -761,71 +756,88 @@ msgid "NEWS" msgstr "НОВИНИ" -#: index.php:53 +#: index.php:53 index.php:54 #, fuzzy, c-format msgid "Gajim %s is here!" msgstr "Излезе Gajim 0.11!" -#: index.php:60 +#: index.php:61 +msgid "29 August 2012" +msgstr "" + +#: index.php:62 msgid "18 March 2012" msgstr "" -#: index.php:64 +#: index.php:66 index.php:67 #, fuzzy, c-format msgid "Version %s of Gajim has been released." msgstr "Издадена е версия 0.11 на Gajim." -#: index.php:71 +#: index.php:74 index.php:75 #, fuzzy, c-format msgid "What's new since %s:" msgstr "Какво е новото спрямо " -#: index.php:76 -msgid "Plugin system" -msgstr "" - -#: index.php:77 -msgid "Whiteboard (via a plugin)" -msgstr "" - -#: index.php:78 -msgid "Message archiving" -msgstr "" - -#: index.php:79 -msgid "Stream managment" -msgstr "" - #: index.php:80 -msgid "Nested roster group" +msgid "Switch to python-farstream" msgstr "" #: index.php:81 -msgid "Roster filtrering" -msgstr "" +#, fuzzy +msgid "Fix several issues" +msgstr "Нов превод: сръбски" -#: index.php:82 -msgid "GPG and spell checking support for windows" -msgstr "" - -#: index.php:83 +#: index.php:82 index.php:94 msgid "Full ChangeLog" msgstr "Пълен дневник на промените" -#: index.php:83 +#: index.php:82 index.php:94 #, fuzzy msgid "Full changelog, see" msgstr "Пълен дневник на промените" -#: index.php:84 +#: index.php:83 index.php:95 msgid "List of fixed bugs" msgstr "" +#: index.php:87 +msgid "Plugin system" +msgstr "" + +#: index.php:88 +msgid "Whiteboard (via a plugin)" +msgstr "" + +#: index.php:89 +msgid "Message archiving" +msgstr "" + +#: index.php:90 +msgid "Stream managment" +msgstr "" + +#: index.php:91 +msgid "Nested roster group" +msgstr "" + +#: index.php:92 +msgid "Roster filtrering" +msgstr "" + +#: index.php:93 +msgid "GPG and spell checking support for windows" +msgstr "" + #: screenshots.php:11 msgid "Here are some screenshots of Gajim:" msgstr "Ето и някои снимки на Gajim:" #, fuzzy +#~ msgid " The Debian package of %s is " +#~ msgstr " Архивиран изходен код на версията на Gajim има " + +#, fuzzy #~ msgid " A %s version is in test" #~ msgstr " Последната версия на Gajim е" @@ -894,10 +906,6 @@ #~ msgstr "Инсталатор за „Уиндоус“" #, fuzzy -#~ msgid "Fix translation issue" -#~ msgstr "Нов превод: сръбски" - -#, fuzzy #~ msgid "Add japanese translation" #~ msgstr "Нов превод: сръбски" diff -r 265abbe71a64 -r 88317e1d79ef locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Tue Aug 28 15:06:29 2012 +0200 +++ b/locale/de_DE/LC_MESSAGES/msg.po Wed Aug 29 10:02:26 2012 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-16 13:15+0200\n" +"POT-Creation-Date: 2012-08-29 09:56+0200\n" "PO-Revision-Date: 2008-12-22 22:59+0100\n" "Last-Translator: \n" "Language-Team: German <kde-i18n-de(a)lists.kde.org>\n" @@ -179,8 +179,8 @@ msgid " List archives are available " msgstr " Die Nachrichtenarchive finden Sie " -#: dev.php:20 docs.php:39 docs.php:45 downloads.php:24 downloads.php:38 -#: downloads.php:162 downloads.php:174 downloads.php:212 downloads.php:232 +#: dev.php:20 docs.php:39 docs.php:45 downloads.php:38 downloads.php:162 +#: downloads.php:174 downloads.php:212 downloads.php:232 msgid "here" msgstr "hier" @@ -373,11 +373,6 @@ " Wenn Sie Debian unstable benutzen, können Sie folgenden befehl " "verwenden, um Gajim zu installieren:" -#: downloads.php:23 -#, fuzzy, c-format -msgid " The Debian package of %s is " -msgstr " Die Tarball-Version von Gajim gibt es " - #: downloads.php:25 #, fuzzy msgid "" @@ -773,11 +768,11 @@ #: index.php:40 #, fuzzy msgid "" -"Gajim is available in 25 languages: Basque, Belarusian, Brasilian, British, " +"Gajim is available in 29 languages: Basque, Belarusian, Brasilian, British, " "Bulgarian, Chinese (simplified), Croatian, Czech, Danish, English, " -"Esperanto, French, Galician, German, Italian, Japanese, Lithuanian, " -"Norwegian (Bokmål), Polish, Russian, Serbian, Spanish, Slovak, Swedish and " -"Ukrainian" +"Esperanto, French, Galician, German, Hebrew, Hungarian, Italian, Japanese, " +"Kazakh, Lithuanian, Norwegian (Bokmål), Polish, Russian, Serbian, Spanish, " +"Slovak, Swedish, Turkish and Ukrainian" msgstr "" "Gajim ist in 24 Sprachen verfügbar: Baskisch, Brasilianisch, britisches "

1 0

gajim: release is for today
by Yann Leboulanger 29 Aug '12

29 Aug '12

changeset 1db355e55e5a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1db355e55e5a description: release is for today diffstat: ChangeLog | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r e212c1805e1a -r 1db355e55e5a ChangeLog --- a/ChangeLog Wed Aug 29 09:51:13 2012 +0200 +++ b/ChangeLog Wed Aug 29 09:52:17 2012 +0200 @@ -1,4 +1,4 @@ -Gajim 0.15.1 () +Gajim 0.15.1 (29 August 2012) * Switch from python-farsight to python-farstream * improve performences diff -r e212c1805e1a -r 1db355e55e5a debian/changelog --- a/debian/changelog Wed Aug 29 09:51:13 2012 +0200 +++ b/debian/changelog Wed Aug 29 09:52:17 2012 +0200 @@ -6,7 +6,7 @@ * Fix shortcut behaviour in roster window. Closes: #667870 * Improve GPG status handling. Closes: #670243 - -- Yann Leboulanger <asterix(a)lagaule.org> Tue, 28 Aug 2012 11:42:26 +0200 + -- Yann Leboulanger <asterix(a)lagaule.org> Tue, 29 Aug 2012 09:51:52 +0200 gajim (0.15-1) unstable; urgency=low

1 0

gajim: add missing translations
by Yann Leboulanger 29 Aug '12

29 Aug '12

changeset e212c1805e1a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e212c1805e1a description: add missing translations diffstat: po/LINGUAS | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (9 lines): diff -r 62f14435ff6e -r e212c1805e1a po/LINGUAS --- a/po/LINGUAS Tue Aug 28 14:11:58 2012 +0200 +++ b/po/LINGUAS Wed Aug 29 09:51:13 2012 +0200 @@ -33,3 +33,5 @@ kk he zh_TW +hu +tr

1 0

gajim: dont connect to local host if ip is the same or if is loo...
by Jefry Lagrange 28 Aug '12

28 Aug '12

changeset 3a718170c531 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3a718170c531 description: dont connect to local host if ip is the same or if is loopback diffstat: src/common/jingle_transport.py | 3 ++- src/common/socks5.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diffs (40 lines): diff -r aa7ec6ee7ff4 -r 3a718170c531 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Tue Aug 28 19:10:13 2012 +0200 +++ b/src/common/jingle_transport.py Tue Aug 28 15:10:19 2012 -0400 @@ -177,7 +177,8 @@ return local_ip_cand = [] port = int(gajim.config.get('file_transfers_port')) - type_preference = 126 #type preference of connection type. XEP-0260 section 2.2 + #type preference of connection type. XEP-0260 section 2.2 + type_preference = 126 c = {'host': self.connection.peerhost[0]} c['candidate_id'] = self.connection.connection.getAnID() c['port'] = port diff -r aa7ec6ee7ff4 -r 3a718170c531 src/common/socks5.py --- a/src/common/socks5.py Tue Aug 28 19:10:13 2012 +0200 +++ b/src/common/socks5.py Tue Aug 28 15:10:19 2012 -0400 @@ -34,6 +34,7 @@ from errno import EAFNOSUPPORT from xmpp.idlequeue import IdleObject from file_props import FilesProp +from common import gajim import jingle_xtls if jingle_xtls.PYOPENSSL_PRESENT: import OpenSSL @@ -116,10 +117,15 @@ self.on_failure[sid] = on_failure file_props = FilesProp.getFileProp(account, sid) file_props.failure_cb = on_failure + con = gajim.connections[account] if not file_props.streamhosts: on_failure(file_props.sid) # add streamhosts to the queue for streamhost in file_props.streamhosts: + if streamhost['host'] == '127.0.0.1' or \ + streamhost['host'] == '::1' or \ + streamhost['host'] == con.peerhost[0]: + continue if 'type' in streamhost and streamhost['type'] == 'proxy': fp = None else:

1 0

gajim: fixsending through a proxy
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset aa7ec6ee7ff4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aa7ec6ee7ff4 description: fixsending through a proxy diffstat: src/common/protocol/bytestream.py | 19 +++++++++++------ src/common/socks5.py | 42 ++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 29 deletions(-) diffs (99 lines): diff -r 79eb12e6534a -r aa7ec6ee7ff4 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Aug 28 15:46:52 2012 +0200 +++ b/src/common/protocol/bytestream.py Tue Aug 28 19:10:13 2012 +0200 @@ -41,7 +41,7 @@ from common import ged from common import jingle_xtls from common.file_props import FilesProp -from common.socks5 import Socks5ReceiverClient +from common.socks5 import Socks5SenderClient import logging log = logging.getLogger('gajim.c.p.bytestream') @@ -581,8 +581,8 @@ """ if not self.connection or self.connected < 2: return - file_props = FilesProp.getFileProp(self.connection, proxy['sid']) - iq = xmpp.Iq(to=proxy['initiator'], typ='set') + file_props = FilesProp.getFileProp(self.name, proxy['sid']) + iq = xmpp.Iq(to=proxy['initiator'], typ='set') auth_id = "au_" + proxy['sid'] iq.setID(auth_id) query = iq.setTag('query', namespace=xmpp.NS_BYTESTREAM) @@ -721,10 +721,15 @@ file_props.streamhost_used = True file_props.streamhosts.append(proxy) file_props.is_a_proxy = True - receiver = Socks5ReceiverClient(gajim.idlequeue, proxy, - file_props.sid, file_props) - proxy['idx'] = receiver.queue_idx - gajim.socks5queue.on_success = self._proxy_auth_ok + idx = gajim.socks5queue.idx + sender = Socks5SenderClient(gajim.idlequeue, idx, + gajim.socks5queue, _sock=None, host=str(proxy['host']), + port=int(proxy['port']), fingerprint=None, + connected=False, file_props=file_props) + sender.streamhost = proxy + gajim.socks5queue.add_sockobj(self.name, sender, 'sender') + proxy['idx'] = sender.queue_idx + gajim.socks5queue.on_success[file_props.sid] = self._proxy_auth_ok raise xmpp.NodeProcessed else: diff -r 79eb12e6534a -r aa7ec6ee7ff4 src/common/socks5.py --- a/src/common/socks5.py Tue Aug 28 15:46:52 2012 +0200 +++ b/src/common/socks5.py Tue Aug 28 19:10:13 2012 +0200 @@ -263,32 +263,30 @@ props[0](props[1], idx) def activate_proxy(self, idx): - if not self.isHashInSockObjs(self.readers, idx): + if not self.isHashInSockObjs(self.senders, idx): return - for key in self.readers.keys(): + for key in self.senders.keys(): if idx in key: - reader = self.readers[key] - if reader.file_props.type_ != 's': + sender = self.senders[key] + if sender.file_props.type_ != 's': return - if reader.state != 5: - return - reader.state = 6 - if reader.connected: - reader.file_props.error = 0 - reader.file_props.disconnect_cb = reader.disconnect - reader.file_props.started = True - reader.file_props.completed = False - reader.file_props.paused = False - reader.file_props.stalled = False - reader.file_props.elapsed_time = 0 - reader.file_props.last_time = self.idlequeue.current_time() - reader.file_props.received_len = 0 - reader.pauses = 0 + sender.state = 6 + if sender.connected: + sender.file_props.error = 0 + sender.file_props.disconnect_cb = sender.disconnect + sender.file_props.started = True + sender.file_props.completed = False + sender.file_props.paused = False + sender.file_props.stalled = False + sender.file_props.elapsed_time = 0 + sender.file_props.last_time = self.idlequeue.current_time() + sender.file_props.received_len = 0 + sender.pauses = 0 # start sending file to proxy - self.idlequeue.set_read_timeout(reader.fd, STALLED_TIMEOUT) - self.idlequeue.plug_idle(reader, True, False) - result = reader.write_next() - self.process_result(result, reader) + self.idlequeue.set_read_timeout(sender.fd, STALLED_TIMEOUT) + self.idlequeue.plug_idle(sender, True, False) + result = sender.write_next() + self.process_result(result, sender) def send_file(self, file_props, account, mode): for key in self.senders.keys():

1 0

gajim: fix attribute name
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 79eb12e6534a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=79eb12e6534a description: fix attribute name diffstat: src/common/file_props.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 484318a0df19 -r 79eb12e6534a src/common/file_props.py --- a/src/common/file_props.py Tue Aug 28 12:23:36 2012 +0200 +++ b/src/common/file_props.py Tue Aug 28 15:46:52 2012 +0200 @@ -116,7 +116,7 @@ # full file path self.file_name = None self.name = None - self.file_desc = None + self.desc = None self.offset = None self.sender = None self.receiver = None

1 0

gajim-website: fix RTL
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 265abbe71a64 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=265abbe71a64 description: fix RTL diffstat: css/main-rtl.css | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 171df4207619 -r 265abbe71a64 css/main-rtl.css --- a/css/main-rtl.css Fri Aug 17 17:04:36 2012 +0200 +++ b/css/main-rtl.css Tue Aug 28 15:06:29 2012 +0200 @@ -1,3 +1,8 @@ +.main { + text-align:right; + margin: 50px; +} + #image_index { float: left; }

1 0

gajim: include needed modules for OTR plugin to work
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 62f14435ff6e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=62f14435ff6e description: include needed modules for OTR plugin to work diffstat: gajim.nsi | 2 -- setup_win32.py | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diffs (32 lines): diff -r 89318b51ee3d -r 62f14435ff6e gajim.nsi --- a/gajim.nsi Tue Aug 28 13:15:53 2012 +0200 +++ b/gajim.nsi Tue Aug 28 14:11:58 2012 +0200 @@ -159,7 +159,6 @@ File "bin\Crypto.Hash.SHA256.pyd" File "bin\Crypto.Random.OSRNG.winrandom.pyd" File "bin\Crypto.Util._counter.pyd" - File "bin\Crypto.Util.strxor.pyd" File "bin\gajim.exe" File "bin\gio._gio.pyd" File "bin\glib._glib.pyd" @@ -533,7 +532,6 @@ Delete "$INSTDIR\bin\Crypto.Hash.SHA256.pyd" Delete "$INSTDIR\bin\Crypto.Random.OSRNG.winrandom.pyd" Delete "$INSTDIR\bin\Crypto.Util._counter.pyd" - Delete "$INSTDIR\bin\Crypto.Util.strxor.pyd" Delete "$INSTDIR\bin\gajim.exe" Delete "$INSTDIR\bin\gio._gio.pyd" Delete "$INSTDIR\bin\glib._glib.pyd" diff -r 89318b51ee3d -r 62f14435ff6e setup_win32.py --- a/setup_win32.py Tue Aug 28 13:15:53 2012 +0200 +++ b/setup_win32.py Tue Aug 28 14:11:58 2012 +0200 @@ -32,7 +32,8 @@ options = { 'build_exe': { 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', - 'goocanvas'], + 'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC', + 'numbers'], 'base': 'Win32GUI', 'bin_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',

1 0

gajim: potr is no more needed, it is in the OTR plugin itself
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 89318b51ee3d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=89318b51ee3d description: potr is no more needed, it is in the OTR plugin itself diffstat: setup_win32.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 69d16aa63b24 -r 89318b51ee3d setup_win32.py --- a/setup_win32.py Tue Aug 28 13:11:09 2012 +0200 +++ b/setup_win32.py Tue Aug 28 13:15:53 2012 +0200 @@ -31,7 +31,7 @@ options = { 'build_exe': { - 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', 'potr', + 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', 'goocanvas'], 'base': 'Win32GUI', 'bin_excludes': [

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2012