Commits June 2011

commits@gajim.org

3 participants
49 discussions

gajim: handle read event before close event in case pipe sends u...
by Yann Leboulanger 13 Jun '11

13 Jun '11

changeset 6663ff0619db in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6663ff0619db description: handle read event before close event in case pipe sends us something and close pipe in the same time. diffstat: src/common/xmpp/idlequeue.py | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diffs (37 lines): diff -r d7d9f58d4ca3 -r 6663ff0619db src/common/xmpp/idlequeue.py --- a/src/common/xmpp/idlequeue.py Mon Jun 13 17:58:08 2011 +0200 +++ b/src/common/xmpp/idlequeue.py Fri Oct 29 11:41:38 2010 +0200 @@ -388,6 +388,16 @@ self.unplug_idle(fd) return False + read_write = False + if flags & PENDING_READ: + #print 'waiting read on %d, flags are %d' % (fd, flags) + obj.pollin() + read_write = True + + elif flags & PENDING_WRITE and not flags & IS_CLOSED: + obj.pollout() + read_write = True + if flags & IS_CLOSED: # io error, don't expect more events self.remove_timeout(obj.fd) @@ -395,15 +405,8 @@ obj.pollend() return False - if flags & PENDING_READ: - #print 'waiting read on %d, flags are %d' % (fd, flags) - obj.pollin() + if read_write: return True - - if flags & PENDING_WRITE: - obj.pollout() - return True - return False def process(self):

1 0

gajim: revert 4c810bfd93f8
by Yann Leboulanger 13 Jun '11

13 Jun '11

changeset d7d9f58d4ca3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d7d9f58d4ca3 description: revert 4c810bfd93f8 diffstat: .hgtags | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (9 lines): diff -r 8979e9d6cde1 -r d7d9f58d4ca3 .hgtags --- a/.hgtags Mon Jun 13 17:57:54 2011 +0200 +++ b/.hgtags Mon Jun 13 17:58:08 2011 +0200 @@ -5,5 +5,3 @@ a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 605ca10afd21958f027673d2799332e39d53a75d gajim-0.14 1543f8fc9950e4f830a1b9c5f9c399a66b5f1cd1 gajim-0.14.2 -1543f8fc9950e4f830a1b9c5f9c399a66b5f1cd1 gajim-0.14.2 -0000000000000000000000000000000000000000 gajim-0.14.2

1 0

gajim: revert fa7f5eb03316
by Yann Leboulanger 13 Jun '11

13 Jun '11

changeset 8979e9d6cde1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8979e9d6cde1 description: revert fa7f5eb03316 diffstat: .hgtags | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (9 lines): diff -r c812dfcd4b31 -r 8979e9d6cde1 .hgtags --- a/.hgtags Mon Jun 13 17:57:21 2011 +0200 +++ b/.hgtags Mon Jun 13 17:57:54 2011 +0200 @@ -7,5 +7,3 @@ 1543f8fc9950e4f830a1b9c5f9c399a66b5f1cd1 gajim-0.14.2 1543f8fc9950e4f830a1b9c5f9c399a66b5f1cd1 gajim-0.14.2 0000000000000000000000000000000000000000 gajim-0.14.2 -0000000000000000000000000000000000000000 gajim-0.14.2 -e7f61616edc15fa6fbb766a11dc330707c5ce08d gajim-0.14.2

1 0

gajim: update debian folder for 0.14.2 release
by Yann Leboulanger 13 Jun '11

13 Jun '11

changeset c812dfcd4b31 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c812dfcd4b31 description: update debian folder for 0.14.2 release diffstat: debian/changelog | 7 +++++++ debian/install | 1 + debian/pyversions | 1 - debian/source/format | 2 ++ 4 files changed, 10 insertions(+), 1 deletions(-) diffs (30 lines): diff -r fa7f5eb03316 -r c812dfcd4b31 debian/changelog --- a/debian/changelog Fri Jun 10 19:03:28 2011 +0400 +++ b/debian/changelog Mon Jun 13 17:57:21 2011 +0200 @@ -1,3 +1,10 @@ +gajim (0.14.2-1) unstable; urgency=low + + * New upstream release. + * Fix CPU usage when testing file transfer proxies. Closes: #626576 + + -- Yann Leboulanger <asterix(a)lagaule.org> Tue, 07 Jun 2011 19:30:43 +0200 + gajim (0.14.1-1) unstable; urgency=low [ Yann Leboulanger ] diff -r fa7f5eb03316 -r c812dfcd4b31 debian/install --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/install Mon Jun 13 17:57:21 2011 +0200 @@ -0,0 +1,1 @@ +debian/gajim.xpm usr/share/pixmaps diff -r fa7f5eb03316 -r c812dfcd4b31 debian/pyversions --- a/debian/pyversions Fri Jun 10 19:03:28 2011 +0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -2.5- diff -r fa7f5eb03316 -r c812dfcd4b31 debian/source/format --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/source/format Mon Jun 13 17:57:21 2011 +0200 @@ -0,0 +1,2 @@ +3.0 (quilt) +

1 0

gajim: only resume when disconnected not on purpose
by Jefry Lagrange 11 Jun '11

11 Jun '11

changeset f8d257de1052 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f8d257de1052 description: only resume when disconnected not on purpose diffstat: src/common/connection.py | 2 ++ src/common/xmpp/dispatcher_nb.py | 6 +++--- src/common/xmpp/smacks.py | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diffs (45 lines): diff -r 9add3fbe02dc -r f8d257de1052 src/common/connection.py --- a/src/common/connection.py Fri Jun 10 23:07:34 2011 -0400 +++ b/src/common/connection.py Sat Jun 11 16:29:08 2011 -0400 @@ -776,6 +776,8 @@ self.connected = 0 self.time_to_reconnect = None self.privacy_rules_supported = False + if on_purpose: + self.sm = Smacks(self) if self.connection: # make sure previous connection is completely closed gajim.proxy65_manager.disconnect(self.connection) diff -r 9add3fbe02dc -r f8d257de1052 src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Fri Jun 10 23:07:34 2011 -0400 +++ b/src/common/xmpp/dispatcher_nb.py Sat Jun 11 16:29:08 2011 -0400 @@ -421,9 +421,9 @@ stanza.props = stanza.getProperties() ID = stanza.getID() # If server supports stream management - if self.sm and self.sm.enabled and (stanza.getName() != 'r' or - stanza.getName() != 'a' or - stanza.getName() != 'enabled' or + if self.sm and self.sm.enabled and (stanza.getName() != 'r' and + stanza.getName() != 'a' and + stanza.getName() != 'enabled' and stanza.getName() != 'resumed'): # increments the number of stanzas that has been handled self.sm.in_h = self.sm.in_h + 1 diff -r 9add3fbe02dc -r f8d257de1052 src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Fri Jun 10 23:07:34 2011 -0400 +++ b/src/common/xmpp/smacks.py Sat Jun 11 16:29:08 2011 -0400 @@ -96,10 +96,10 @@ if len(self.uqueue) < diff or diff < 0: log.error('Server and client number of stanzas handled mismatch ') - return + else: - while (len(self.uqueue) > diff): - self.uqueue.pop(0) + while (len(self.uqueue) > diff): + self.uqueue.pop(0) if stanza.getName() == 'resumed':

1 0

gajim: resuming before binding
by Jefry Lagrange 11 Jun '11

11 Jun '11

changeset 9add3fbe02dc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9add3fbe02dc description: resuming before binding diffstat: src/common/connection.py | 7 ++++--- src/common/xmpp/auth_nb.py | 16 ++++++++-------- src/common/xmpp/client_nb.py | 14 +++++++++++++- src/common/xmpp/smacks.py | 2 +- 4 files changed, 26 insertions(+), 13 deletions(-) diffs (115 lines): diff -r c4c20e97cadd -r 9add3fbe02dc src/common/connection.py --- a/src/common/connection.py Tue Jun 07 23:50:45 2011 -0400 +++ b/src/common/connection.py Fri Jun 10 23:07:34 2011 -0400 @@ -712,7 +712,7 @@ self.streamError = '' self.secret_hmac = str(random.random())[2:] - self.sm = Smacks(self) + self.sm = Smacks(self) # Stream Management gajim.ged.register_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) @@ -805,8 +805,9 @@ self.old_show = gajim.SHOW_LIST[self.connected] self.connected = 0 if not self.on_purpose: - gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, - show='offline')) + if not (self.sm and self.sm.resumption): + gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, + show='offline')) self.disconnect() if gajim.config.get_per('accounts', self.name, 'autoreconnect'): self.connected = -1 diff -r c4c20e97cadd -r 9add3fbe02dc src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Tue Jun 07 23:50:45 2011 -0400 +++ b/src/common/xmpp/auth_nb.py Fri Jun 10 23:07:34 2011 -0400 @@ -574,6 +574,7 @@ PlugIn.__init__(self) self.bound = None self.supports_sm = False + self.resuming = False def plugin(self, owner): ''' Start resource binding, if allowed at this time. Used internally. ''' @@ -597,6 +598,8 @@ if feats.getTag('sm', namespace=NS_STREAM_MGMT): self.supports_sm = True # server supports stream management + if self.resuming: + self._owner._caller.sm.resume_request() if not feats.getTag('bind', namespace=NS_BIND): log.info('Server does not requested binding.') @@ -621,6 +624,8 @@ """ Perform binding. Use provided resource name or random (if not provided). """ + if self.resuming: # We don't bind if we resume the stream + return self.on_bound = on_bound self._resource = resource if self._resource: @@ -646,13 +651,8 @@ sm = self._owner._caller.sm if self.supports_sm: # starts negociation - if sm._owner and sm.resumption: - sm.set_owner(self._owner) - sm.resume_request() - else: - sm.set_owner(self._owner) - sm.negociate() - + sm.set_owner(self._owner) + sm.negociate() self._owner.Dispatcher.sm = sm if hasattr(self, 'session') and self.session == -1: @@ -670,7 +670,7 @@ else: log.info('Binding failed: timeout expired.') self.on_bound(None) - + def _on_session(self, resp): self._owner.onreceive(None) if isResultNode(resp): diff -r c4c20e97cadd -r 9add3fbe02dc src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Tue Jun 07 23:50:45 2011 -0400 +++ b/src/common/xmpp/client_nb.py Fri Jun 10 23:07:34 2011 -0400 @@ -521,8 +521,20 @@ self.connected = None # FIXME: is this intended? We use ''elsewhere self._on_sasl_auth(None) elif self.SASL.startsasl == 'success': - auth_nb.NonBlockingBind.get_instance().PlugIn(self) + nb_bind = auth_nb.NonBlockingBind.get_instance() + sm = self._caller.sm + if sm._owner and sm.resumption: + nb_bind.resuming = True + sm.set_owner(self) + self.Dispatcher.sm = sm + nb_bind.PlugIn(self) + return + + + nb_bind.PlugIn(self) self.onreceive(self._on_auth_bind) + + return True def _on_auth_bind(self, data): diff -r c4c20e97cadd -r 9add3fbe02dc src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Tue Jun 07 23:50:45 2011 -0400 +++ b/src/common/xmpp/smacks.py Fri Jun 10 23:07:34 2011 -0400 @@ -73,7 +73,7 @@ return resume = Acks() resume.buildResume(self.in_h, self.session_id) - self._owner.Connection.send(resume, True) + self._owner.Connection.send(resume, False) def send_ack(self, disp, stanza): ack = Acks()

1 0

gajim: Added tag gajim-0.14.2 for changeset e7f61616edc1
by Denis Fomin 10 Jun '11

10 Jun '11

changeset fa7f5eb03316 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fa7f5eb03316 description: Added tag gajim-0.14.2 for changeset e7f61616edc1 diffstat: .hgtags | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (9 lines): diff -r 4c810bfd93f8 -r fa7f5eb03316 .hgtags --- a/.hgtags Fri Jun 10 19:03:09 2011 +0400 +++ b/.hgtags Fri Jun 10 19:03:28 2011 +0400 @@ -7,3 +7,5 @@ 1543f8fc9950e4f830a1b9c5f9c399a66b5f1cd1 gajim-0.14.2 1543f8fc9950e4f830a1b9c5f9c399a66b5f1cd1 gajim-0.14.2 0000000000000000000000000000000000000000 gajim-0.14.2 +0000000000000000000000000000000000000000 gajim-0.14.2 +e7f61616edc15fa6fbb766a11dc330707c5ce08d gajim-0.14.2

1 0

gajim: Removed tag gajim-0.14.2
by Denis Fomin 10 Jun '11

10 Jun '11

changeset 4c810bfd93f8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4c810bfd93f8 description: Removed tag gajim-0.14.2 diffstat: .hgtags | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (9 lines): diff -r e7f61616edc1 -r 4c810bfd93f8 .hgtags --- a/.hgtags Sat Nov 27 13:07:58 2010 +0300 +++ b/.hgtags Fri Jun 10 19:03:09 2011 +0400 @@ -5,3 +5,5 @@ a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 605ca10afd21958f027673d2799332e39d53a75d gajim-0.14 1543f8fc9950e4f830a1b9c5f9c399a66b5f1cd1 gajim-0.14.2 +1543f8fc9950e4f830a1b9c5f9c399a66b5f1cd1 gajim-0.14.2 +0000000000000000000000000000000000000000 gajim-0.14.2

1 0

gajim: Fix broken history
by Denis Fomin 10 Jun '11

10 Jun '11

changeset e7f61616edc1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e7f61616edc1 description: Fix broken history diffstat: src/conversation_textview.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r baf4786b33fe -r e7f61616edc1 src/conversation_textview.py --- a/src/conversation_textview.py Tue Jun 07 20:23:29 2011 +0200 +++ b/src/conversation_textview.py Sat Nov 27 13:07:58 2010 +0300 @@ -1041,6 +1041,7 @@ tags = [] use_other_tags = True text_is_valid_uri = False + is_xhtml_link = None show_ascii_formatting_chars = \ gajim.config.get('show_ascii_formatting_chars') buffer_ = self.tv.get_buffer()

1 0

gajim-website: update downloads page
by Yann Leboulanger 08 Jun '11

08 Jun '11

changeset 2bcc1b6581ff in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=2bcc1b6581ff description: update downloads page diffstat: downloads.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 497add889538 -r 2bcc1b6581ff downloads.php --- a/downloads.php Tue Jun 07 20:28:40 2011 +0200 +++ b/downloads.php Wed Jun 08 09:01:42 2011 +0200 @@ -5,7 +5,7 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); $download_folder = "0.14"; -$last_version = "0.14.1"; +$last_version = "0.14.2"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; #printf(_(" A %s version is in test"), "0.13-rc5"); @@ -143,7 +143,7 @@ print (" </h2>\n"); print ("</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."-3.exe\">"._("Gajim installer")."</a>.\n"; +print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-1.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.13/gajim-0.13-rc5.exe\">"._("Gajim installer")."</a> ";

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