Commits September 2010

commits@gajim.org

5 participants
70 discussions

gajim: Added tag gajim-0.14 for changeset 605ca10afd21
by Yann Leboulanger 03 Sep '10

03 Sep '10

changeset e1edaf27dd11 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e1edaf27dd11 description: Added tag gajim-0.14 for changeset 605ca10afd21 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 605ca10afd21 -r e1edaf27dd11 .hgtags --- a/.hgtags Thu Sep 02 18:26:05 2010 +0200 +++ b/.hgtags Fri Sep 03 10:49:19 2010 +0200 @@ -3,3 +3,4 @@ 604c5de0dfe72dfa76b3014c410a50daae381cbe gajim-0.12 7752eadd1f8c31a3dc282c15d87767a7ba1bd217 gajim-0.12-alpha1 a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 +605ca10afd21958f027673d2799332e39d53a75d gajim-0.14

1 0

gajim-website: fix typo
by Yann Leboulanger 02 Sep '10

02 Sep '10

changeset 035edf75639c in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=035edf75639c description: fix typo diffstat: dev.php | 2 +- index.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r f6ec4d6ec240 -r 035edf75639c dev.php --- a/dev.php Thu Sep 02 21:34:21 2010 +0200 +++ b/dev.php Thu Sep 02 21:37:31 2010 +0200 @@ -67,7 +67,7 @@ $f2 = fopen("stats_po_0.14", 'r'); $f3 = fopen("stats_po_svn", 'r'); print ("<table class=\"translation-status\">"); -print ("<tr><th>Language</th><th colspan=\"2\">0.12.5 Version</th><th colspan=\"2\">0.13 Version</th><th colspan=\"2\">SVN version</th></tr>"); +print ("<tr><th>Language</th><th colspan=\"2\">0.13.4 Version</th><th colspan=\"2\">0.14 Version</th><th colspan=\"2\">HG version</th></tr>"); while (!feof($f_lang)) { print ("<tr>"); diff -r f6ec4d6ec240 -r 035edf75639c index.php --- a/index.php Thu Sep 02 21:34:21 2010 +0200 +++ b/index.php Thu Sep 02 21:37:31 2010 +0200 @@ -79,7 +79,7 @@ 4 => _("Use XDG standards"), 5 => _("Handle groupchat captcha"), 6 => "<a href = \"http://hg.gajim.org/gajim/file/605ca10afd21/ChangeLog\">"._("Full ChangeLog")."</a> ", - 7 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14\">"._("List of fixed bugs")."</a>"); + 7 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14\">"._("List of fixed bugs")."</a>", ); $array_news_items[1] = array(

1 0

gajim-website: prepare website for 0.14
by Yann Leboulanger 02 Sep '10

02 Sep '10

changeset f6ec4d6ec240 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=f6ec4d6ec240 description: prepare website for 0.14 diffstat: dev.php | 4 +- downloads.php | 7 +- imgs/gajim_jingle.png | 0 imgs/gajim_jingle_thumb.png | 0 index.php | 128 ++-------- locale/bg_BG/LC_MESSAGES/msg.po | 392 ++++++++++++++------------------- locale/de_DE/LC_MESSAGES/msg.po | 419 +++++++++++++++-------------------- locale/eo/LC_MESSAGES/msg.po | 398 ++++++++++++++------------------- locale/es_ES/LC_MESSAGES/msg.po | 377 +++++++++++++------------------- locale/fr_FR/LC_MESSAGES/msg.po | 467 ++++++++++++++++++++------------------- locale/it_IT/LC_MESSAGES/msg.po | 395 ++++++++++++++------------------- locale/pl_PL/LC_MESSAGES/msg.po | 414 +++++++++++++++------------------- locale/pt_BR/LC_MESSAGES/msg.po | 413 +++++++++++++++------------------- locale/ru_RU/LC_MESSAGES/msg.po | 413 ++++++++++++++++------------------- msg.pot | 314 ++++++++----------------- screenshots.php | 1 + stats_lang | 2 + stats_po_0.11.3 | 30 -- stats_po_0.12.5 | 30 -- stats_po_0.13 | 30 -- stats_po_0.13.4 | 32 ++ stats_po_0.14 | 32 ++ stats_po_svn | 62 ++-- 23 files changed, 1864 insertions(+), 2496 deletions(-) diffs (truncated from 7255 to 300 lines): diff -r fc3dd5568774 -r f6ec4d6ec240 dev.php --- a/dev.php Thu Aug 12 12:54:29 2010 +0200 +++ b/dev.php Thu Sep 02 21:34:21 2010 +0200 @@ -63,8 +63,8 @@ print (" </h1>"); $f_lang = fopen("stats_lang", 'r'); -$f1 = fopen("stats_po_0.12.5", 'r'); -$f2 = fopen("stats_po_0.13", 'r'); +$f1 = fopen("stats_po_0.13.4", 'r'); +$f2 = fopen("stats_po_0.14", 'r'); $f3 = fopen("stats_po_svn", 'r'); print ("<table class=\"translation-status\">"); print ("<tr><th>Language</th><th colspan=\"2\">0.12.5 Version</th><th colspan=\"2\">0.13 Version</th><th colspan=\"2\">SVN version</th></tr>"); diff -r fc3dd5568774 -r f6ec4d6ec240 downloads.php --- a/downloads.php Thu Aug 12 12:54:29 2010 +0200 +++ b/downloads.php Thu Sep 02 21:34:21 2010 +0200 @@ -4,8 +4,8 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); -$download_folder = "0.13"; -$last_version = "0.13.4"; +$download_folder = "0.14"; +$last_version = "0.14"; print (" <br/>\n"); print _(" Latest version of Gajim is")." <strong>".$last_version."</strong><br/>\n"; #printf(_(" A %s version is in test"), "<strong>0.13-rc5</strong>"); @@ -142,7 +142,8 @@ print _(" Windows installer\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-2.exe\">"._("Gajim installer")."</a>.\n"; +print _("Installer for 0.14 will be available as soon as possible. Currently available:")." <a href=\"downloads/0.13/gajim-0.13.4-2.exe\">"._("Gajim 0.13.4 installer")."</a>.\n"; +#print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-1.exe\">"._("Gajim installer")."</a>.\n"; print (" <br/>\n"); #print _(" Here is a")." <a href=\"downloads/0.13/gajim-0.13-rc5.exe\">"._("Gajim installer")."</a> "; #printf(_("for %s version "), "0.13-rc5"); diff -r fc3dd5568774 -r f6ec4d6ec240 imgs/gajim_jingle.png Binary file imgs/gajim_jingle.png has changed diff -r fc3dd5568774 -r f6ec4d6ec240 imgs/gajim_jingle_thumb.png Binary file imgs/gajim_jingle_thumb.png has changed diff -r fc3dd5568774 -r f6ec4d6ec240 index.php --- a/index.php Thu Aug 12 12:54:29 2010 +0200 +++ b/index.php Thu Sep 02 21:34:21 2010 +0200 @@ -24,18 +24,19 @@ 0 => _("Tabbed chat window and single window modes"), 1 => _("Group chat support (with MUC protocol), invitation, chat to groupchat transformation, minimize groupchat to roster"), 2 => _("Emoticons, Avatars, PEP (user activity, mood and tune)"), - 3 => _("File transfer, Room Bookmarks"), - 4 => _("Metacontacts Support"), - 5 => _("Trayicon, Speller, extented chat history functionalities"), - 6 => _("TLS, GPG and End-To-End encryption support (with SSL legacy support)"), - 7 => _("Transport Registration support"), - 8 => _("Service Discovery including Nodes, user search"), - 9 => _("Wikipedia, dictionary and search engine lookup"), - 10 => _("Multiple accounts support"), - 11 => _("DBus Capabilities. Read")." <a href=\"http://trac.gajim.org/wiki/GajimDBus\">"._("more information")."</a>", - 12 => _("XML Console"), - 13 => _("link local (bonjour / zeroconf), BOSH"), - 14 => _("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"), + 3 => _("Audio / Video conferences"), + 4 => _("File transfer, Room Bookmarks"), + 5 => _("Metacontacts Support"), + 6 => _("Trayicon, Speller, extented chat history functionalities"), + 7 => _("TLS, GPG and End-To-End encryption support (with SSL legacy support)"), + 8 => _("Transport Registration support"), + 9 => _("Service Discovery including Nodes, user search"), + 10 => _("Wikipedia, dictionary and search engine lookup"), + 11 => _("Multiple accounts support"), + 12 => _("DBus Capabilities. Read")." <a href=\"http://trac.gajim.org/wiki/GajimDBus\">"._("more information")."</a>", + 13 => _("XML Console"), + 14 => _("link local (bonjour / zeroconf), BOSH"), + 15 => _("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"), ); @@ -48,56 +49,40 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.13.4"), - 1 => sprintf(_("Gajim %s is here!"), "0.13.3"), - 2 => sprintf(_("Gajim %s is here!"), "0.13.2"), - 3 => sprintf(_("Gajim %s is here!"), "0.13.1"), - 4 => sprintf(_("Gajim %s is here!"), "0.13"), - 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), - 6 => sprintf(_("Release candidate 4 of Gajim %s"), "0.13"), - 7 => sprintf(_("Release candidate 1 of Gajim %s"), "0.13"), - 8 => sprintf(_("Gajim %s is here!"), "0.12.5")); + 0 => sprintf(_("Gajim %s is here!"), "0.14"), + 1 => sprintf(_("Gajim %s is here!"), "0.13.4")); +// 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 => _("02 April 2010"), - 1 => _("23 February 2010"), - 2 => _("14 January 2010"), - 3 => _("28 November 2009"), - 4 => _("23 November 2009"), - 5 => _("7 November 2009"), - 6 => _("4 November 2009"), - 7 => _("3 November 2009"), - 8 => _("08 August 2009")); + 0 => _("02 September 2010"), + 1 => _("02 April 2010")); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.13.4"), - 1 => sprintf(_("Version %s of Gajim has been released."), "0.13.3"), - 2 => sprintf(_("Version %s of Gajim has been released."), "0.13.2"), - 3 => sprintf(_("Version %s of Gajim has been released."), "0.13.1"), - 4 => sprintf(_("Version %s of Gajim has been released."), "0.13"), - 5 => sprintf(_("Version %s will arrive soon."), "0.13"), - 6 => sprintf(_("Version %s will arrive soon."), "0.13"), - 7 => sprintf(_("Version %s will arrive soon."), "0.13"), - 8 => sprintf(_("Version %s of Gajim has been released."), "0.12.5")); + 0 => sprintf(_("Version %s of Gajim has been released."), "0.14"), + 1 => sprintf(_("Version %s of Gajim has been released."), "0.13.4")); // 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.13.3"), - 1 => sprintf(_("What's new since %s:"), "0.13.2"), - 2 => sprintf(_("What's new since %s:"), "0.13.1"), - 3 => sprintf(_("What's new since %s:"), "0.13"), - 4 => sprintf(_("What's new since %s:"), "0.13-rc5"), - 5 => sprintf(_("What's new since %s:"), "0.13-rc4"), - 6 => sprintf(_("What's new since %s:"), "0.13-rc1"), - 7 => sprintf(_("What's new since %s:"), "0.12.5"), - 8 => sprintf(_("What's new since %s:"), "0.12.4")); + 0 => sprintf(_("What's new since %s:"), "0.13.4"), + 1 => sprintf(_("What's new since %s:"), "0.13.3")); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( + 0 => _("Jingle audio / video chat"), + 1 => _("Improve startup time"), + 2 => _("Groupchat auto-rejoin"), + 3 => _("Geolocation (with geoclue)"), + 4 => _("Use XDG standards"), + 5 => _("Handle groupchat captcha"), + 6 => "<a href = \"http://hg.gajim.org/gajim/file/605ca10afd21/ChangeLog\">"._("Full ChangeLog")."</a> ", + 7 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14\">"._("List of fixed bugs")."</a>"); + ); + +$array_news_items[1] = array( 0 => _("Fix some TLS connection"), 1 => _("Don't raise a lot of \"DB Error\" dialog"), 2 => _("Fix contact synchronisation"), @@ -105,53 +90,6 @@ 4 => _("Minor fixes"), ); -$array_news_items[1] = array( - 0 => _("Fix facebook xmpp server connection"), - 1 => _("Fix copy / paste with Ctrl+C on non-latin keyboard"), - 2 => _("Fix sending PEP information when connecting"), - 3 => _("Fix parsing HTML messages that have ascii markup"), - ); - -$array_news_items[2] = array( - 0 => _("Fix some translations"), - 1 => _("Fix string comparison according to locales"), - 2 => _("Fix some gnomekeyring glitches"), - 3 => _("Copy emoticons when we copy / paste in conversations"), - ); - -$array_news_items[3] = array( - 0 => _("Fix a bug when no account exists and bonjour is not available"), - 1 => _("Fix a bug when opening advanced option in MUC"), - 2 => _("Fix a bug when using non-BOSH proxies"), - ); - -$array_news_items[4] = array( - 0 => _("Fix more BOSH bugs"), - ); - -$array_news_items[5] = array( - 0 => _("Fix BOSH connection with ejabberd server"), - 1 => _("Fix self contact behaviour with anonymous connection"), - 2 => _("Fix chatting with invisible contacts"), - ); - -$array_news_items[6] = array( - 0 => _("Fix BOSH URI parsing when port is not provided"), - 1 => _("Fix windows version (we were using a function not available under PyGTK 2.12.1)"), - ); - -$array_news_items[7] = array( - 0 => _("BOSH connection support"), - 1 => _("Roster versioning support"), - 2 => _("Interface to send XHTML messages"), - 3 => "<a href = \"http://hg.gajim.org/gajim/file/cb35a23ac836/ChangeLog\">"._("Full ChangeLog")."</a> ", - 4 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.13\">"._("List of fixed bugs")."</a>", - ); - -$array_news_items[8] = array( - 0 => _("Don't depend on GTK 2.14"), - ); - $tpl->set_block("page", "NEWS_LIST", "item"); // define intern block $tpl->set_block("page", "NEWS", "news"); // define extern block for ($i=0; $i<sizeof($array_news_title); $i++) { diff -r fc3dd5568774 -r f6ec4d6ec240 locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Thu Aug 12 12:54:29 2010 +0200 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Thu Sep 02 21:34:21 2010 +0200 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-08 14:13+0200\n" +"POT-Creation-Date: 2010-09-02 19:29+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" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -129,11 +130,11 @@ msgid "Structure" msgstr "Структура" -#: Design.php:136 +#: Design.php:149 msgid " Language:" msgstr " Език:" -#: Design.php:179 +#: Design.php:192 msgid "" " Site optimized for W3C Standards and realized with vim editor under GNU/" "Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" @@ -173,8 +174,8 @@ msgid " List archives are available " msgstr " Архивите на списъка са достъпни " -#: dev.php:20 docs.php:39 docs.php:45 downloads.php:36 downloads.php:158 -#: downloads.php:170 downloads.php:208 downloads.php:228 +#: dev.php:20 docs.php:39 docs.php:45 downloads.php:36 downloads.php:159 +#: downloads.php:171 downloads.php:209 downloads.php:229 msgid "here" msgstr "тук" @@ -240,26 +241,26 @@ msgstr "докладвате" #: dev.php:50 -msgid " Donating: contact me on Jabber (asterix(a)jabber.lagaule.org)" -msgstr " Дарения: свържете се с мен по Джабър (asterix(a)jabber.lagaule.org)" +msgid " Donating: " +msgstr "" -#: dev.php:55 +#: dev.php:62 msgid " Translations status" msgstr "" -#: dev.php:84 +#: dev.php:91 msgid " Authors" msgstr " Автори" -#: dev.php:86 +#: dev.php:93 msgid " Project is composed of:" msgstr " Проектът се състои от:" -#: dev.php:93 +#: dev.php:100 msgid " We also want to thank" msgstr " Също бихме искали да благодарим на" -#: dev.php:93 +#: dev.php:100 msgid "these people" msgstr "тези хора" @@ -281,7 +282,7 @@ msgid " To get one of these versions, go to the %s page.\n" msgstr " За да изтеглите някоя от тези версии, отидете на страницата" -#: docs.php:22 downloads.php:173 +#: docs.php:22 downloads.php:174 msgid " Under GNU/Linux\n" msgstr " Под GNU/Линукс\n" @@ -471,31 +472,32 @@ #: downloads.php:145 #, fuzzy -msgid " There is a " -msgstr " Ето някои" +msgid "Gajim 0.13.4 installer" +msgstr "Инсталатор за „Уиндоус“"

1 0

gajim: prepare 0.14 release
by Yann Leboulanger 02 Sep '10

02 Sep '10

changeset 605ca10afd21 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=605ca10afd21 description: prepare 0.14 release diffstat: ChangeLog | 2 +- configure.ac | 2 +- debian/changelog | 10 ++++++++-- debian/control | 2 +- src/common/defs.py | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diffs (63 lines): diff -r 3459161a11e8 -r 605ca10afd21 ChangeLog --- a/ChangeLog Wed Sep 01 20:15:04 2010 +0200 +++ b/ChangeLog Thu Sep 02 18:26:05 2010 +0200 @@ -1,4 +1,4 @@ -Gajim 0.14 (XX) +Gajim 0.14 (02 September 2010) * Jingle audio / video chat * Improve Startup time diff -r 3459161a11e8 -r 605ca10afd21 configure.ac --- a/configure.ac Wed Sep 01 20:15:04 2010 +0200 +++ b/configure.ac Thu Sep 02 18:26:05 2010 +0200 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.13.90.1],[http://trac.gajim.org/],[gajim]) + [0.14],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) diff -r 3459161a11e8 -r 605ca10afd21 debian/changelog --- a/debian/changelog Wed Sep 01 20:15:04 2010 +0200 +++ b/debian/changelog Thu Sep 02 18:26:05 2010 +0200 @@ -1,8 +1,14 @@ -gajim (0.13.90-1) unstable; urgency=low +gajim (0.14-1) unstable; urgency=low * New upstream release. + * Correctly sanitize menuentries in chat window action context menu. + Closes: #574839 + * Fix traceback when closing file request dialog. Closes: #587186 + * Recommand python-openssl >= 0.9. Closes: #594772 + * Improve a string. Closes: #553527 + * Fix canceling file transfer. Closes: #587679 - -- Yann Leboulanger <asterix(a)lagaule.org> Sat, 24 Jul 2010 10:25:26 +0200 + -- Yann Leboulanger <asterix(a)lagaule.org> Thu, 02 Sep 2010 19:25:26 +0200 gajim (0.13.4-1) unstable; urgency=low diff -r 3459161a11e8 -r 605ca10afd21 debian/control --- a/debian/control Wed Sep 01 20:15:04 2010 +0200 +++ b/debian/control Thu Sep 02 18:26:05 2010 +0200 @@ -14,7 +14,7 @@ Architecture: all XB-Python-Version: ${python:Versions} Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-support (>= 0.7.1), python-glade2 (>= 2.12.0), python-gtk2 (>= 2.12.0), dnsutils -Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl, python-crypto +Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl (>= 0.9), python-crypto Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly Description: Jabber client written in PyGTK Gajim is a Jabber client. It has a tabbed user interface with normal chats, diff -r 3459161a11e8 -r 605ca10afd21 src/common/defs.py --- a/src/common/defs.py Wed Sep 01 20:15:04 2010 +0200 +++ b/src/common/defs.py Thu Sep 02 18:26:05 2010 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.13.90.1' +version = '0.14' import sys, os.path for base in ('.', 'common'):

1 0

gajim: don't loose mood / activities when editing preset status ...
by Yann Leboulanger 01 Sep '10

01 Sep '10

changeset 3459161a11e8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3459161a11e8 description: don't loose mood / activities when editing preset status message in pref window diffstat: src/config.py | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diffs (44 lines): diff -r e4508b984b61 -r 3459161a11e8 src/config.py --- a/src/config.py Wed Sep 01 20:18:24 2010 +0200 +++ b/src/config.py Wed Sep 01 20:15:04 2010 +0200 @@ -415,7 +415,7 @@ # Status messages self.msg_tree = self.xml.get_object('msg_treeview') - model = gtk.ListStore(str, str) + model = gtk.ListStore(str, str, str, str, str, str, str) self.msg_tree.set_model(model) col = gtk.TreeViewColumn('name') self.msg_tree.append_column(col) @@ -1085,6 +1085,13 @@ gajim.config.add_per('statusmsg', val) msg = helpers.to_one_line(model[iter_][1].decode('utf-8')) gajim.config.set_per('statusmsg', val, 'message', msg) + i = 2 + # store mood / activity + for subname in ('activity', 'subactivity', 'activity_text', + 'mood', 'mood_text'): + gajim.config.set_per('statusmsg', val, subname, + model[iter_][i].decode('utf-8')) + i += 1 iter_ = model.iter_next(iter_) gajim.interface.save_config() @@ -1191,8 +1198,16 @@ for msg_name in preset_status: msg_text = gajim.config.get_per('statusmsg', msg_name, 'message') msg_text = helpers.from_one_line(msg_text) + activity = gajim.config.get_per('statusmsg', msg_name, 'activity') + subactivity = gajim.config.get_per('statusmsg', msg_name, + 'subactivity') + activity_text = gajim.config.get_per('statusmsg', msg_name, + 'activity_text') + mood = gajim.config.get_per('statusmsg', msg_name, 'mood') + mood_text = gajim.config.get_per('statusmsg', msg_name, 'mood_text') iter_ = model.append() - model.set(iter_, 0, msg_name, 1, msg_text) + model.set(iter_, 0, msg_name, 1, msg_text, 2, activity, 3, + subactivity, 4, activity_text, 5, mood, 6, mood_text) def on_msg_cell_edited(self, cell, row, new_text): model = self.msg_tree.get_model()

1 0

gajim: add missing import. Fixes #5875
by Yann Leboulanger 01 Sep '10

01 Sep '10

changeset e4508b984b61 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e4508b984b61 description: add missing import. Fixes #5875 diffstat: src/profile_window.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 613640606835 -r e4508b984b61 src/profile_window.py --- a/src/profile_window.py Thu Aug 26 13:52:00 2010 +0200 +++ b/src/profile_window.py Wed Sep 01 20:18:24 2010 +0200 @@ -27,6 +27,7 @@ import base64 import mimetypes import os +import time import gtkgui_helpers import dialogs

1 0

gajim: add missing import. Fixes #5875
by Yann Leboulanger 01 Sep '10

01 Sep '10

changeset 478972e92130 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=478972e92130 description: add missing import. Fixes #5875 diffstat: src/profile_window.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 0ea409fd5a31 -r 478972e92130 src/profile_window.py --- a/src/profile_window.py Wed Sep 01 20:15:04 2010 +0200 +++ b/src/profile_window.py Wed Sep 01 20:18:24 2010 +0200 @@ -27,6 +27,7 @@ import base64 import mimetypes import os +import time import gtkgui_helpers import dialogs

1 0

gajim: don't loose mood / activities when editing preset status ...
by Yann Leboulanger 01 Sep '10

01 Sep '10

changeset 0ea409fd5a31 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0ea409fd5a31 description: don't loose mood / activities when editing preset status message in pref window diffstat: src/config.py | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diffs (44 lines): diff -r 453cd33cf535 -r 0ea409fd5a31 src/config.py --- a/src/config.py Mon Aug 30 21:42:36 2010 +0200 +++ b/src/config.py Wed Sep 01 20:15:04 2010 +0200 @@ -415,7 +415,7 @@ # Status messages self.msg_tree = self.xml.get_object('msg_treeview') - model = gtk.ListStore(str, str) + model = gtk.ListStore(str, str, str, str, str, str, str) self.msg_tree.set_model(model) col = gtk.TreeViewColumn('name') self.msg_tree.append_column(col) @@ -1085,6 +1085,13 @@ gajim.config.add_per('statusmsg', val) msg = helpers.to_one_line(model[iter_][1].decode('utf-8')) gajim.config.set_per('statusmsg', val, 'message', msg) + i = 2 + # store mood / activity + for subname in ('activity', 'subactivity', 'activity_text', + 'mood', 'mood_text'): + gajim.config.set_per('statusmsg', val, subname, + model[iter_][i].decode('utf-8')) + i += 1 iter_ = model.iter_next(iter_) gajim.interface.save_config() @@ -1191,8 +1198,16 @@ for msg_name in preset_status: msg_text = gajim.config.get_per('statusmsg', msg_name, 'message') msg_text = helpers.from_one_line(msg_text) + activity = gajim.config.get_per('statusmsg', msg_name, 'activity') + subactivity = gajim.config.get_per('statusmsg', msg_name, + 'subactivity') + activity_text = gajim.config.get_per('statusmsg', msg_name, + 'activity_text') + mood = gajim.config.get_per('statusmsg', msg_name, 'mood') + mood_text = gajim.config.get_per('statusmsg', msg_name, 'mood_text') iter_ = model.append() - model.set(iter_, 0, msg_name, 1, msg_text) + model.set(iter_, 0, msg_name, 1, msg_text, 2, activity, 3, + subactivity, 4, activity_text, 5, mood, 6, mood_text) def on_msg_cell_edited(self, cell, row, new_text): model = self.msg_tree.get_model()

1 0

gajim: [Jingle] Don't wait for all contents to be ready to accep...
by Thibaut Girka 01 Sep '10

01 Sep '10

changeset 613640606835 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=613640606835 description: [Jingle] Don't wait for all contents to be ready to accept a session diffstat: src/common/jingle_session.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (22 lines): diff -r 07f5d16267bb -r 613640606835 src/common/jingle_session.py --- a/src/common/jingle_session.py Tue Aug 24 11:43:16 2010 +0200 +++ b/src/common/jingle_session.py Thu Aug 26 13:52:00 2010 +0200 @@ -229,7 +229,7 @@ """ Return True when all codecs and candidates are ready (for all contents) """ - return (all((content.is_ready() for content in self.contents.itervalues())) + return (any((content.is_ready() for content in self.contents.itervalues())) and self.accepted) def accept_session(self): @@ -592,7 +592,8 @@ # TODO: integrate with __appendContent? # TODO: parameters 'name', 'content'? for content in self.contents.values(): - self.__append_content(jingle, content) + if content.is_ready(): + self.__append_content(jingle, content) def __session_initiate(self): assert self.state == JingleStates.ended

1 0

gajim: don't try to publish tune for accounts that don't support...
by Yann Leboulanger 01 Sep '10

01 Sep '10

changeset 07f5d16267bb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=07f5d16267bb description: don't try to publish tune for accounts that don't support PEP. Fixes #5868 diffstat: src/gui_interface.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 90fd532df52b -r 07f5d16267bb src/gui_interface.py --- a/src/gui_interface.py Mon Aug 23 14:55:03 2010 +0200 +++ b/src/gui_interface.py Tue Aug 24 11:43:16 2010 +0200 @@ -2909,6 +2909,8 @@ for acct in accounts: if not gajim.account_is_connected(acct): continue + if not gajim.connections[acct].pep_supported: + continue if not gajim.config.get_per('accounts', acct, 'publish_tune'): continue if gajim.connections[acct].music_track_info == music_track_info:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2010