Commits June 2008

commits@gajim.org

7 participants
141 discussions

[commit-gajim] r9860 - trunk/src/common/xmpp
by js＠gajim.org 29 Jun '08

29 Jun '08

Author: js Date: 2008-06-29 03:40:49 +0200 (Sun, 29 Jun 2008) New Revision: 9860 Modified: trunk/src/common/xmpp/dispatcher_nb.py Log: Revert r9859 as this killed the stream. This isn't an easy fix, we need to stop using expat in namespace aware mode. Modified: trunk/src/common/xmpp/dispatcher_nb.py =================================================================== --- trunk/src/common/xmpp/dispatcher_nb.py 2008-06-29 01:25:52 UTC (rev 9859) +++ trunk/src/common/xmpp/dispatcher_nb.py 2008-06-29 01:40:49 UTC (rev 9860) @@ -132,13 +132,7 @@ _pendingException = self._pendingExceptions.pop() raise _pendingException[0], _pendingException[1], _pendingException[2] try: - try: - self.Stream.Parse(data) - except ExpatError, (e): - if e[0][:14] == 'unbound prefix': - pass - else: - raise + self.Stream.Parse(data) # end stream:stream tag received if self.Stream and self.Stream.has_received_endtag(): self._owner.Connection.disconnect()

1 0

[commit-gajim] r9859 - trunk/src/common/xmpp
by js＠gajim.org 29 Jun '08

29 Jun '08

Author: js Date: 2008-06-29 03:25:52 +0200 (Sun, 29 Jun 2008) New Revision: 9859 Modified: trunk/src/common/xmpp/dispatcher_nb.py Log: Don't disconnect on unbound prefixes. Fixes #3083. I can't believe this was unfixed for so long, as it's really a rather easy fix. Modified: trunk/src/common/xmpp/dispatcher_nb.py =================================================================== --- trunk/src/common/xmpp/dispatcher_nb.py 2008-06-28 23:05:14 UTC (rev 9858) +++ trunk/src/common/xmpp/dispatcher_nb.py 2008-06-29 01:25:52 UTC (rev 9859) @@ -132,7 +132,13 @@ _pendingException = self._pendingExceptions.pop() raise _pendingException[0], _pendingException[1], _pendingException[2] try: - self.Stream.Parse(data) + try: + self.Stream.Parse(data) + except ExpatError, (e): + if e[0][:14] == 'unbound prefix': + pass + else: + raise # end stream:stream tag received if self.Stream and self.Stream.has_received_endtag(): self._owner.Connection.disconnect()

1 0

[commit-gajim] r9858 - trunk/src
by js＠gajim.org 28 Jun '08

28 Jun '08

Author: js Date: 2008-06-29 01:05:14 +0200 (Sun, 29 Jun 2008) New Revision: 9858 Modified: trunk/src/gajim.py Log: Leopard's X11 is started automagically - we don't need this anymore. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-06-27 21:11:08 UTC (rev 9857) +++ trunk/src/gajim.py 2008-06-28 23:05:14 UTC (rev 9858) @@ -142,19 +142,8 @@ import gtk except Warning, msg: if str(msg) == 'could not open display': - if sys.platform == 'darwin': - # It seems there is no way to open X11 without also - # opening an xterm. Even Apple's open-x11 script - # opens the application AND an xterm. - os.system('/Applications/Utilities/X11.app/Contents/MacOS/X11 &') - try: - import gtk - except Warning, msg: - print >> sys.stderr, _('No X11 running and failed to start it! Quitting...') - sys.exit() - else: - print >> sys.stderr, _('Gajim needs X server to run. Quiting...') - sys.exit() + print >> sys.stderr, _('Gajim needs X server to run. Quiting...') + sys.exit() warnings.resetwarnings() if os.name == 'nt':

1 0

[commit-gajim] r9857 - trunk/src
by steve-e＠gajim.org 27 Jun '08

27 Jun '08

Author: steve-e Date: 2008-06-27 23:11:08 +0200 (Fri, 27 Jun 2008) New Revision: 9857 Modified: trunk/src/dialogs.py Log: Close preset messages popup before closing the status window. Otherwise GTK will freeze when the window is closed after the inactivity timer has expired. Fixes #4052 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-06-27 16:48:05 UTC (rev 9856) +++ trunk/src/dialogs.py 2008-06-27 21:11:08 UTC (rev 9857) @@ -555,6 +555,8 @@ def countdown(self): if self.countdown_enabled: if self.countdown_left <= 0: + # Prevent GUI freeze when the combobox menu is opened on close + self.message_combobox.popdown() self.window.response(gtk.RESPONSE_OK) return False self.window.set_title('%s [%s]' % (self.title_text,

1 0

[commit-gajim] r9856 - trunk/src
by asterix＠gajim.org 27 Jun '08

27 Jun '08

Author: asterix Date: 2008-06-27 18:48:05 +0200 (Fri, 27 Jun 2008) New Revision: 9856 Modified: trunk/src/roster_window.py Log: don't send our presence when we unblock a contact and we are invisible. Fixes #4001 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-27 15:56:09 UTC (rev 9855) +++ trunk/src/roster_window.py 2008-06-27 16:48:05 UTC (rev 9856) @@ -2450,6 +2450,9 @@ privacy_list_received([]) if group_list is None: status = gajim.connections[jid_account].connected + if gajim.SHOW_LIST[status] == 'invisible': + # Don't send our presence if we're invisible + return msg = gajim.connections[jid_account].status if not self.regroup: show = gajim.SHOW_LIST[status] @@ -2462,6 +2465,9 @@ show = gajim.SHOW_LIST[gajim.connections[account].connected] else: # accounts merged show = helpers.get_global_show() + if gajim.SHOW_LIST[show] == 'invisible': + # Don't send our presence if we're invisible + continue if account not in accounts: if gajim.connections[account].privacy_rules_supported: accounts.append(account)

1 0

[commit-gajim] r9855 - trunk/src
by asterix＠gajim.org 27 Jun '08

27 Jun '08

Author: asterix Date: 2008-06-27 17:56:09 +0200 (Fri, 27 Jun 2008) New Revision: 9855 Modified: trunk/src/gajim.py Log: prevent TB when reading pending events. Fixes #4035 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-06-27 15:19:00 UTC (rev 9854) +++ trunk/src/gajim.py 2008-06-27 15:56:09 UTC (rev 9855) @@ -2117,6 +2117,8 @@ event = gajim.events.get_first_event(account, fjid, type_) if not event: event = gajim.events.get_first_event(account, jid, type_) + if not event: + return if type_ == 'printed_chat': ctrl = event.parameters[0]

1 0

[commit-gajim] r9854 - trunk/src/common
by asterix＠gajim.org 27 Jun '08

27 Jun '08

Author: asterix Date: 2008-06-27 17:19:00 +0200 (Fri, 27 Jun 2008) New Revision: 9854 Modified: trunk/src/common/caps.py Log: correctly escape jids in caps Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-06-27 15:07:15 UTC (rev 9853) +++ trunk/src/common/caps.py 2008-06-27 15:19:00 UTC (rev 9854) @@ -201,7 +201,7 @@ # for disco... so that disco will learn how to interpret # these caps - jid=str(presence.getFrom()) + jid = helpers.get_full_jid_from_iq(presence) # start disco query... gajim.capscache.preload(self, jid, node, hash_method, hash)

1 0

[commit-gajim] r9853 - trunk/src/common
by asterix＠gajim.org 27 Jun '08

27 Jun '08

Author: asterix Date: 2008-06-27 17:07:15 +0200 (Fri, 27 Jun 2008) New Revision: 9853 Modified: trunk/src/common/caps.py Log: entity capabilities for groupchat contacts. fixes #4033 Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-06-27 10:50:09 UTC (rev 9852) +++ trunk/src/common/caps.py 2008-06-27 15:07:15 UTC (rev 9853) @@ -206,11 +206,12 @@ # start disco query... gajim.capscache.preload(self, jid, node, hash_method, hash) - contact=gajim.contacts.get_contact_from_full_jid(self.name, jid) - if contact in [None, []]: - return # TODO: a way to put contact not-in-roster into Contacts - elif isinstance(contact, list): - contact = contact[0] + contact = gajim.contacts.get_contact_from_full_jid(self.name, jid) + if contact is None: + room_jid, nick = gajim.get_room_and_nick_from_fjid(jid) + contact = gajim.contacts.get_gc_contact(self.name, room_jid, nick) + if contact is None: + return # TODO: a way to put contact not-in-roster into Contacts # overwriting old data contact.caps_node = node @@ -220,7 +221,10 @@ def _capsDiscoCB(self, jid, node, identities, features, dataforms): contact = gajim.contacts.get_contact_from_full_jid(self.name, jid) if not contact: - return + room_jid, nick = gajim.get_room_and_nick_from_fjid(jid) + contact = gajim.contacts.get_gc_contact(self.name, room_jid, nick) + if contact is None: + return if not contact.caps_node: return # we didn't asked for that? if not node.startswith(contact.caps_node + '#'):

1 0

[commit-gajim] r9852 - trunk/src
by jim++＠gajim.org 27 Jun '08

27 Jun '08

Author: jim++ Date: 2008-06-27 12:50:09 +0200 (Fri, 27 Jun 2008) New Revision: 9852 Modified: trunk/src/gajim.py Log: [erlehmann] Fixed regular URL matching expressions for "-". Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-06-27 10:00:27 UTC (rev 9851) +++ trunk/src/gajim.py 2008-06-27 10:50:09 UTC (rev 9852) @@ -2265,10 +2265,10 @@ # NOTE: it's ok to catch www.gr such stuff exist! #FIXME: recognize xmpp: and treat it specially + links = r"((?<=$)[A-Za-z][A-Za-z0-9\+\.\-]*:"\ + r"([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\($\*\+,;=]|%[A-Fa-f0-9]{2})+"\ + r"(?=\)))|([A-Za-z][A-Za-z0-9\+\.\-]*:([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\*\+,;=]|%[A-Fa-f0-9]{2})+)" - links = r"((?<=$)[A-Za-z][A-Za-z0-9+.-]*:"\ - r"([A-Za-z0-9+\.-_~:/\?#\[\]@!\$&'\($\*\+,;=]|%[A-Fa-f0-9]{2})+"\ - r"(?=\)))|([A-Za-z][A-Za-z0-9+.-]*:([A-Za-z0-9+\.-_~:/\?#\[\]@!\$&'\*\+,;=]|%[A-Fa-f0-9]{2})+)" #2nd one: at_least_one_char(a)at_least_one_char.at_least_one_char mail = r'\bmailto:\S*[^\s\W]|' r'\b\S+(a)\S+\.\S*[^\s\W]'

1 0

[commit-gajim] r9851 - trunk/src
by jim++＠gajim.org 27 Jun '08

27 Jun '08

Author: jim++ Date: 2008-06-27 12:00:27 +0200 (Fri, 27 Jun 2008) New Revision: 9851 Modified: trunk/src/message_window.py Log: Fix ctrl + tab (get_control called with too much parameters) Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-06-27 09:28:26 UTC (rev 9850) +++ trunk/src/message_window.py 2008-06-27 10:00:27 UTC (rev 9851) @@ -623,7 +623,7 @@ ind = ind - 1 if ind < 0: ind = self.notebook.get_n_pages() - 1 - ctrl = self.get_control(ind, None, None) + ctrl = self.get_control(ind, None) if ctrl.get_nb_unread() > 0: found = True break # found

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 June 2008