Commits June 2011

commits@gajim.org

3 participants
49 discussions

gajim: keeps old status after disconnection
by Jefry Lagrange 08 Jun '11

08 Jun '11

changeset c4c20e97cadd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c4c20e97cadd description: keeps old status after disconnection diffstat: src/common/connection.py | 11 ++++++++++- src/common/xmpp/dispatcher_nb.py | 7 ++++--- src/common/xmpp/smacks.py | 3 ++- 3 files changed, 16 insertions(+), 5 deletions(-) diffs (58 lines): diff -r 59a37f1f885f -r c4c20e97cadd src/common/connection.py --- a/src/common/connection.py Tue Jun 07 18:48:53 2011 -0400 +++ b/src/common/connection.py Tue Jun 07 23:50:45 2011 -0400 @@ -784,7 +784,16 @@ self.connection.disconnect() self.last_connection = None self.connection = None - + def set_oldst(self): # Set old state + if self.old_show: + self.connected = gajim.SHOW_LIST.index(self.old_show) + gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, + show=self.connected)) + else: # we default to online + self.connected = 2 + gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, + show=gajim.SHOW_LIST[self.connected])) + def _disconnectedReconnCB(self): """ Called when we are disconnected diff -r 59a37f1f885f -r c4c20e97cadd src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Tue Jun 07 18:48:53 2011 -0400 +++ b/src/common/xmpp/dispatcher_nb.py Tue Jun 07 23:50:45 2011 -0400 @@ -421,9 +421,10 @@ stanza.props = stanza.getProperties() ID = stanza.getID() # If server supports stream management - if self.sm != None and (stanza.getName() != 'r' and - stanza.getName() != 'a' and - stanza.getName() != 'enabled') : + if self.sm and self.sm.enabled and (stanza.getName() != 'r' or + stanza.getName() != 'a' or + stanza.getName() != 'enabled' or + stanza.getName() != 'resumed'): # increments the number of stanzas that has been handled self.sm.in_h = self.sm.in_h + 1 list_ = ['default'] # we will use all handlers: diff -r 59a37f1f885f -r c4c20e97cadd src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Tue Jun 07 18:48:53 2011 -0400 +++ b/src/common/xmpp/smacks.py Tue Jun 07 23:50:45 2011 -0400 @@ -72,7 +72,7 @@ log.error('Attempted to resume without a valid session id ') return resume = Acks() - resume.buildResume(self.in_h, None)#self.session_id) + resume.buildResume(self.in_h, self.session_id) self._owner.Connection.send(resume, True) def send_ack(self, disp, stanza): @@ -104,6 +104,7 @@ if stanza.getName() == 'resumed': self.resuming = True + self.con.set_oldst() if self.uqueue != []: for i in self.uqueue: self._owner.Connection.send(i, False)

1 0

gajim: connects when server can't resume stream
by Jefry Lagrange 08 Jun '11

08 Jun '11

changeset 59a37f1f885f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=59a37f1f885f description: connects when server can't resume stream diffstat: src/common/xmpp/dispatcher_nb.py | 2 +- src/common/xmpp/smacks.py | 32 +++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) diffs (81 lines): diff -r f1414d3d1317 -r 59a37f1f885f src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Mon Jun 06 23:43:13 2011 -0400 +++ b/src/common/xmpp/dispatcher_nb.py Tue Jun 07 18:48:53 2011 -0400 @@ -535,7 +535,7 @@ if self._owner._registered_name and not stanza.getAttr('from'): stanza.setAttr('from', self._owner._registered_name) - if self.sm: + if self.sm and self.sm.enabled: self.sm.uqueue.append(stanza) self.sm.out_h = self.sm.out_h + 1 if len(self.sm.uqueue) > self.sm.max_queue: diff -r f1414d3d1317 -r 59a37f1f885f src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Mon Jun 06 23:43:13 2011 -0400 +++ b/src/common/xmpp/smacks.py Tue Jun 07 18:48:53 2011 -0400 @@ -24,7 +24,8 @@ self.max_queue = 5 self._owner = None self.resuming = False - + self.enabled = False # If SM is enabled + def set_owner(self, owner): self._owner = owner @@ -50,6 +51,8 @@ if r == 'false' or r == 'False' or r == '0': self.negociate(False) + + self.enabled = True def negociate(self, resume=True): # Every time we attempt to negociate, we must erase all previous info @@ -69,7 +72,7 @@ log.error('Attempted to resume without a valid session id ') return resume = Acks() - resume.buildResume(self.in_h, self.session_id) + resume.buildResume(self.in_h, None)#self.session_id) self._owner.Connection.send(resume, True) def send_ack(self, disp, stanza): @@ -105,17 +108,28 @@ for i in self.uqueue: self._owner.Connection.send(i, False) - def error_handling(self, disp, stanza): # NEEDS TESTING + def error_handling(self, disp, stanza): - tag = stanza.getTag('item-not-found') # If the server doesn't recognize previd, forget about resuming # Ask for service discovery, etc.. - if tag: + if stanza.getTag('item-not-found'): + self.enabled = False + self.resuming = False self.negociate() - self.resuming = False self.con._discover_server_at_connection(self.con.connection) + return - tag = stanza.getTag('feature-not-implemented') # Doesn't support resumption - if tag: - self.negociate(False) \ No newline at end of file + if stanza.getTag('feature-not-implemented'): + self.enabled = False + self.negociate(False) + return + + if stanza.getTag('unexpected-request'): + self.enabled = False + log.error('Gajim failed to negociate Stream Management') + return + + + + \ No newline at end of file

1 0

gajim-website: update website for 0.14.2 release
by Yann Leboulanger 07 Jun '11

07 Jun '11

changeset 497add889538 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=497add889538 description: update website for 0.14.2 release diffstat: index.php | 39 ++++++++++++++++--------- locale/bg_BG/LC_MESSAGES/msg.po | 54 +++++++++++++++++++++------------- locale/de_DE/LC_MESSAGES/msg.po | 59 ++++++++++++++++++++++---------------- locale/eo/LC_MESSAGES/msg.po | 54 +++++++++++++++++++++------------- locale/es_ES/LC_MESSAGES/msg.po | 59 ++++++++++++++++++++++---------------- locale/fr_FR/LC_MESSAGES/msg.po | 62 +++++++++++++++++++++------------------- locale/hu_HU/LC_MESSAGES/msg.po | 54 +++++++++++++++++++++------------- locale/it_IT/LC_MESSAGES/msg.po | 54 +++++++++++++++++++++------------- locale/pl_PL/LC_MESSAGES/msg.po | 59 ++++++++++++++++++++++---------------- locale/pt_BR/LC_MESSAGES/msg.po | 59 ++++++++++++++++++++++---------------- locale/ru_RU/LC_MESSAGES/msg.po | 58 ++++++++++++++++++++++--------------- msg.pot | 54 +++++++++++++++++++++------------- 12 files changed, 393 insertions(+), 272 deletions(-) diffs (truncated from 1630 to 300 lines): diff -r 18c537d029e7 -r 497add889538 index.php --- a/index.php Sun Jan 09 19:12:37 2011 +0100 +++ b/index.php Tue Jun 07 20:28:40 2011 +0200 @@ -49,38 +49,49 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.14.1"), - 1 => sprintf(_("Gajim %s is here!"), "0.14"), - 2 => sprintf(_("Gajim %s is here!"), "0.13.4")); + 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")); // 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 => _("26 October 2010"), - 1 => _("02 September 2010"), - 2 => _("02 April 2010")); + 0 => _("07 June 2011"), + 1 => _("26 October 2010"), + 2 => _("02 September 2010"), + 3 => _("02 April 2010")); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.14.1"), - 1 => sprintf(_("Version %s of Gajim has been released."), "0.14"), - 2 => sprintf(_("Version %s of Gajim has been released."), "0.13.4")); + 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")); // 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 => sprintf(_("What's new since %s:"), "0.13.4"), - 2 => sprintf(_("What's new since %s:"), "0.13.3")); + 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")); // 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>", + ); + +$array_news_items[1] = 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[1] = array( +$array_news_items[2] = array( 0 => _("Jingle audio / video chat"), 1 => _("Improve startup time"), 2 => _("Groupchat auto-rejoin"), @@ -91,7 +102,7 @@ 7 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14\">"._("List of fixed bugs")."</a>", ); -$array_news_items[2] = array( +$array_news_items[3] = array( 0 => _("Fix some TLS connection"), 1 => _("Don't raise a lot of \"DB Error\" dialog"), 2 => _("Fix contact synchronisation"), diff -r 18c537d029e7 -r 497add889538 locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Sun Jan 09 19:12:37 2011 +0100 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Tue Jun 07 20:28:40 2011 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-04 16:04+0100\n" +"POT-Creation-Date: 2011-06-07 20:26+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,89 +741,101 @@ msgid "NEWS" msgstr "НОВИНИ" -#: index.php:52 index.php:53 index.php:54 +#: index.php:52 index.php:53 index.php:54 index.php:55 #, fuzzy, c-format msgid "Gajim %s is here!" msgstr "Излезе Gajim 0.11!" -#: index.php:60 +#: index.php:61 +msgid "07 June 2011" +msgstr "" + +#: index.php:62 #, fuzzy msgid "26 October 2010" msgstr "19 декември 2006 г." -#: index.php:61 +#: index.php:63 #, fuzzy msgid "02 September 2010" msgstr "19 декември 2006 г." -#: index.php:62 +#: index.php:64 msgid "02 April 2010" msgstr "" -#: index.php:65 index.php:66 index.php:67 +#: index.php:67 index.php:68 index.php:69 index.php:70 #, fuzzy, c-format msgid "Version %s of Gajim has been released." msgstr "Издадена е версия 0.11 на Gajim." -#: index.php:73 index.php:74 index.php:75 +#: index.php:76 index.php:77 index.php:78 index.php:79 #, fuzzy, c-format msgid "What's new since %s:" msgstr "Какво е новото спрямо " -#: index.php:79 index.php:90 +#: index.php:83 +msgid "Fix CPU usage when testing file transfer proxies" +msgstr "" + +#: index.php:84 +msgid "Fix invalid XML char regex" +msgstr "" + +#: index.php:85 index.php:90 index.php:101 msgid "Full ChangeLog" msgstr "Пълен дневник на промените" -#: index.php:79 +#: index.php:85 index.php:90 msgid "Various minor bugfixes, see" msgstr "" -#: index.php:80 index.php:91 +#: index.php:86 index.php:91 index.php:102 msgid "List of fixed bugs" msgstr "" -#: index.php:84 +#: index.php:95 msgid "Jingle audio / video chat" msgstr "" -#: index.php:85 +#: index.php:96 msgid "Improve startup time" msgstr "" -#: index.php:86 +#: index.php:97 msgid "Groupchat auto-rejoin" msgstr "" -#: index.php:87 +#: index.php:98 msgid "Geolocation (with geoclue)" msgstr "" -#: index.php:88 +#: index.php:99 msgid "Use XDG standards" msgstr "" -#: index.php:89 +#: index.php:100 msgid "Handle groupchat captcha" msgstr "" -#: index.php:95 +#: index.php:106 msgid "Fix some TLS connection" msgstr "" -#: index.php:96 +#: index.php:107 msgid "Don't raise a lot of \"DB Error\" dialog" msgstr "" -#: index.php:97 +#: index.php:108 msgid "Fix contact synchronisation" msgstr "" -#: index.php:98 +#: index.php:109 #, fuzzy msgid "Add japanese translation" msgstr "Нов превод: сръбски" -#: index.php:99 +#: index.php:110 msgid "Minor fixes" msgstr "" diff -r 18c537d029e7 -r 497add889538 locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Sun Jan 09 19:12:37 2011 +0100 +++ b/locale/de_DE/LC_MESSAGES/msg.po Tue Jun 07 20:28:40 2011 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-04 16:04+0100\n" +"POT-Creation-Date: 2011-06-07 20:26+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,91 +767,104 @@ msgid "NEWS" msgstr "NEUIGKEITEN" -#: index.php:52 index.php:53 index.php:54 +#: index.php:52 index.php:53 index.php:54 index.php:55 #, c-format msgid "Gajim %s is here!" msgstr "Gajim %s ist da!" -#: index.php:60 +#: index.php:61 +#, fuzzy +msgid "07 June 2011" +msgstr "12. August 2008" + +#: index.php:62 #, fuzzy msgid "26 October 2010" msgstr "22. September 2007" -#: index.php:61 +#: index.php:63 #, fuzzy msgid "02 September 2010" msgstr "22. September 2007" -#: index.php:62 +#: index.php:64 msgid "02 April 2010" msgstr "" -#: index.php:65 index.php:66 index.php:67 +#: index.php:67 index.php:68 index.php:69 index.php:70 #, c-format msgid "Version %s of Gajim has been released." msgstr "Version %s von Gajim wurde veröffentlicht." -#: index.php:73 index.php:74 index.php:75 +#: index.php:76 index.php:77 index.php:78 index.php:79 #, c-format msgid "What's new since %s:" msgstr "Was ist neu seit %s:" -#: index.php:79 index.php:90 +#: index.php:83 +msgid "Fix CPU usage when testing file transfer proxies" +msgstr "" + +#: index.php:84 +msgid "Fix invalid XML char regex" +msgstr "" + +#: index.php:85 index.php:90 index.php:101 msgid "Full ChangeLog" msgstr "Vollständige Veränderungshistorie" -#: index.php:79 +#: index.php:85 index.php:90 msgid "Various minor bugfixes, see" msgstr "" -#: index.php:80 index.php:91 +#: index.php:86 index.php:91 index.php:102 msgid "List of fixed bugs" msgstr "" -#: index.php:84 +#: index.php:95 msgid "Jingle audio / video chat" msgstr "" -#: index.php:85 +#: index.php:96 #, fuzzy msgid "Improve startup time" msgstr "Verbessertes Systemtray-Menü" -#: index.php:86

1 0

gajim: Added tag gajim-0.14.2 for changeset 1543f8fc9950
by Yann Leboulanger 07 Jun '11

07 Jun '11

changeset baf4786b33fe in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=baf4786b33fe description: Added tag gajim-0.14.2 for changeset 1543f8fc9950 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 1543f8fc9950 -r baf4786b33fe .hgtags --- a/.hgtags Tue Jun 07 19:09:00 2011 +0200 +++ b/.hgtags Tue Jun 07 20:23:29 2011 +0200 @@ -4,3 +4,4 @@ 7752eadd1f8c31a3dc282c15d87767a7ba1bd217 gajim-0.12-alpha1 a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 605ca10afd21958f027673d2799332e39d53a75d gajim-0.14 +1543f8fc9950e4f830a1b9c5f9c399a66b5f1cd1 gajim-0.14.2

1 0

gajim: prepare 0.14.2 release
by Yann Leboulanger 07 Jun '11

07 Jun '11

changeset 1543f8fc9950 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1543f8fc9950 description: prepare 0.14.2 release diffstat: ChangeLog | 2 +- configure.ac | 2 +- gajim.nsi | 2 +- setup_win32.py | 2 +- src/common/defs.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diffs (55 lines): diff -r 11dfafb5d6e2 -r 1543f8fc9950 ChangeLog --- a/ChangeLog Thu Oct 28 13:18:37 2010 +0200 +++ b/ChangeLog Tue Jun 07 19:09:00 2011 +0200 @@ -1,4 +1,4 @@ -Gajim 0.14.2 (XX June 2011) +Gajim 0.14.2 (07 June 2011) * Fix CPU usage when testing file transfer proxies * Fix invalid XML char regex diff -r 11dfafb5d6e2 -r 1543f8fc9950 configure.ac --- a/configure.ac Thu Oct 28 13:18:37 2010 +0200 +++ b/configure.ac Tue Jun 07 19:09:00 2011 +0200 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.14.1],[http://trac.gajim.org/],[gajim]) + [0.14.2],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) diff -r 11dfafb5d6e2 -r 1543f8fc9950 gajim.nsi --- a/gajim.nsi Thu Oct 28 13:18:37 2010 +0200 +++ b/gajim.nsi Tue Jun 07 19:09:00 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.1" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.14.2" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 11dfafb5d6e2 -r 1543f8fc9950 setup_win32.py --- a/setup_win32.py Thu Oct 28 13:18:37 2010 +0200 +++ b/setup_win32.py Tue Jun 07 19:09:00 2011 +0200 @@ -49,7 +49,7 @@ setup( name='Gajim', - version='0.14.1', + version='0.14.2', description='A full featured Jabber client', author='Gajim Development Team', url='http://www.gajim.org/', diff -r 11dfafb5d6e2 -r 1543f8fc9950 src/common/defs.py --- a/src/common/defs.py Thu Oct 28 13:18:37 2010 +0200 +++ b/src/common/defs.py Tue Jun 07 19:09:00 2011 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.14.1' +version = '0.14.2' import sys, os.path for base in ('.', 'common'):

1 0

gajim: fix typo
by Yann Leboulanger 07 Jun '11

07 Jun '11

changeset 11dfafb5d6e2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=11dfafb5d6e2 description: fix typo diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ab6d64e6ca00 -r 11dfafb5d6e2 src/gajim.py --- a/src/gajim.py Fri Mar 11 00:35:26 2011 +0300 +++ b/src/gajim.py Thu Oct 28 13:18:37 2010 +0200 @@ -54,7 +54,7 @@ import ctypes.util libintl_path = ctypes.util.find_library('intl') if libintl_path == None: - local_intl = ok.path.join('gtk', 'bin', 'intl.dll') + local_intl = os.path.join('gtk', 'bin', 'intl.dll') if os.path.exists(local_intl): libintl_path = local_intl if libintl_path == None:

1 0

gajim: fixed small bug in dispatcher
by Jefry Lagrange 07 Jun '11

07 Jun '11

changeset f1414d3d1317 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f1414d3d1317 description: fixed small bug in dispatcher diffstat: src/common/xmpp/dispatcher_nb.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r cf0e6fad63c2 -r f1414d3d1317 src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Mon Jun 06 23:34:19 2011 -0400 +++ b/src/common/xmpp/dispatcher_nb.py Mon Jun 06 23:43:13 2011 -0400 @@ -91,7 +91,7 @@ self.getAnID, self.Event, self.send] # Let the dispatcher know if there is support for stream management - self.supports_sm = False + self.sm = None def getAnID(self): global outgoingID @@ -535,7 +535,7 @@ if self._owner._registered_name and not stanza.getAttr('from'): stanza.setAttr('from', self._owner._registered_name) - if self.supports_sm: + if self.sm: self.sm.uqueue.append(stanza) self.sm.out_h = self.sm.out_h + 1 if len(self.sm.uqueue) > self.sm.max_queue:

1 0

gajim: stream resumption (needs testing)
by Jefry Lagrange 07 Jun '11

07 Jun '11

changeset cf0e6fad63c2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cf0e6fad63c2 description: stream resumption (needs testing) diffstat: src/common/connection.py | 19 +++++++-- src/common/xmpp/__init__.py | 1 + src/common/xmpp/auth_nb.py | 13 ++++-- src/common/xmpp/dispatcher_nb.py | 3 +- src/common/xmpp/smacks.py | 77 ++++++++++++++++++++++++++++++++------- 5 files changed, 88 insertions(+), 25 deletions(-) diffs (202 lines): diff -r d8912f584584 -r cf0e6fad63c2 src/common/connection.py --- a/src/common/connection.py Tue May 31 18:05:04 2011 -0400 +++ b/src/common/connection.py Mon Jun 06 23:34:19 2011 -0400 @@ -57,9 +57,9 @@ from common import gpg from common import passwords from common import exceptions - from connection_handlers import * +from xmpp import Smacks from string import Template import logging log = logging.getLogger('gajim.c.connection') @@ -711,6 +711,9 @@ self.private_storage_supported = True self.streamError = '' self.secret_hmac = str(random.random())[2:] + + self.sm = Smacks(self) + gajim.ged.register_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) gajim.ged.register_event_handler('agent-info-error-received', ged.CORE, @@ -1587,12 +1590,18 @@ self.connection.set_send_timeout2(self.pingalives, self.sendPing) self.connection.onreceive(None) - self.request_message_archiving_preferences() + self.privacy_rules_requested = False - self.discoverInfo(gajim.config.get_per('accounts', self.name, 'hostname'), - id_prefix='Gajim_') - + # If we are not resuming, we ask for discovery info + # and archiving preferences + if not self.sm.resuming: + + self.request_message_archiving_preferences() + self.discoverInfo(gajim.config.get_per('accounts', self.name, 'hostname'), + id_prefix='Gajim_') + + self.sm.resuming = False # back to previous state # Discover Stun server(s) gajim.resolver.resolve('_stun._udp.' + helpers.idn_to_ascii( self.connected_hostname), self._on_stun_resolved) diff -r d8912f584584 -r cf0e6fad63c2 src/common/xmpp/__init__.py --- a/src/common/xmpp/__init__.py Tue May 31 18:05:04 2011 -0400 +++ b/src/common/xmpp/__init__.py Mon Jun 06 23:34:19 2011 -0400 @@ -15,3 +15,4 @@ import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors from client_nb import NonBlockingClient from plugin import PlugIn +from smacks import Smacks diff -r d8912f584584 -r cf0e6fad63c2 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Tue May 31 18:05:04 2011 -0400 +++ b/src/common/xmpp/auth_nb.py Mon Jun 06 23:34:19 2011 -0400 @@ -643,13 +643,18 @@ self._owner.User = jid.getNode() self._owner.Resource = jid.getResource() # Only negociate stream management after bounded + sm = self._owner._caller.sm if self.supports_sm: # starts negociation - sm = Smacks(self._owner) - self._owner.Dispatcher.supports_sm = True + if sm._owner and sm.resumption: + sm.set_owner(self._owner) + sm.resume_request() + else: + sm.set_owner(self._owner) + sm.negociate() + self._owner.Dispatcher.sm = sm - sm.negociate() - + if hasattr(self, 'session') and self.session == -1: # Server don't want us to initialize a session log.info('No session required.') diff -r d8912f584584 -r cf0e6fad63c2 src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Tue May 31 18:05:04 2011 -0400 +++ b/src/common/xmpp/dispatcher_nb.py Mon Jun 06 23:34:19 2011 -0400 @@ -420,7 +420,8 @@ typ = '' stanza.props = stanza.getProperties() ID = stanza.getID() - if self.supports_sm and (stanza.getName() != 'r' and + # If server supports stream management + if self.sm != None and (stanza.getName() != 'r' and stanza.getName() != 'a' and stanza.getName() != 'enabled') : # increments the number of stanzas that has been handled diff -r d8912f584584 -r cf0e6fad63c2 src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Tue May 31 18:05:04 2011 -0400 +++ b/src/common/xmpp/smacks.py Mon Jun 06 23:34:19 2011 -0400 @@ -13,15 +13,21 @@ ''' - def __init__(self, owner): - self._owner = owner + def __init__(self, con): + self.con = con # Connection object self.out_h = 0 # Outgoing stanzas handled self.in_h = 0 # Incoming stanzas handled self.uqueue = [] # Unhandled stanzas queue - self.sesion_id = None - self.supports_resume = False # If server supports resume + self.session_id = None + self.resumption = False # If server supports resume # Max number of stanzas in queue before making a request self.max_queue = 5 + self._owner = None + self.resuming = False + + def set_owner(self, owner): + self._owner = owner + # Register handlers owner.Dispatcher.RegisterNamespace(NS_STREAM_MGMT) owner.Dispatcher.RegisterHandler('enabled', self._neg_response @@ -30,19 +36,41 @@ ,xmlns=NS_STREAM_MGMT) owner.Dispatcher.RegisterHandler('a', self.check_ack ,xmlns=NS_STREAM_MGMT) - + owner.Dispatcher.RegisterHandler('resumed', self.check_ack + ,xmlns=NS_STREAM_MGMT) + owner.Dispatcher.RegisterHandler('failed', self.error_handling + ,xmlns=NS_STREAM_MGMT) - def negociate(self): - stanza = Acks() - stanza.buildEnable(resume=True) - self._owner.Connection.send(stanza, now=True) - + def _neg_response(self, disp, stanza): r = stanza.getAttr('resume') - if r == 'true': - self.supports_resume = True - self.sesion_id = stanza.getAttr(id) - + if r == 'true' or r == 'True' or r == '1': + self.resumption = True + self.session_id = stanza.getAttr('id') + + if r == 'false' or r == 'False' or r == '0': + self.negociate(False) + + def negociate(self, resume=True): + # Every time we attempt to negociate, we must erase all previous info + # about any previous session + self.uqueue = [] + self.in_h = 0 + self.out_h = 0 + self.session_id = None + + stanza = Acks() + stanza.buildEnable(resume) + self._owner.Connection.send(stanza, now=True) + + def resume_request(self): + if not self.session_id: + self.resuming = False + log.error('Attempted to resume without a valid session id ') + return + resume = Acks() + resume.buildResume(self.in_h, self.session_id) + self._owner.Connection.send(resume, True) def send_ack(self, disp, stanza): ack = Acks() @@ -70,5 +98,24 @@ while (len(self.uqueue) > diff): self.uqueue.pop(0) - + if stanza.getName() == 'resumed': + self.resuming = True + if self.uqueue != []: + for i in self.uqueue: + self._owner.Connection.send(i, False) + + def error_handling(self, disp, stanza): # NEEDS TESTING + + tag = stanza.getTag('item-not-found') + # If the server doesn't recognize previd, forget about resuming + # Ask for service discovery, etc.. + if tag: + self.negociate() + self.resuming = False + self.con._discover_server_at_connection(self.con.connection) + + tag = stanza.getTag('feature-not-implemented') + # Doesn't support resumption + if tag: + self.negociate(False) \ No newline at end of file

1 0

gajim: Fixed previous changeset and prevent traceback in command...
by Denis Fomin 01 Jun '11

01 Jun '11

changeset ab6d64e6ca00 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ab6d64e6ca00 description: Fixed previous changeset and prevent traceback in command system diffstat: src/command_system/implementation/middleware.py | 2 +- src/groupchat_control.py | 1 + src/message_textview.py | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletions(-) diffs (45 lines): diff -r edd370f95d28 -r ab6d64e6ca00 src/command_system/implementation/middleware.py --- a/src/command_system/implementation/middleware.py Tue May 31 18:01:08 2011 +0200 +++ b/src/command_system/implementation/middleware.py Fri Mar 11 00:35:26 2011 +0300 @@ -120,7 +120,7 @@ Add given text to the input history, so user can scroll through it using ctrl + up/down arrow keys. """ - self.save_sent_message(text) + self.save_message(text, 'sent') @property def connection(self): diff -r edd370f95d28 -r ab6d64e6ca00 src/groupchat_control.py --- a/src/groupchat_control.py Tue May 31 18:01:08 2011 +0200 +++ b/src/groupchat_control.py Fri Mar 11 00:35:26 2011 +0300 @@ -1650,6 +1650,7 @@ label = self.get_seclabel() if message != '' or message != '\n': + self.save_message(message, 'sent') # Send the message gajim.connections[self.account].send_gc_message(self.room_jid, message, xhtml=xhtml, label=label) diff -r edd370f95d28 -r ab6d64e6ca00 src/message_textview.py --- a/src/message_textview.py Tue May 31 18:01:08 2011 +0200 +++ b/src/message_textview.py Fri Mar 11 00:35:26 2011 +0300 @@ -346,6 +346,18 @@ gtk.gdk.CONTROL_MASK, 'mykeypress', int, gtk.keysyms.Down, gtk.gdk.ModifierType, gtk.gdk.CONTROL_MASK) +# CTRL + SHIFT + UP +gtk.binding_entry_add_signal(MessageTextView, gtk.keysyms.Up, + gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK, 'mykeypress', int, + gtk.keysyms.Up, gtk.gdk.ModifierType, gtk.gdk.CONTROL_MASK | + gtk.gdk.SHIFT_MASK) + +# CTRL + SHIFT + DOWN +gtk.binding_entry_add_signal(MessageTextView, gtk.keysyms.Down, + gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK, 'mykeypress', int, + gtk.keysyms.Down, gtk.gdk.ModifierType, gtk.gdk.CONTROL_MASK | + gtk.gdk.SHIFT_MASK) + # ENTER gtk.binding_entry_add_signal(MessageTextView, gtk.keysyms.Return, 0, 'mykeypress', int, gtk.keysyms.Return,

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