Commits June 2011

commits@gajim.org

3 participants
49 discussions

gajim-website: update website for 0.14.3
by Yann Leboulanger 19 Jun '11

19 Jun '11

changeset 9148fec996f2 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=9148fec996f2 description: update website for 0.14.3 diffstat: downloads.php | 2 +- index.php | 55 ++++++++++++++++---------- locale/bg_BG/LC_MESSAGES/msg.po | 77 +++++++++++++++++++++++-------------- locale/de_DE/LC_MESSAGES/msg.po | 83 ++++++++++++++++++++++++---------------- locale/eo/LC_MESSAGES/msg.po | 71 +++++++++++++++++++++------------- locale/es_ES/LC_MESSAGES/msg.po | 77 +++++++++++++++++++++++-------------- locale/fr_FR/LC_MESSAGES/msg.po | 83 ++++++++++++++++++++++++---------------- locale/hu_HU/LC_MESSAGES/msg.po | 77 +++++++++++++++++++++++-------------- locale/it_IT/LC_MESSAGES/msg.po | 77 +++++++++++++++++++++++-------------- locale/pl_PL/LC_MESSAGES/msg.po | 83 ++++++++++++++++++++++++---------------- locale/pt_BR/LC_MESSAGES/msg.po | 83 ++++++++++++++++++++++++---------------- locale/ru_RU/LC_MESSAGES/msg.po | 82 ++++++++++++++++++++++++---------------- msg.pot | 76 ++++++++++++++++++++++-------------- 13 files changed, 557 insertions(+), 369 deletions(-) diffs (truncated from 1930 to 300 lines): diff -r 2bcc1b6581ff -r 9148fec996f2 downloads.php --- a/downloads.php Wed Jun 08 09:01:42 2011 +0200 +++ b/downloads.php Sun Jun 19 21:41:40 2011 +0200 @@ -5,7 +5,7 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); $download_folder = "0.14"; -$last_version = "0.14.2"; +$last_version = "0.14.3"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; #printf(_(" A %s version is in test"), "0.13-rc5"); diff -r 2bcc1b6581ff -r 9148fec996f2 index.php --- a/index.php Wed Jun 08 09:01:42 2011 +0200 +++ b/index.php Sun Jun 19 21:41:40 2011 +0200 @@ -49,49 +49,60 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.14.2"), - 1 => sprintf(_("Gajim %s is here!"), "0.14.1"), - 2 => sprintf(_("Gajim %s is here!"), "0.14"), - 3 => sprintf(_("Gajim %s is here!"), "0.13.4")); + 0 => sprintf(_("Gajim %s is here!"), "0.14.3"), + 1 => sprintf(_("Gajim %s is here!"), "0.14.2"), + 2 => sprintf(_("Gajim %s is here!"), "0.14.1"), + 3 => sprintf(_("Gajim %s is here!"), "0.14"), + 4 => 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 => _("07 June 2011"), - 1 => _("26 October 2010"), - 2 => _("02 September 2010"), - 3 => _("02 April 2010")); + 0 => _("19 June 2011"), + 1 => _("07 June 2011"), + 2 => _("26 October 2010"), + 3 => _("02 September 2010"), + 4 => _("02 April 2010")); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.14.2"), - 1 => sprintf(_("Version %s of Gajim has been released."), "0.14.1"), - 2 => sprintf(_("Version %s of Gajim has been released."), "0.14"), - 3 => sprintf(_("Version %s of Gajim has been released."), "0.13.4")); + 0 => sprintf(_("Version %s of Gajim has been released."), "0.14.3"), + 1 => sprintf(_("Version %s of Gajim has been released."), "0.14.2"), + 2 => sprintf(_("Version %s of Gajim has been released."), "0.14.1"), + 3 => sprintf(_("Version %s of Gajim has been released."), "0.14"), + 4 => 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.14.1"), - 1 => sprintf(_("What's new since %s:"), "0.14"), - 2 => sprintf(_("What's new since %s:"), "0.13.4"), - 3 => sprintf(_("What's new since %s:"), "0.13.3")); + 0 => sprintf(_("What's new since %s:"), "0.14.2"), + 1 => sprintf(_("What's new since %s:"), "0.14.1"), + 2 => sprintf(_("What's new since %s:"), "0.14"), + 3 => sprintf(_("What's new since %s:"), "0.13.4"), + 4 => sprintf(_("What's new since %s:"), "0.13.3")); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( - 0 => _("Fix CPU usage when testing file transfer proxies"), - 1 => _("Fix invalid XML char regex"), - 1 => _("Various minor bugfixes, see") . " <a href = \"http://hg.gajim.org/gajim/file/baf4786b33fe/ChangeLog\">"._("Full ChangeLog")."</a> ", - 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.2\">"._("List of fixed bugs")."</a>", + 0 => _("Fix history viewer"), + 1 => _("Fix closing roster window"), + 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/7798a90157c7/ChangeLog\">"._("Full ChangeLog")."</a> ", + 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.3\">"._("List of fixed bugs")."</a>", ); $array_news_items[1] = array( + 0 => _("Fix CPU usage when testing file transfer proxies"), + 1 => _("Fix invalid XML char regex"), + 2 => _("Various minor bugfixes, see") . " <a href = \"http://hg.gajim.org/gajim/file/baf4786b33fe/ChangeLog\">"._("Full ChangeLog")."</a> ", + 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.2\">"._("List of fixed bugs")."</a>", + ); + +$array_news_items[2] = array( 0 => _("Various minor bugfixes, see") . " <a href = \"http://hg.gajim.org/gajim/file/d56f061aca8d/ChangeLog\">"._("Full ChangeLog")."</a> ", 1 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.1\">"._("List of fixed bugs")."</a>", ); -$array_news_items[2] = array( +$array_news_items[3] = array( 0 => _("Jingle audio / video chat"), 1 => _("Improve startup time"), 2 => _("Groupchat auto-rejoin"), @@ -102,7 +113,7 @@ 7 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14\">"._("List of fixed bugs")."</a>", ); -$array_news_items[3] = array( +$array_news_items[4] = array( 0 => _("Fix some TLS connection"), 1 => _("Don't raise a lot of \"DB Error\" dialog"), 2 => _("Fix contact synchronisation"), diff -r 2bcc1b6581ff -r 9148fec996f2 locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Wed Jun 08 09:01:42 2011 +0200 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Sun Jun 19 21:41:40 2011 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-07 20:26+0200\n" +"POT-Creation-Date: 2011-06-19 21:38+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" @@ -741,101 +741,118 @@ msgid "NEWS" msgstr "НОВИНИ" -#: index.php:52 index.php:53 index.php:54 index.php:55 +#: index.php:52 index.php:53 index.php:54 index.php:55 index.php:56 #, fuzzy, c-format msgid "Gajim %s is here!" msgstr "Излезе Gajim 0.11!" -#: index.php:61 +#: index.php:62 +msgid "19 June 2011" +msgstr "" + +#: index.php:63 msgid "07 June 2011" msgstr "" -#: index.php:62 +#: index.php:64 #, fuzzy msgid "26 October 2010" msgstr "19 декември 2006 г." -#: index.php:63 +#: index.php:65 #, fuzzy msgid "02 September 2010" msgstr "19 декември 2006 г." -#: index.php:64 +#: index.php:66 msgid "02 April 2010" msgstr "" -#: index.php:67 index.php:68 index.php:69 index.php:70 +#: index.php:69 index.php:70 index.php:71 index.php:72 index.php:73 #, fuzzy, c-format msgid "Version %s of Gajim has been released." msgstr "Издадена е версия 0.11 на Gajim." -#: index.php:76 index.php:77 index.php:78 index.php:79 +#: index.php:79 index.php:80 index.php:81 index.php:82 index.php:83 #, fuzzy, c-format msgid "What's new since %s:" msgstr "Какво е новото спрямо " -#: index.php:83 +#: index.php:87 +msgid "Fix history viewer" +msgstr "" + +#: index.php:88 +msgid "Fix closing roster window" +msgstr "" + +#: index.php:89 index.php:96 index.php:101 index.php:112 +msgid "Full ChangeLog" +msgstr "Пълен дневник на промените" + +#: index.php:89 +#, fuzzy +msgid "Full changelog, see" +msgstr "Пълен дневник на промените" + +#: index.php:90 index.php:97 index.php:102 index.php:113 +msgid "List of fixed bugs" +msgstr "" + +#: index.php:94 msgid "Fix CPU usage when testing file transfer proxies" msgstr "" -#: index.php:84 +#: index.php:95 msgid "Fix invalid XML char regex" msgstr "" -#: index.php:85 index.php:90 index.php:101 -msgid "Full ChangeLog" -msgstr "Пълен дневник на промените" - -#: index.php:85 index.php:90 +#: index.php:96 index.php:101 msgid "Various minor bugfixes, see" msgstr "" -#: index.php:86 index.php:91 index.php:102 -msgid "List of fixed bugs" -msgstr "" - -#: index.php:95 +#: index.php:106 msgid "Jingle audio / video chat" msgstr "" -#: index.php:96 +#: index.php:107 msgid "Improve startup time" msgstr "" -#: index.php:97 +#: index.php:108 msgid "Groupchat auto-rejoin" msgstr "" -#: index.php:98 +#: index.php:109 msgid "Geolocation (with geoclue)" msgstr "" -#: index.php:99 +#: index.php:110 msgid "Use XDG standards" msgstr "" -#: index.php:100 +#: index.php:111 msgid "Handle groupchat captcha" msgstr "" -#: index.php:106 +#: index.php:117 msgid "Fix some TLS connection" msgstr "" -#: index.php:107 +#: index.php:118 msgid "Don't raise a lot of \"DB Error\" dialog" msgstr "" -#: index.php:108 +#: index.php:119 msgid "Fix contact synchronisation" msgstr "" -#: index.php:109 +#: index.php:120 #, fuzzy msgid "Add japanese translation" msgstr "Нов превод: сръбски" -#: index.php:110 +#: index.php:121 msgid "Minor fixes" msgstr "" diff -r 2bcc1b6581ff -r 9148fec996f2 locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Wed Jun 08 09:01:42 2011 +0200 +++ b/locale/de_DE/LC_MESSAGES/msg.po Sun Jun 19 21:41:40 2011 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-07 20:26+0200\n" +"POT-Creation-Date: 2011-06-19 21:38+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" @@ -767,104 +767,123 @@ msgid "NEWS" msgstr "NEUIGKEITEN" -#: index.php:52 index.php:53 index.php:54 index.php:55 +#: index.php:52 index.php:53 index.php:54 index.php:55 index.php:56 #, c-format msgid "Gajim %s is here!" msgstr "Gajim %s ist da!" -#: index.php:61 +#: index.php:62 +#, fuzzy +msgid "19 June 2011" +msgstr "12. August 2008" + +#: index.php:63 #, fuzzy msgid "07 June 2011" msgstr "12. August 2008" -#: index.php:62

1 0

gajim: fix tag name
by Yann Leboulanger 19 Jun '11

19 Jun '11

changeset d43439e33e4e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d43439e33e4e description: fix tag name diffstat: .hgtags | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (9 lines): diff -r 8cfb9acdfde6 -r d43439e33e4e .hgtags --- a/.hgtags Sun Jun 19 21:35:26 2011 +0200 +++ b/.hgtags Sun Jun 19 21:37:43 2011 +0200 @@ -5,4 +5,4 @@ a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 605ca10afd21958f027673d2799332e39d53a75d gajim-0.14 1543f8fc9950e4f830a1b9c5f9c399a66b5f1cd1 gajim-0.14.2 -7798a90157c770ed78a356017d2313a4fd387813 0.14.3 +7798a90157c770ed78a356017d2313a4fd387813 gajim-0.14.3

1 0

gajim: Added tag 0.14.3 for changeset 7798a90157c7
by Yann Leboulanger 19 Jun '11

19 Jun '11

changeset 8cfb9acdfde6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8cfb9acdfde6 description: Added tag 0.14.3 for changeset 7798a90157c7 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 7798a90157c7 -r 8cfb9acdfde6 .hgtags --- a/.hgtags Sun Jun 19 21:19:20 2011 +0200 +++ b/.hgtags Sun Jun 19 21:35:26 2011 +0200 @@ -5,3 +5,4 @@ a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 605ca10afd21958f027673d2799332e39d53a75d gajim-0.14 1543f8fc9950e4f830a1b9c5f9c399a66b5f1cd1 gajim-0.14.2 +7798a90157c770ed78a356017d2313a4fd387813 0.14.3

1 0

gajim: add msvcr90.dll to windows installer. Fixes #6754
by Yann Leboulanger 19 Jun '11

19 Jun '11

changeset e37675d6eaf0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e37675d6eaf0 description: add msvcr90.dll to windows installer. Fixes #6754 diffstat: gajim.nsi | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 78cc84aaf276 -r e37675d6eaf0 gajim.nsi --- a/gajim.nsi Sun Jun 19 21:16:07 2011 +0200 +++ b/gajim.nsi Sun Jun 19 21:19:20 2011 +0200 @@ -182,6 +182,7 @@ File "bin\win32file.pyd" File "bin\win32pipe.pyd" File "bin\winsound.pyd" + File "msvcr90.dll" WriteRegStr HKCU "Software\Gajim" "" $INSTDIR WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim"

1 0

gajim: update copyright to 2011 in about dialog
by Yann Leboulanger 19 Jun '11

19 Jun '11

changeset 78cc84aaf276 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=78cc84aaf276 description: update copyright to 2011 in about dialog diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0c0fd94dbd19 -r 78cc84aaf276 src/dialogs.py --- a/src/dialogs.py Wed Jun 15 18:41:24 2011 +0200 +++ b/src/dialogs.py Sun Jun 19 21:16:07 2011 +0200 @@ -1263,7 +1263,7 @@ dlg.set_transient_for(gajim.interface.roster.window) dlg.set_name('Gajim') dlg.set_version(gajim.version) - s = u'Copyright © 2003-2010 Gajim Team' + s = u'Copyright © 2003-2011 Gajim Team' dlg.set_copyright(s) copying_file_path = self.get_path('COPYING') if copying_file_path:

1 0

gajim: add msvcr90.dll to windows installer. Fixes #6754
by Yann Leboulanger 19 Jun '11

19 Jun '11

changeset 7798a90157c7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7798a90157c7 description: add msvcr90.dll to windows installer. Fixes #6754 diffstat: gajim.nsi | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 176558dbf1ad -r 7798a90157c7 gajim.nsi --- a/gajim.nsi Sun Jun 19 21:17:50 2011 +0200 +++ b/gajim.nsi Sun Jun 19 21:19:20 2011 +0200 @@ -182,6 +182,7 @@ File "bin\win32file.pyd" File "bin\win32pipe.pyd" File "bin\winsound.pyd" + File "msvcr90.dll" WriteRegStr HKCU "Software\Gajim" "" $INSTDIR WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim"

1 0

gajim: prepare 0.14.3 release
by Yann Leboulanger 19 Jun '11

19 Jun '11

changeset 176558dbf1ad in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=176558dbf1ad description: prepare 0.14.3 release diffstat: ChangeLog | 6 ++++++ configure.ac | 2 +- gajim.nsi | 2 +- setup_win32.py | 2 +- src/common/defs.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diffs (59 lines): diff -r ff8f4db39dc3 -r 176558dbf1ad ChangeLog --- a/ChangeLog Sun Jun 19 21:16:07 2011 +0200 +++ b/ChangeLog Sun Jun 19 21:17:50 2011 +0200 @@ -1,3 +1,9 @@ +Gajim 0.14.3 (19 June 2011) + + * Fix history viewer + * Fix closing roster window + * Prevent some erros with metacontacts + Gajim 0.14.2 (07 June 2011) * Fix CPU usage when testing file transfer proxies diff -r ff8f4db39dc3 -r 176558dbf1ad configure.ac --- a/configure.ac Sun Jun 19 21:16:07 2011 +0200 +++ b/configure.ac Sun Jun 19 21:17:50 2011 +0200 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.14.2],[http://trac.gajim.org/],[gajim]) + [0.14.3],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) diff -r ff8f4db39dc3 -r 176558dbf1ad gajim.nsi --- a/gajim.nsi Sun Jun 19 21:16:07 2011 +0200 +++ b/gajim.nsi Sun Jun 19 21:17:50 2011 +0200 @@ -187,7 +187,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.14.2" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.14.3" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r ff8f4db39dc3 -r 176558dbf1ad setup_win32.py --- a/setup_win32.py Sun Jun 19 21:16:07 2011 +0200 +++ b/setup_win32.py Sun Jun 19 21:17:50 2011 +0200 @@ -49,7 +49,7 @@ setup( name='Gajim', - version='0.14.2', + version='0.14.3', description='A full featured Jabber client', author='Gajim Development Team', url='http://www.gajim.org/', diff -r ff8f4db39dc3 -r 176558dbf1ad src/common/defs.py --- a/src/common/defs.py Sun Jun 19 21:16:07 2011 +0200 +++ b/src/common/defs.py Sun Jun 19 21:17:50 2011 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.14.2' +version = '0.14.3' import sys, os.path for base in ('.', 'common'):

1 0

19 Jun '11

changeset ff8f4db39dc3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ff8f4db39dc3 description: update copyright to 2011 in about dialog diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 22efffadfe47 -r ff8f4db39dc3 src/dialogs.py --- a/src/dialogs.py Mon Jun 13 18:14:45 2011 +0200 +++ b/src/dialogs.py Sun Jun 19 21:16:07 2011 +0200 @@ -1166,7 +1166,7 @@ dlg.set_transient_for(gajim.interface.roster.window) dlg.set_name('Gajim') dlg.set_version(gajim.version) - s = u'Copyright © 2003-2010 Gajim Team' + s = u'Copyright © 2003-2011 Gajim Team' dlg.set_copyright(s) copying_file_path = self.get_path('COPYING') if copying_file_path:

1 0

gajim: enable SM before sending negociation request
by Jefry Lagrange 18 Jun '11

18 Jun '11

changeset 5c03b097e855 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5c03b097e855 description: enable SM before sending negociation request diffstat: src/common/xmpp/smacks.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (36 lines): diff -r 54b0c0732842 -r 5c03b097e855 src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Wed Jun 15 20:37:07 2011 -0400 +++ b/src/common/xmpp/smacks.py Thu Jun 16 18:59:21 2011 -0400 @@ -56,7 +56,7 @@ l = stanza.getAttr('location') if l: self.location = l - self.enabled = True + def negociate(self, resume=True): # Every time we attempt to negociate, we must erase all previous info @@ -65,6 +65,7 @@ self.in_h = 0 self.out_h = 0 self.session_id = None + self.enabled = True stanza = Acks() stanza.buildEnable(resume) @@ -118,7 +119,6 @@ # If the server doesn't recognize previd, forget about resuming # Ask for service discovery, etc.. if stanza.getTag('item-not-found'): - self.enabled = False self.resuming = False self.negociate() self.con._discover_server_at_connection(self.con.connection) @@ -126,7 +126,6 @@ # Doesn't support resumption if stanza.getTag('feature-not-implemented'): - self.enabled = False self.negociate(False) return

1 0

gajim: resuming from prefered location
by Jefry Lagrange 16 Jun '11

16 Jun '11

changeset 54b0c0732842 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=54b0c0732842 description: resuming from prefered location diffstat: src/common/connection.py | 12 ++++++++++-- src/common/xmpp/smacks.py | 6 +++++- 2 files changed, 15 insertions(+), 3 deletions(-) diffs (45 lines): diff -r ac2f9133f663 -r 54b0c0732842 src/common/connection.py --- a/src/common/connection.py Wed Jun 15 19:12:55 2011 -0400 +++ b/src/common/connection.py Wed Jun 15 20:37:07 2011 -0400 @@ -996,8 +996,16 @@ """ if self.connection: return self.connection, '' - - if data: + + + if self.sm.resuming and self.sm.location: + # If resuming and server gave a location, connect from there + hostname = self.sm.location + self.try_connecting_for_foo_secs = gajim.config.get_per('accounts', + self.name, 'try_connecting_for_foo_secs') + use_custom = False + + elif data: hostname = data['hostname'] self.try_connecting_for_foo_secs = 45 p = data['proxy'] diff -r ac2f9133f663 -r 54b0c0732842 src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Wed Jun 15 19:12:55 2011 -0400 +++ b/src/common/xmpp/smacks.py Wed Jun 15 20:37:07 2011 -0400 @@ -25,6 +25,7 @@ self._owner = None self.resuming = False self.enabled = False # If SM is enabled + self.location = None def set_owner(self, owner): self._owner = owner @@ -51,7 +52,10 @@ if r == 'false' or r == 'False' or r == '0': self.negociate(False) - + + l = stanza.getAttr('location') + if l: + self.location = l self.enabled = True def negociate(self, resume=True):

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