Commits

commits@gajim.org

17632 discussions

gajim: prevent some tracebacks
by Gajim 10 Jul '14

10 Jul '14

changeset 68a19c1bbb22 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=68a19c1bbb22 description: prevent some tracebacks diffstat: src/common/connection.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (30 lines): diff -r 129d3cce62cb -r 68a19c1bbb22 src/common/connection.py --- a/src/common/connection.py Wed Jul 02 18:13:01 2014 +0200 +++ b/src/common/connection.py Thu Jul 10 20:30:20 2014 +0200 @@ -2874,6 +2874,8 @@ """ Send invitation """ + if not gajim.account_is_connected(self.name): + return contact = gajim.contacts.get_contact_from_full_jid(self.name, to) if contact and contact.supports(nbxmpp.NS_CONFERENCE): # send direct invite @@ -2900,6 +2902,8 @@ """ decline a groupchat invitation """ + if not gajim.account_is_connected(self.name): + return message=nbxmpp.Message(to=room) c = message.addChild(name='x', namespace=nbxmpp.NS_MUC_USER) c = c.addChild(name='decline', attrs={'to': to}) @@ -2911,6 +2915,8 @@ """ Request voice in a moderated room """ + if not gajim.account_is_connected(self.name): + return message = nbxmpp.Message(to=room) x = nbxmpp.DataForm(typ='submit')

1 0

gajim-website: announce 0.16-rc2
by Gajim Website 02 Jul '14

02 Jul '14

changeset e51cf683a910 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=e51cf683a910 description: announce 0.16-rc2 diffstat: downloads.php | 14 ++-- index.php | 74 ++++++++++++++++++------------ locale/ar_AE/LC_MESSAGES/msg.po | 92 +++++++++++++++++++++----------------- locale/bg_BG/LC_MESSAGES/msg.po | 94 +++++++++++++++++++++----------------- locale/de_DE/LC_MESSAGES/msg.po | 98 +++++++++++++++++++++------------------- locale/eo/LC_MESSAGES/msg.po | 94 +++++++++++++++++++++----------------- locale/es_ES/LC_MESSAGES/msg.po | 98 +++++++++++++++++++++------------------- locale/fr_FR/LC_MESSAGES/msg.po | 96 +++++++++++++++++++++------------------ locale/he_IL/LC_MESSAGES/msg.po | 94 +++++++++++++++++++++----------------- locale/hu_HU/LC_MESSAGES/msg.po | 97 +++++++++++++++++++++------------------ locale/it_IT/LC_MESSAGES/msg.po | 94 +++++++++++++++++++++----------------- locale/pl_PL/LC_MESSAGES/msg.po | 98 +++++++++++++++++++++------------------- locale/pt_BR/LC_MESSAGES/msg.po | 98 +++++++++++++++++++++------------------- locale/ru_RU/LC_MESSAGES/msg.po | 98 +++++++++++++++++++++------------------- msg.pot | 93 +++++++++++++++++++++----------------- 15 files changed, 724 insertions(+), 608 deletions(-) diffs (truncated from 3348 to 300 lines): diff -r 6f7a39b665e3 -r e51cf683a910 downloads.php --- a/downloads.php Mon Jun 02 17:21:00 2014 +0200 +++ b/downloads.php Wed Jul 02 23:26:53 2014 +0200 @@ -8,7 +8,7 @@ $last_version = "0.15.4"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; -printf(_(" A %s version is in test"), "0.16-rc1"); +printf(_(" A %s version is in test"), "0.16-rc2"); print (" \n"); print _("If your distribution doesn't have the latest version "); print _("you are advised to use the ")."<a href=\"#autopackage\">autopackage</a> "._("or the ")."<a href=\"#tarball\">"._("source tarball")."</a>\n"; @@ -20,8 +20,8 @@ print ("</a>\n"); print _(" If you use Debian unstable do")." apt-get install gajim\n"; print (" \n"); -printf(_(" The Debian package of %s is "), "0.16-rc1"); -print "<a href=\"ftp://ftp.gajim.org/debian/dists/unstable/main/binary-all/gajim_0.16~rc1-1_…">"._("here")."</a>. \n"; +printf(_(" The Debian package of %s is "), "0.16-rc2"); +print "<a href=\"ftp://ftp.gajim.org/debian/dists/unstable/main/binary-all/gajim_0.16~rc2-1_…">"._("here")."</a>. \n"; print _(" A daily package from mercurial is also built. To use it, remove gajim")." (apt-get remove gajim), "._("add this line to your")." /etc/apt/sources.list:\n"; print (" \n"); print (" deb ftp://ftp.gajim.org/debian unstable main\n"); @@ -147,8 +147,8 @@ print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-3.exe\">"._("Gajim installer")."</a>.\n"; #print _("The installer doesn't contain translations because of a") . " <a href=\"https://bugzilla.gnome.org/show_bug.cgi?id=574520\">" . _("GTK bug") . "</a>.\n"; print (" \n"); -print _(" Here is a")." <a href=\"downloads/0.16/gajim-0.16-rc1-1.exe\">"._("Gajim installer")."</a> "; -printf(_("for %s version "), "0.16-rc1"); +print _(" Here is a")." <a href=\"downloads/0.16/gajim-0.16-rc2-1.exe\">"._("Gajim installer")."</a> "; +printf(_("for %s version "), "0.16-rc2"); print (".\n"); print (" \n"); @@ -159,8 +159,8 @@ print (" </h2>\n"); print ("</a>\n"); print _(" The tarball version of Gajim is ")."<a href=\"downloads/".$download_folder."/gajim-".$last_version.".tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://hg.gajim.org/gajim/raw-file/tip/README.html\">"._("see the <tt>README</tt>")."</a> ("._("in English")."). \n"; -printf(_(" The tarball version of %s is "), "0.16-rc1"); -print "<a href=\"downloads/0.16/gajim-0.16-rc1.tar.gz\">"._("here")."</a>. \n"; +printf(_(" The tarball version of %s is "), "0.16-rc2"); +print "<a href=\"downloads/0.16/gajim-0.16-rc2.tar.gz\">"._("here")."</a>. \n"; print _("If you want to use the last unstable development version, then you should checkout the mercurial repository.\n"); diff -r 6f7a39b665e3 -r e51cf683a910 index.php --- a/index.php Mon Jun 02 17:21:00 2014 +0200 +++ b/index.php Wed Jul 02 23:26:53 2014 +0200 @@ -50,35 +50,38 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Release candidate 1 of Gajim %s"), "0.16"), - 1 => sprintf(_("Beta-release of Gajim %s"), "0.16"), - 2 => sprintf(_("Gajim %s is here!"), "0.15.4"), - 3 => sprintf(_("Gajim %s is here!"), "0.15.3"), - 4 => sprintf(_("Gajim %s is here!"), "0.15.2"), - 5 => sprintf(_("Gajim %s is here!"), "0.15.1"), - 6 => sprintf(_("Gajim %s is here!"), "0.15"), + 0 => sprintf(_("Release candidate 2 of Gajim %s"), "0.16"), + 1 => sprintf(_("Release candidate 1 of Gajim %s"), "0.16"), + 2 => sprintf(_("Beta-release of Gajim %s"), "0.16"), + 3 => sprintf(_("Gajim %s is here!"), "0.15.4"), + 4 => sprintf(_("Gajim %s is here!"), "0.15.3"), + 5 => sprintf(_("Gajim %s is here!"), "0.15.2"), + 6 => sprintf(_("Gajim %s is here!"), "0.15.1"), + 7 => sprintf(_("Gajim %s is here!"), "0.15"), ); // 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("15 March 2014"), - 1 => _("16 December 2013"), - 2 => _("25 May 2013"), - 3 => _("17 March 2013"), - 4 => _("30 October 2012"), - 5 => _("29 August 2012"), - 6 => _("18 March 2012"), + 0 => _("02 July 2014"), + 1 => _("15 March 2014"), + 2 => _("16 December 2013"), + 3 => _("25 May 2013"), + 4 => _("17 March 2013"), + 5 => _("30 October 2012"), + 6 => _("29 August 2012"), + 7 => _("18 March 2012"), ); $array_news_desc = array( 0 => sprintf(_("Version %s will arrive very soon."), "0.16"), - 1 => sprintf(_("Version %s will arrive soon."), "0.16"), - 2 => sprintf(_("Version %s of Gajim has been released."), "0.15.4"), - 3 => sprintf(_("Version %s of Gajim has been released."), "0.15.3"), - 4 => sprintf(_("Version %s of Gajim has been released."), "0.15.2"), - 5 => sprintf(_("Version %s of Gajim has been released."), "0.15.1"), - 6 => sprintf(_("Version %s of Gajim has been released."), "0.15"), + 1 => sprintf(_("Version %s will arrive very soon."), "0.16"), + 2 => sprintf(_("Version %s will arrive soon."), "0.16"), + 3 => sprintf(_("Version %s of Gajim has been released."), "0.15.4"), + 4 => sprintf(_("Version %s of Gajim has been released."), "0.15.3"), + 5 => sprintf(_("Version %s of Gajim has been released."), "0.15.2"), + 6 => sprintf(_("Version %s of Gajim has been released."), "0.15.1"), + 7 => 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")); @@ -87,11 +90,12 @@ $array_news_whats_new = array( 0 => sprintf(_("What's new since %s:"), "0.15.4"), 1 => sprintf(_("What's new since %s:"), "0.15.4"), - 2 => sprintf(_("What's new since %s:"), "0.15.3"), - 3 => sprintf(_("What's new since %s:"), "0.15.2"), - 4 => sprintf(_("What's new since %s:"), "0.15.1"), - 5 => sprintf(_("What's new since %s:"), "0.15"), - 6 => sprintf(_("What's new since %s:"), "0.14.4"), + 2 => sprintf(_("What's new since %s:"), "0.15.4"), + 3 => sprintf(_("What's new since %s:"), "0.15.3"), + 4 => sprintf(_("What's new since %s:"), "0.15.2"), + 5 => sprintf(_("What's new since %s:"), "0.15.1"), + 6 => sprintf(_("What's new since %s:"), "0.15"), + 7 => sprintf(_("What's new since %s:"), "0.14.4"), ); $array_news_items[0] = array( @@ -109,18 +113,28 @@ 1 => _("Improve security"), 2 => _("Improve audio / video calls"), 3 => _("Last message correction"), + 4 => _("Jingle Audio under windows"), + 5 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.16-rc1/ChangeLog\">"._("Full ChangeLog")."</a> ", + 6 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.16\">"._("List of fixed bugs")."</a>", + ); + +$array_news_items[2] = array( + 0 => _("Improve File transfer"), + 1 => _("Improve security"), + 2 => _("Improve audio / video calls"), + 3 => _("Last message correction"), 4 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.16-beta2/ChangeLog\">"._("Full ChangeLog")."</a> ", 5 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.16\">"._("List of fixed bugs")."</a>", ); -$array_news_items[2] = array( +$array_news_items[3] = array( 0 => _("Fix connection to non-SSL servers"), 1 => _("Minor other fixes"), 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.4/ChangeLog\">"._("Full ChangeLog")."</a> ", 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.4\">"._("List of fixed bugs")."</a>", ); -$array_news_items[3] = array( +$array_news_items[4] = array( 0 => _("Better handling of SSL errors"), 1 => _("Better handling of canceling file transfer"), 2 => _("Improve farstream calls"), @@ -128,20 +142,20 @@ 4 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.3\">"._("List of fixed bugs")."</a>", ); -$array_news_items[4] = array( +$array_news_items[5] = array( 0 => _("Fix crash when pressing ESC in chat window"), 1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.2/ChangeLog\">"._("Full ChangeLog")."</a> ", 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.2\">"._("List of fixed bugs")."</a>", ); -$array_news_items[5] = array( +$array_news_items[6] = 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[6] = array( +$array_news_items[7] = array( 0 => _("Plugin system"), 1 => _("Whiteboard (via a plugin)"), 2 => _("Message archiving"), diff -r 6f7a39b665e3 -r e51cf683a910 locale/ar_AE/LC_MESSAGES/msg.po --- a/locale/ar_AE/LC_MESSAGES/msg.po Mon Jun 02 17:21:00 2014 +0200 +++ b/locale/ar_AE/LC_MESSAGES/msg.po Wed Jul 02 23:26:53 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: mag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-02 17:14+0200\n" +"POT-Creation-Date: 2014-07-02 23:26+0200\n" "PO-Revision-Date: 2014-06-02 01:08+0300\n" "Last-Translator: Yann <asterix(a)asterix.lagaule.org>\n" "Language-Team: Arabic <karrar.kazuya(a)gmail.com>\n" @@ -754,161 +754,171 @@ msgstr "الاخبار" #: index.php:53 +#, fuzzy, c-format +msgid "Release candidate 2 of Gajim %s" +msgstr "مرشح للاصدار 1 من كاجيم %s" + +#: index.php:54 #, c-format msgid "Release candidate 1 of Gajim %s" msgstr "مرشح للاصدار 1 من كاجيم %s" -#: index.php:54 +#: index.php:55 #, c-format msgid "Beta-release of Gajim %s" msgstr "نسخة البيتا الخاصة ب كاجيم %s" -#: index.php:55 index.php:56 index.php:57 index.php:58 index.php:59 +#: index.php:56 index.php:57 index.php:58 index.php:59 index.php:60 #, c-format msgid "Gajim %s is here!" msgstr "كاجيم %s هنا!" -#: index.php:65 +#: index.php:66 +#, fuzzy +msgid "02 July 2014" +msgstr "25 ماي 2013" + +#: index.php:67 msgid "15 March 2014" msgstr "15 مارس 2014" -#: index.php:66 +#: index.php:68 msgid "16 December 2013" msgstr "16 ديسمبر 2013" -#: index.php:67 +#: index.php:69 msgid "25 May 2013" msgstr "25 ماي 2013" -#: index.php:68 +#: index.php:70 msgid "17 March 2013" msgstr "17 مارس 2013" -#: index.php:69 +#: index.php:71 msgid "30 October 2012" msgstr "30 اوكتوبر 2012" -#: index.php:70 +#: index.php:72 msgid "29 August 2012" msgstr "29 اوغست 2012" -#: index.php:71 +#: index.php:73 msgid "18 March 2012" msgstr "18 مارس 2012" -#: index.php:75 +#: index.php:77 index.php:78 #, c-format msgid "Version %s will arrive very soon." msgstr "النسخة %s سوف يتم اصدارها قريبا ً جداً.." -#: index.php:76 +#: index.php:79 #, c-format msgid "Version %s will arrive soon." msgstr "النسخة %s سوف يتم اصدارها قريباً.." -#: index.php:77 index.php:78 index.php:79 index.php:80 index.php:81 +#: index.php:80 index.php:81 index.php:82 index.php:83 index.php:84 #, c-format msgid "Version %s of Gajim has been released." msgstr "النسخة %s من كاجيم تم اصدارها." -#: index.php:88 index.php:89 index.php:90 index.php:91 index.php:92 -#: index.php:93 index.php:94 +#: index.php:91 index.php:92 index.php:93 index.php:94 index.php:95 +#: index.php:96 index.php:97 index.php:98 #, c-format msgid "What's new since %s:" msgstr "الجديد منذ %s:" -#: index.php:98 index.php:108 +#: index.php:102 index.php:112 index.php:122 msgid "Improve File transfer" msgstr "تطوير ارسال ملفات" -#: index.php:99 index.php:109 +#: index.php:103 index.php:113 index.php:123 msgid "Improve security" msgstr "تطوير الامن" -#: index.php:100 index.php:110 +#: index.php:104 index.php:114 index.php:124 msgid "Improve audio / video calls" msgstr "تطوير الاتصال الصوتي و المرئي" -#: index.php:101 index.php:111 +#: index.php:105 index.php:115 index.php:125

1 0

gajim: prepare 0.16-rc2
by Gajim 02 Jul '14

02 Jul '14

changeset 129d3cce62cb in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=129d3cce62cb description: prepare 0.16-rc2 diffstat: ChangeLog | 1 + autogen.sh | 2 +- debian/changelog | 6 ++++++ src/common/defs.py | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diffs (46 lines): diff -r 52ef57ce5880 -r 129d3cce62cb ChangeLog --- a/ChangeLog Wed Jul 02 18:03:40 2014 +0200 +++ b/ChangeLog Wed Jul 02 18:13:01 2014 +0200 @@ -11,6 +11,7 @@ * Support XEP-0191 Blocking command * Support XEP-0249 Direct Invitation * Better RTL languages support + * use host command to resolve SRV records if it is available Gajim 0.15.4 (25 May 2013) diff -r 52ef57ce5880 -r 129d3cce62cb autogen.sh --- a/autogen.sh Wed Jul 02 18:03:40 2014 +0200 +++ b/autogen.sh Wed Jul 02 18:13:01 2014 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16-rc1" + gajimversion="0.16-rc2" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 52ef57ce5880 -r 129d3cce62cb debian/changelog --- a/debian/changelog Wed Jul 02 18:03:40 2014 +0200 +++ b/debian/changelog Wed Jul 02 18:13:01 2014 +0200 @@ -1,3 +1,9 @@ +gajim (0.16~rc2-1) unstable; urgency=low + + * New upstream release + + -- Yann Leboulanger <yann(a)leboulanger.org> Wed, 02 Jul 2014 18:09:41 +0200 + gajim (0.16~rc1-1) unstable; urgency=low * New upstream release diff -r 52ef57ce5880 -r 129d3cce62cb src/common/defs.py --- a/src/common/defs.py Wed Jul 02 18:03:40 2014 +0200 +++ b/src/common/defs.py Wed Jul 02 18:13:01 2014 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16-rc1' +version = '0.16-rc2' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: require latest nbxmpp version
by Gajim 02 Jul '14

02 Jul '14

changeset 52ef57ce5880 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=52ef57ce5880 description: require latest nbxmpp version diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f38e5fd4f8e3 -r 52ef57ce5880 src/gajim.py --- a/src/gajim.py Sat Jun 28 13:22:54 2014 +0200 +++ b/src/gajim.py Wed Jul 02 18:03:40 2014 +0200 @@ -69,7 +69,7 @@ pass HAS_NBXMPP=True -MIN_NBXMPP_VER = "0.3.3" +MIN_NBXMPP_VER = "0.5" try: import nbxmpp except ImportError:

1 0

python-nbxmpp: Added tag nbxmpp-0.5 for changeset 70c9ac0c2b9b
by Python-nbxmpp 02 Jul '14

02 Jul '14

changeset 51736d2c5fd2 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=51736d2c5fd2 description: Added tag nbxmpp-0.5 for changeset 70c9ac0c2b9b diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 70c9ac0c2b9b -r 51736d2c5fd2 .hgtags --- a/.hgtags Wed Jul 02 18:04:01 2014 +0200 +++ b/.hgtags Wed Jul 02 18:04:10 2014 +0200 @@ -2,3 +2,4 @@ 7d34c8148cee4c6e5e2fceca6cd8f9ea1bc82de4 nbxmpp-0.2 3bf3d313e8693a273fe1a44723606ff5c6a3aba1 nbxmpp-0.3 46e9c8c80bacac8260245d5d9752ba0c5bddcf89 nbxmpp-0.4 +70c9ac0c2b9bd3786df85d921c7f0a54fa6c92b4 nbxmpp-0.5

1 0

python-nbxmpp: fix setup script for 0.5 release
by Python-nbxmpp 02 Jul '14

02 Jul '14

changeset 70c9ac0c2b9b in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=70c9ac0c2b9b description: fix setup script for 0.5 release diffstat: setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 75035b0272cf -r 70c9ac0c2b9b setup.py --- a/setup.py Wed Jul 02 17:49:07 2014 +0200 +++ b/setup.py Wed Jul 02 18:04:01 2014 +0200 @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.4', + version='0.5', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org',

1 0

python-nbxmpp: prepare 0.5 release
by Python-nbxmpp 02 Jul '14

02 Jul '14

changeset 75035b0272cf in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=75035b0272cf description: prepare 0.5 release diffstat: ChangeLog | 5 +++++ nbxmpp/__init__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (21 lines): diff -r 357755b75a6b -r 75035b0272cf ChangeLog --- a/ChangeLog Sun Jun 29 17:35:05 2014 +0200 +++ b/ChangeLog Wed Jul 02 17:49:07 2014 +0200 @@ -1,3 +1,8 @@ +python-nbxmpp 0.5 (02 July 2014) + + * support both python2 and python3 + * Fix storing server certificate when there is no error + python-nbxmpp 0.4 (15 March 2014) * Ability to configure TLS protocol version diff -r 357755b75a6b -r 75035b0272cf nbxmpp/__init__.py --- a/nbxmpp/__init__.py Sun Jun 29 17:35:05 2014 +0200 +++ b/nbxmpp/__init__.py Wed Jul 02 17:49:07 2014 +0200 @@ -17,4 +17,4 @@ from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.3.3" +__version__ = "0.5"

1 0

python-nbxmpp: fix some type comparion error due to py2 and py3 ...
by Python-nbxmpp 29 Jun '14

29 Jun '14

changeset 357755b75a6b in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=357755b75a6b description: fix some type comparion error due to py2 and py3 support diffstat: nbxmpp/auth_nb.py | 5 ++--- nbxmpp/protocol.py | 18 +++++++++--------- nbxmpp/simplexml.py | 5 +++-- 3 files changed, 14 insertions(+), 14 deletions(-) diffs (82 lines): diff -r d1b4a9aedbc9 -r 357755b75a6b nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Sun Jun 29 17:33:32 2014 +0200 +++ b/nbxmpp/auth_nb.py Sun Jun 29 17:35:05 2014 +0200 @@ -452,9 +452,8 @@ chal = _challenge_splitter(data) if not self.realm and 'realm' in chal: self.realm = chal['realm'] - if 'qop' in chal and ((isinstance(chal['qop'], str) and \ - chal['qop'] =='auth') or (isinstance(chal['qop'], list) and 'auth' in \ - chal['qop'])): + if 'qop' in chal and ((chal['qop'] =='auth') or \ + (isinstance(chal['qop'], list) and 'auth' in chal['qop'])): self.resp = {} self.resp['username'] = self.username if self.realm: diff -r d1b4a9aedbc9 -r 357755b75a6b nbxmpp/protocol.py --- a/nbxmpp/protocol.py Sun Jun 29 17:33:32 2014 +0200 +++ b/nbxmpp/protocol.py Sun Jun 29 17:35:05 2014 +0200 @@ -1555,11 +1555,11 @@ """ Add one more label-option pair to this field """ - if isinstance(opt, str): - self.addChild('option').setTagData('value', opt) - else: + if isinstance(opt, list): self.addChild('option', {'label': opt[0]}).setTagData('value', opt[1]) + else: + self.addChild('option').setTagData('value', opt) def getType(self): """ @@ -1626,12 +1626,12 @@ newdata.append(DataField(name, data[name])) data = newdata for child in data: - if isinstance(child, str): + if child.__class__.__name__ == 'DataField': + self.kids.append(child) + elif isinstance(child, Node): + self.kids.append(DataField(node=child)) + else: # Must be a string self.addInstructions(child) - elif child.__class__.__name__ == 'DataField': - self.kids.append(child) - else: - self.kids.append(DataField(node=child)) def getType(self): """ @@ -1700,7 +1700,7 @@ for field in self.getTags('field'): name = field.getAttr('var') typ = field.getType() - if isinstance(typ, str) and typ.endswith('-multi'): + if typ and typ.endswith('-multi'): val = [] for i in field.getTags('value'): val.append(i.getData()) diff -r d1b4a9aedbc9 -r 357755b75a6b nbxmpp/simplexml.py --- a/nbxmpp/simplexml.py Sun Jun 29 17:33:32 2014 +0200 +++ b/nbxmpp/simplexml.py Sun Jun 29 17:35:05 2014 +0200 @@ -144,7 +144,8 @@ self.namespace, self.name = tag.split() else: self.name = tag - if isinstance(payload, str): payload=[payload] + if not isinstance(payload, list): + payload = [payload] for i in payload: if isinstance(i, Node): self.addChild(node=i) @@ -404,7 +405,7 @@ replaces all node's previous content. If you wish just to add child or CDATA - use addData or addChild methods """ - if isinstance(payload, str): + if not isinstance(payload, list): payload = [payload] if add: self.kids += payload

1 0

python-nbxmpp: Added tag nbxmpp-0.4 for changeset 46e9c8c80bac
by Python-nbxmpp 29 Jun '14

29 Jun '14

changeset d1b4a9aedbc9 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=d1b4a9aedbc9 description: Added tag nbxmpp-0.4 for changeset 46e9c8c80bac diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 482579a7fdc3 -r d1b4a9aedbc9 .hgtags --- a/.hgtags Wed Apr 09 18:17:56 2014 +0200 +++ b/.hgtags Sun Jun 29 17:33:32 2014 +0200 @@ -1,3 +1,4 @@ 5d8f5ba88c86ade8294db98db847b2f0a1acbccd nbxmpp-0.1 7d34c8148cee4c6e5e2fceca6cd8f9ea1bc82de4 nbxmpp-0.2 3bf3d313e8693a273fe1a44723606ff5c6a3aba1 nbxmpp-0.3 +46e9c8c80bacac8260245d5d9752ba0c5bddcf89 nbxmpp-0.4

1 0

gajim: updated hebrew translation
by Gajim 28 Jun '14

28 Jun '14

changeset f38e5fd4f8e3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f38e5fd4f8e3 description: updated hebrew translation diffstat: po/he.po | 1273 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 639 insertions(+), 634 deletions(-) diffs (truncated from 2731 to 300 lines): diff -r 24da96c20089 -r f38e5fd4f8e3 po/he.po --- a/po/he.po Sat Jun 21 10:41:13 2014 +0200 +++ b/po/he.po Sat Jun 28 13:22:54 2014 +0200 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-09 07:58+0300\n" -"PO-Revision-Date: 2014-06-19 07:35+0200\n" +"POT-Creation-Date: 2014-06-28 13:21+0200\n" +"PO-Revision-Date: 2014-06-21 16:23+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -190,8 +190,8 @@ #: ../src/config.py:1753 ../src/config.py:2348 ../src/config.py:2430 #: ../src/config.py:2445 ../src/config.py:3740 ../src/config.py:3815 #: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 -#: ../src/dialogs.py:537 ../src/roster_window.py:3158 -#: ../src/roster_window.py:3164 ../src/roster_window.py:3169 +#: ../src/dialogs.py:537 ../src/roster_window.py:3161 +#: ../src/roster_window.py:3167 ../src/roster_window.py:3172 msgid "None" msgstr "ללא" @@ -378,8 +378,8 @@ #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 #: ../src/common/contacts.py:135 ../src/dialogs.py:116 ../src/dialogs.py:128 -#: ../src/roster_window.py:3100 ../src/roster_window.py:4226 -#: ../src/roster_window.py:5871 +#: ../src/roster_window.py:3103 ../src/roster_window.py:4229 +#: ../src/roster_window.py:5874 msgid "General" msgstr "כללית" @@ -777,7 +777,7 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 #: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:674 -#: ../src/roster_window.py:5840 ../src/roster_window.py:5974 +#: ../src/roster_window.py:5843 ../src/roster_window.py:5977 msgid "_Unblock" msgstr "_בטל חסימה" @@ -982,8 +982,8 @@ #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 -#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5770 -#: ../src/roster_window.py:5941 +#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5773 +#: ../src/roster_window.py:5944 msgid "In_vite to" msgstr "ה_זמן אל" @@ -1002,7 +1002,7 @@ #. Send Custom Status #: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:598 -#: ../src/roster_window.py:5781 +#: ../src/roster_window.py:5784 msgid "Send Cus_tom Status" msgstr "שלח מצב חיבור מו_תאם" @@ -1017,12 +1017,12 @@ #. Rename #: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:661 -#: ../src/roster_window.py:5821 +#: ../src/roster_window.py:5824 msgid "_Rename..." msgstr "_שינוי שם..." #. Edit Groups -#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5963 +#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5966 msgid "Edit _Groups..." msgstr "עריכת _קבוצות..." @@ -1056,7 +1056,7 @@ #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:677 -#: ../src/roster_window.py:5848 ../src/roster_window.py:5980 +#: ../src/roster_window.py:5851 ../src/roster_window.py:5983 msgid "_Block" msgstr "_חסום" @@ -1071,14 +1071,14 @@ #. Remove #. Remove group #: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:687 -#: ../src/roster_window.py:5858 +#: ../src/roster_window.py:5861 msgid "Remo_ve" msgstr "הס_ר" #: ../data/gui/contact_context_menu.ui.h:26 #: ../data/gui/gc_control_popup_menu.ui.h:9 #: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19 -#: ../src/roster_window.py:6056 +#: ../src/roster_window.py:6059 msgid "_History" msgstr "_היסטוריה" @@ -1175,6 +1175,15 @@ msgid "Hides the window" msgstr "הסתרת חלון" +#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905 +msgid "_Continue" +msgstr "ה_משך" + +#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3386 +#: ../src/filetransfers_window.py:213 +msgid "_Open Containing Folder" +msgstr "_פתח תיקיה מכילה" + #: ../data/gui/gajim_themes_window.ui.h:1 msgid "Account row" msgstr "שורת חשבון" @@ -1284,7 +1293,7 @@ msgid "_Request Voice" msgstr "_בקש ביטוי" -#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1850 +#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1851 msgid "_Bookmark" msgstr "_סמן" @@ -1542,7 +1551,7 @@ msgstr "_עיון ברשימת חדרים" #: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3421 -#: ../src/disco.py:1412 ../src/disco.py:1854 +#: ../src/disco.py:1413 ../src/disco.py:1855 msgid "_Join" msgstr "_כנס" @@ -2368,6 +2377,10 @@ msgid "Advanced" msgstr "מתקדם" +#: ../data/gui/privacy_lists_window.ui.h:1 +msgid "Privacy Lists:" +msgstr "רשימות פרטיות:" + #: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4131 msgid "Privacy List" msgstr "רשימת פרטיות" @@ -2458,10 +2471,6 @@ msgid "to" msgstr "אל" -#: ../data/gui/privacy_lists_window.ui.h:1 -msgid "Privacy Lists:" -msgstr "רשימות פרטיות:" - #. Family Name #: ../data/gui/profile_window.ui.h:3 #: ../data/gui/vcard_information_window.ui.h:17 @@ -2625,7 +2634,7 @@ msgstr "מה ברצונך לעשות?" #. Remove -#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5990 +#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5993 msgid "_Remove" msgstr "הס_ר" @@ -2660,7 +2669,7 @@ msgid "Add _Contact..." msgstr "הוספת _איש קשר..." -#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1565 +#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1566 msgid "_Edit" msgstr "ע_ריכה" @@ -2747,7 +2756,7 @@ msgid "_Information" msgstr "_מידע" -#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1421 +#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1422 msgid "_Search" msgstr "_חפש" @@ -3145,7 +3154,7 @@ #: ../src/gui_menu_builder.py:318 ../src/gui_menu_builder.py:489 #: ../src/roster_window.py:771 ../src/roster_window.py:1735 #: ../src/roster_window.py:1737 ../src/roster_window.py:2086 -#: ../src/roster_window.py:3629 ../src/roster_window.py:3656 +#: ../src/roster_window.py:3632 ../src/roster_window.py:3659 msgid "Not in Roster" msgstr "לא ברשימה" @@ -3313,11 +3322,10 @@ "lost." msgstr "אם כרטיסייה זו תיסגר וכאשר רשימת היסטוריה מנוטרלת אצלך. הודעה זו תאבד." -#: ../src/chat_control.py:3001 ../src/common/connection.py:533 -#: ../src/common/connection_handlers.py:1145 -#: ../src/common/connection_handlers.py:1270 -#: ../src/common/connection_handlers_events.py:916 -#: ../src/common/logger.py:1161 ../src/gajim.py:245 ../src/session.py:98 +#: ../src/chat_control.py:3001 ../src/common/connection_handlers_events.py:916 +#: ../src/common/connection_handlers.py:1089 +#: ../src/common/connection_handlers.py:1214 ../src/common/connection.py:541 +#: ../src/common/logger.py:1165 ../src/gajim.py:252 ../src/session.py:98 msgid "Database Error" msgstr "שגיאת מסד נתונים" @@ -3331,7 +3339,7 @@ "תאבד)." # כי משהו שיבש אותה -#: ../src/chat_control.py:3240 ../src/gui_interface.py:1164 +#: ../src/chat_control.py:3240 ../src/gui_interface.py:1170 #, python-format msgid "" "Unable to decrypt message from %s\n" @@ -3361,10 +3369,6 @@ msgid "File transfer completed" msgstr "העברת קובץ הושלמה" -#: ../src/chat_control.py:3386 ../src/filetransfers_window.py:213 -msgid "_Open Containing Folder" -msgstr "_פתח תיקיה מכילה" - #: ../src/chat_control.py:3418 ../src/dialogs.py:2935 ../src/dialogs.py:4625 #: ../src/gui_interface.py:646 ../src/notify.py:278 msgid "Groupchat Invitation" @@ -3465,7 +3469,7 @@ #: ../src/command_system/implementation/standard.py:151 #: ../src/common/commands.py:110 ../src/common/helpers.py:249 -#: ../src/tooltips.py:200 +#: ../src/tooltips.py:205 msgid "Away" msgstr "נעדר" @@ -3645,37 +3649,37 @@ msgid "Excessive arguments" msgstr "ארגומנטים מופרזים" -#: ../src/common/check_paths.py:39 +#: ../src/common/check_paths.py:38 msgid "creating logs database" msgstr "כעת יוצר רשומות מסד נתונים" -#: ../src/common/check_paths.py:87 +#: ../src/common/check_paths.py:86 msgid "creating cache database" msgstr "כעת יוצר מטמון מסד נתונים" +#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284 +#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298 +#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312 +#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:326 +#, python-format +msgid "%s is a file but it should be a directory" +msgstr "‏%s הינו קובץ אך אמור להיות מדור" + #: ../src/common/check_paths.py:278 ../src/common/check_paths.py:285 #: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299 #: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313 #: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327 -#, python-format -msgid "%s is a file but it should be a directory" -msgstr "‏%s הינו קובץ אך אמור להיות מדור" - -#: ../src/common/check_paths.py:279 ../src/common/check_paths.py:286 -#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300 -#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314 -#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328 -#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346 +#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345 #, fuzzy msgid "Gajim will now exit" msgstr "cli" -#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345 +#: ../src/common/check_paths.py:336 ../src/common/check_paths.py:344 #, python-format msgid "%s is a directory but should be a file" msgstr "‏%s הינו מדור אך אמור להיות קובץ" -#: ../src/common/check_paths.py:366 +#: ../src/common/check_paths.py:359 #, python-format msgid "creating %s directory" msgstr "כעת יוצר מדור %s" @@ -3747,7 +3751,7 @@ #: ../src/common/commands.py:216 ../src/common/contacts.py:131 #: ../src/common/helpers.py:67 ../src/roster_window.py:824 #: ../src/roster_window.py:1739 ../src/roster_window.py:1741 -#: ../src/roster_window.py:2625 ../src/roster_window.py:5736 +#: ../src/roster_window.py:2625 ../src/roster_window.py:5739

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