Commits May 2008

commits@gajim.org

9 participants
181 discussions

[commit-gajim] r9689 - trunk
by asterix＠gajim.org 20 May '08

20 May '08

Author: asterix Date: 2008-05-20 13:33:11 +0200 (Tue, 20 May 2008) New Revision: 9689 Modified: trunk/setup_win32.py Log: re-enable docutils inclusion in windows built. Used by RST generator Modified: trunk/setup_win32.py =================================================================== --- trunk/setup_win32.py 2008-05-20 00:44:30 UTC (rev 9688) +++ trunk/setup_win32.py 2008-05-20 11:33:11 UTC (rev 9689) @@ -31,7 +31,7 @@ opts = { 'py2exe': { - 'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*', #',docutils.readers.*,docutils.writers.html4css1', + 'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,docutils.readers.*,docutils.writers.html4css1', 'dll_excludes': [ 'iconv.dll','intl.dll','libatk-1.0-0.dll', 'libgdk_pixbuf-2.0-0.dll','libgdk-win32-2.0-0.dll',

1 0

[commit-gajim] r9688 - in trunk/src: . common
by bct＠gajim.org 20 May '08

20 May '08

Author: bct Date: 2008-05-20 02:44:30 +0200 (Tue, 20 May 2008) New Revision: 9688 Modified: trunk/src/common/connection_handlers.py trunk/src/common/gajim.py trunk/src/message_control.py trunk/src/session.py Log: moved OTR stuff from session.received to connection._messageCB fixed lock icon when session has been terminated Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-05-19 21:31:25 UTC (rev 9687) +++ trunk/src/common/connection_handlers.py 2008-05-20 00:44:30 UTC (rev 9688) @@ -1691,6 +1691,87 @@ addressTag = msg.getTag('addresses', namespace = common.xmpp.NS_ADDRESS) + # I don't trust libotr, that's why I only pass the + # message to it if it either contains the magic + # ?OTR string or a plaintext tagged message. + if gajim.otr_module and \ + isinstance(msgtxt, unicode) and \ + ('\x20\x09\x20\x20\x09\x09\x09\x09\x20\x09\x20\x09\x20\x09\x20\x20' \ + in msgtxt or '?OTR' in msgtxt): + # If it doesn't include ?OTR, it wasn't an + # encrypted message, but a tagged plaintext + # message. + if '?OTR' in msgtxt: + encrypted = True + + # TODO: Do we really need .encode()? + otr_msg_tuple = \ + gajim.otr_module.otrl_message_receiving( + self.otr_userstates, + (gajim.otr_ui_ops, {'account': self.name}), + gajim.get_jid_from_account(self.name).encode(), + gajim.OTR_PROTO, + frm.encode(), + msgtxt.encode(), + (gajim.otr_add_appdata, self.name)) + msgtxt = unicode(otr_msg_tuple[1]) + xhtml = None + + if gajim.otr_module.otrl_tlv_find( + otr_msg_tuple[2], + gajim.otr_module.OTRL_TLV_DISCONNECTED) != None: + gajim.otr_ui_ops.gajim_log(_('%s ' \ + 'has ended his/her private ' \ + 'conversation with you.') % frm, + self.name, + frm.encode()) + + # The other end closed the connection, + # so we do the same. + gajim.otr_module. \ + otrl_message_disconnect( + self.otr_userstates, + (gajim.otr_ui_ops, + {'account': self.name, + 'urgent': True}), + gajim.get_jid_from_account( + self.name).encode(), + gajim.OTR_PROTO, + frm.encode()) + + ctrls = gajim.interface.msg_win_mgr.get_chat_controls(jid, self.name) + for ctrl in ctrls: + ctrl.update_otr() + + ctx = gajim.otr_module. \ + otrl_context_find( + self.otr_userstates, + frm.encode(), + gajim.get_jid_from_account( + self.name).encode(), + gajim.OTR_PROTO, 1, + (gajim.otr_add_appdata, + self.name))[0] + tlvs = otr_msg_tuple[2] + ctx.app_data.handle_tlv(tlvs) + + if msgtxt == '': + return + elif msgtxt != None and msgtxt != '': + gajim.otr_dont_append_tag[frm] = True + + # We're also here if we just don't + # support OTR. Thus, we should strip + # the tags from plaintext messages + # since they look ugly. + msgtxt = msgtxt.replace('\x20\x09\x20' \ + '\x20\x09\x09\x09\x09\x20\x09' \ + '\x20\x09\x20\x09\x20\x20', '') + msgtxt = msgtxt.replace('\x20\x09\x20' \ + '\x09\x20\x20\x09\x20', '') + msgtxt = msgtxt.replace('\x20\x20\x09' \ + '\x09\x20\x20\x09\x20', '') + # Be sure it comes from one of our resource, else ignore address element if addressTag and jid == gajim.get_jid_from_account(self.name): address = addressTag.getTag('address', attrs={'type': 'ofrom'}) Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2008-05-19 21:31:25 UTC (rev 9687) +++ trunk/src/common/gajim.py 2008-05-20 00:44:30 UTC (rev 9688) @@ -169,6 +169,9 @@ otr_userstates = {} otr_policy = {} +# list of (full) jids not to attempt OTR with +otr_dont_append_tag = {} + gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} gajim_common_features = [xmpp.NS_BYTESTREAM, xmpp.NS_SI, xmpp.NS_FILE, xmpp.NS_MUC, xmpp.NS_MUC_USER, Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2008-05-19 21:31:25 UTC (rev 9687) +++ trunk/src/message_control.py 2008-05-20 00:44:30 UTC (rev 9688) @@ -147,8 +147,7 @@ jid = self.contact.jid original_message = message - if gajim.otr_module and (self.session.append_otr_tag or \ - message == '?OTR?'): + if gajim.otr_module and jid not in gajim.otr_dont_append_tag: if type == 'chat' and isinstance(message, unicode): d = {'kwargs': {'keyID': keyID, 'type': type, 'chatstate': chatstate, Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-05-19 21:31:25 UTC (rev 9687) +++ trunk/src/session.py 2008-05-20 00:44:30 UTC (rev 9688) @@ -18,7 +18,6 @@ stanza_session.EncryptedStanzaSession.__init__(self, conn, jid, thread_id, type = 'chat') self.control = None - self.append_otr_tag = True def acknowledge_termination(self): # the other party terminated the session. we'll keep the control around, though. @@ -82,90 +81,6 @@ return log_type = 'chat_msg_recv' - - # I don't trust libotr, that's why I only pass the - # message to it if it either contains the magic - # ?OTR string or a plaintext tagged message. - if gajim.otr_module and \ - isinstance(msgtxt, unicode) and \ - (msgtxt.find('?OTR') != -1 or msgtxt.find( - '\x20\x09\x20\x20\x09\x09\x09\x09' \ - '\x20\x09\x20\x09\x20\x09\x20\x20') != -1): - # If it doesn't include ?OTR, it wasn't an - # encrypted message, but a tagged plaintext - # message. - if msgtxt.find('?OTR') != -1: - encrypted = True - - # TODO: Do we really need .encode()? - otr_msg_tuple = \ - gajim.otr_module.otrl_message_receiving( - self.conn.otr_userstates, - (gajim.otr_ui_ops, - {'account': self.conn.name}), - gajim.get_jid_from_account( - self.conn.name).encode(), - gajim.OTR_PROTO, - full_jid_with_resource.encode(), - msgtxt.encode(), - (gajim.otr_add_appdata, self.conn.name)) - msgtxt = unicode(otr_msg_tuple[1]) - xhtml = None - - if gajim.otr_module.otrl_tlv_find( - otr_msg_tuple[2], - gajim.otr_module.OTRL_TLV_DISCONNECTED) != None: - gajim.otr_ui_ops.gajim_log(_('%s ' \ - 'has ended his/her private ' \ - 'conversation with you.') % \ - full_jid_with_resource, - self.conn.name, - full_jid_with_resource.encode()) - - # The other end closed the connection, - # so we do the same. - gajim.otr_module. \ - otrl_message_disconnect( - self.conn.otr_userstates, - (gajim.otr_ui_ops, - {'account': self.conn.name, - 'urgent': True}), - gajim.get_jid_from_account( - self.conn.name).encode(), - gajim.OTR_PROTO, - full_jid_with_resource.encode()) - - if self.control: - self.control.update_otr() - - ctx = gajim.otr_module. \ - otrl_context_find( - self.conn.otr_userstates, - full_jid_with_resource.encode(), - gajim.get_jid_from_account( - self.conn.name).encode(), - gajim.OTR_PROTO, 1, - (gajim.otr_add_appdata, - self.conn.name))[0] - tlvs = otr_msg_tuple[2] - ctx.app_data.handle_tlv(tlvs) - - if msgtxt == '': - return - elif msgtxt != None and msgtxt != '': - self.append_otr_tag = False - - # We're also here if we just don't - # support OTR. Thus, we should strip - # the tags from plaintext messages - # since they look ugly. - msgtxt = msgtxt.replace('\x20\x09\x20' \ - '\x20\x09\x09\x09\x09\x20\x09' \ - '\x20\x09\x20\x09\x20\x20', '') - msgtxt = msgtxt.replace('\x20\x09\x20' \ - '\x09\x20\x20\x09\x20', '') - msgtxt = msgtxt.replace('\x20\x20\x09' \ - '\x09\x20\x20\x09\x20', '') else: log_type = 'single_msg_recv' @@ -246,6 +161,7 @@ # contact is not in the roster, create a fake one to display # notification contact = contacts.Contact(jid = jid, resource = resource) + advanced_notif_num = notify.get_advanced_notification('message_received', self.conn.name, contact)

1 0

[commit-gajim] r9687 - trunk/src
by steve-e＠gajim.org 19 May '08

19 May '08

Author: steve-e Date: 2008-05-19 23:31:25 +0200 (Mon, 19 May 2008) New Revision: 9687 Modified: trunk/src/tooltips.py Log: Show pep tooltip info also for multiple resources and SelfContacts. (Tooltips might not be complete because of some not yet addressed backend bugs) Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-05-19 21:17:43 UTC (rev 9686) +++ trunk/src/tooltips.py 2008-05-19 21:31:25 UTC (rev 9687) @@ -392,7 +392,6 @@ self.win.add(self.table) return - # primary contact prim_contact = gajim.contacts.get_highest_prio_contact_from_contacts( contacts) @@ -463,11 +462,8 @@ self.add_status_row(file_path, icon_name, status_line, contact.last_status_time) properties.append((self.table, None)) - else: # only one resource - #FIXME: User {Mood, Activity, Tune} not shown if there are - #multiple resources - #FIXME: User {Mood, Activity, Tune} not shown for self + else: # only one resource if contact.show: show = helpers.get_uf_show(contact.show) if contact.last_status_time: @@ -499,58 +495,6 @@ show = '' + show + '' # we append show below - if contact.mood.has_key('mood'): - mood = contact.mood['mood'].strip() - # translate it - mood = helpers.get_uf_mood(mood) - mood = gobject.markup_escape_text(mood) - mood_string = _('Mood:') + ' %s' % mood - if contact.mood.has_key('text') and contact.mood['text'] != '': - mood_text = contact.mood['text'].strip() - mood_text = gobject.markup_escape_text(mood_text) - mood_string += ' (%s)' % mood_text - properties.append((mood_string, None)) - - if contact.activity.has_key('activity'): - activity = contact.activity['activity'].strip() - # translate it - activity = helpers.get_uf_activity(activity) - activity = gobject.markup_escape_text(activity) - activity_string = _('Activity:') + ' %s' % activity - if contact.activity.has_key('subactivity'): - activity_sub = contact.activity['subactivity'].strip() - # translate it - activity_sub = helpers.get_uf_activity(activity_sub) - activity_sub = gobject.markup_escape_text(activity_sub) - activity_string += ' (%s)' % activity_sub - else: - activity_string += '' - if contact.activity.has_key('text'): - activity_text = contact.activity['text'].strip() - activity_text = gobject.markup_escape_text(activity_text) - activity_string += ' (%s)' % activity_text - properties.append((activity_string, None)) - - if contact.tune.has_key('artist') or contact.tune.has_key('title'): - if contact.tune.has_key('artist'): - artist = contact.tune['artist'].strip() - artist = gobject.markup_escape_text(artist) - else: - artist = _('Unknown Artist') - if contact.tune.has_key('title'): - title = contact.tune['title'].strip() - title = gobject.markup_escape_text(title) - else: - title = _('Unknown Title') - if contact.tune.has_key('source'): - source = contact.tune['source'].strip() - source = gobject.markup_escape_text(source) - else: - source = _('Unknown Source') - tune_string = _('Tune:') + ' ' + _('"%(title)s" by %(artist)s\nfrom %(source)s' %\ - {'title': title, 'artist': artist, 'source': source}) - properties.append((tune_string, None)) - if contact.status: status = contact.status.strip() if status: @@ -562,6 +506,8 @@ status = gobject.markup_escape_text(status) properties.append(('%s' % status, None)) properties.append((show, None)) + + self._append_pep_info(contact, properties) properties.append((_('Jabber ID: '), prim_contact.jid )) @@ -620,6 +566,57 @@ vcard_current_row + 1, gtk.FILL, gtk.FILL | gtk.EXPAND, 3, 3) self.win.add(vcard_table) + def _append_pep_info(self, contact, properties): + '''Append Tune, Mood, Activity information of the specified contact + to the given property list. + ''' + if contact.mood.has_key('mood'): + mood = contact.mood['mood'].strip() + mood = gobject.markup_escape_text(mood) + mood_string = _('Mood:') + ' %s' % mood + if contact.mood.has_key('text') and contact.mood['text'] != '': + mood_text = contact.mood['text'].strip() + mood_text = gobject.markup_escape_text(mood_text) + mood_string += ' (%s)' % mood_text + properties.append((mood_string, None)) + + if contact.activity.has_key('activity'): + activity = contact.activity['activity'].strip() + activity = gobject.markup_escape_text(activity) + activity_string = _('Activity:') + ' %s' % activity + if contact.activity.has_key('subactivity'): + activity_sub = contact.activity['subactivity'].strip() + activity_sub = gobject.markup_escape_text(activity_sub) + activity_string += ' (%s)' % activity_sub + else: + activity_string += '' + if contact.activity.has_key('text'): + activity_text = contact.activity['text'].strip() + activity_text = gobject.markup_escape_text(activity_text) + activity_string += ' (%s)' % activity_text + properties.append((activity_string, None)) + + if contact.tune.has_key('artist') or contact.tune.has_key('title'): + if contact.tune.has_key('artist'): + artist = contact.tune['artist'].strip() + artist = gobject.markup_escape_text(artist) + else: + artist = _('Unknown Artist') + if contact.tune.has_key('title'): + title = contact.tune['title'].strip() + title = gobject.markup_escape_text(title) + else: + title = _('Unknown Title') + if contact.tune.has_key('source'): + source = contact.tune['source'].strip() + source = gobject.markup_escape_text(source) + else: + source = _('Unknown Source') + tune_string = _('Tune:') + ' ' + _('"%(title)s" by %(artist)s\nfrom %(source)s' %\ + {'title': title, 'artist': artist, 'source': source}) + properties.append((tune_string, None)) + + class FileTransfersTooltip(BaseTooltip): ''' Tooltip that is shown in the notification area ''' def __init__(self):

1 0

[commit-gajim] r9686 - trunk/src
by steve-e＠gajim.org 19 May '08

19 May '08

Author: steve-e Date: 2008-05-19 23:17:43 +0200 (Mon, 19 May 2008) New Revision: 9686 Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: Always remove contacts from GUI when we receive a roster via xmppy. This fixes a bug with metacontacts over different groups and should stop contact duplication in most cases. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-05-19 20:25:58 UTC (rev 9685) +++ trunk/src/gajim.py 2008-05-19 21:17:43 UTC (rev 9686) @@ -652,6 +652,8 @@ def handle_event_roster(self, account, data): #('ROSTER', account, array) + # FIXME: Those methods depend to highly on each other + # and the order in which they are called self.roster.fill_contacts_and_groups_dicts(data, account) self.roster.add_account_contacts(account) self.roster.fire_up_unread_messages_events(account) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-05-19 20:25:58 UTC (rev 9685) +++ trunk/src/roster_window.py 2008-05-19 21:17:43 UTC (rev 9686) @@ -1501,11 +1501,15 @@ def fill_contacts_and_groups_dicts(self, array, account): '''fill gajim.contacts and gajim.groups''' + # FIXME: This function needs to be splitted + # Most of the logic SHOULD NOT be done at GUI level if account not in gajim.contacts.get_accounts(): gajim.contacts.add_account(account) if not gajim.groups.has_key(account): gajim.groups[account] = {} for jid in array.keys(): + # Remove the contact in roster. It might has changed + self.remove_contact(jid, account) # Remove old Contact instances gajim.contacts.remove_jid(account, jid, remove_meta=False) jids = jid.split('/')

1 0

[commit-gajim] r9685 - trunk/src
by js＠gajim.org 19 May '08

19 May '08

Author: js Date: 2008-05-19 22:25:58 +0200 (Mon, 19 May 2008) New Revision: 9685 Modified: trunk/src/message_control.py Log: Always pass the special message '?OTR?' to libotr. Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2008-05-19 20:13:24 UTC (rev 9684) +++ trunk/src/message_control.py 2008-05-19 20:25:58 UTC (rev 9685) @@ -147,7 +147,8 @@ jid = self.contact.jid original_message = message - if gajim.otr_module and self.session.append_otr_tag: + if gajim.otr_module and (self.session.append_otr_tag or \ + message == '?OTR?'): if type == 'chat' and isinstance(message, unicode): d = {'kwargs': {'keyID': keyID, 'type': type, 'chatstate': chatstate,

1 0

[commit-gajim] r9684 - trunk/src
by js＠gajim.org 19 May '08

19 May '08

Author: js Date: 2008-05-19 22:13:24 +0200 (Mon, 19 May 2008) New Revision: 9684 Modified: trunk/src/chat_control.py trunk/src/gajim.py Log: Revert r9682, it was a bad idea. The solution is not to send the thread id, but to even remove the lock symbol when OTR was ended and we don't have a thread id. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-05-19 20:08:32 UTC (rev 9683) +++ trunk/src/chat_control.py 2008-05-19 20:13:24 UTC (rev 9684) @@ -2406,9 +2406,8 @@ def _on_end_otr_menuitem_activate(self, widget): fjid = self.contact.get_full_jid() gajim.otr_module.otrl_message_disconnect( - self.session.conn.otr_userstates, - (gajim.otr_ui_ops, {'account': self.account, - 'urgent': True, 'session': self.session}), + self.session.conn.otr_userstates, (gajim.otr_ui_ops, + {'account': self.account, 'urgent': True}), gajim.get_jid_from_account(self.account).encode(), gajim.OTR_PROTO, fjid.encode()) gajim.otr_ui_ops.gajim_log(_('Private conversation with ' \ Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-05-19 20:08:32 UTC (rev 9683) +++ trunk/src/gajim.py 2008-05-19 20:13:24 UTC (rev 9684) @@ -375,9 +375,6 @@ # disconnect from OTR sessions before quitting stanza = XmppMessage(to = recipient, body = message, typ='chat') - if 'session' in opdata: - stanza.setThread(opdata['session'].thread_id) - gajim.connections[opdata['account']].connection. \ send(stanza, now = True) return

1 0

[commit-gajim] r9683 - trunk/src
by steve-e＠gajim.org 19 May '08

19 May '08

Author: steve-e Date: 2008-05-19 22:08:32 +0200 (Mon, 19 May 2008) New Revision: 9683 Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: Remove some extra model refiltering. Whenever we write to the underlying child_model gtk will call the _visible_func on itself. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-05-19 20:04:48 UTC (rev 9682) +++ trunk/src/gajim.py 2008-05-19 20:08:32 UTC (rev 9683) @@ -910,7 +910,6 @@ # It must be an agent if ji in jid_list: # Update existing iter - self.roster.modelfilter.refilter() self.roster.draw_contact(ji, account) self.roster.draw_group(_('Transports'), account) if new_show > 1 and ji in gajim.transport_avatar[account]: Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-05-19 20:04:48 UTC (rev 9682) +++ trunk/src/roster_window.py 2008-05-19 20:08:32 UTC (rev 9683) @@ -829,8 +829,6 @@ if jid in gajim.newly_added[account]: gajim.newly_added[account].remove(jid) self.draw_contact(jid, account) - # redraw group visibility - self.refilter_shown_roster_items() # FIXME: maybe move to gajim.py def remove_to_be_removed(self, jid, account): @@ -842,7 +840,6 @@ if jid in gajim.to_be_removed[account]: gajim.to_be_removed[account].remove(jid) self.draw_contact(jid, account) - self.refilter_shown_roster_items() #FIXME: integrate into add_contact() def add_to_not_in_the_roster(self, account, jid, nick = '', resource = ''):

1 0

[commit-gajim] r9682 - trunk/src
by js＠gajim.org 19 May '08

19 May '08

Author: js Date: 2008-05-19 22:04:48 +0200 (Mon, 19 May 2008) New Revision: 9682 Modified: trunk/src/chat_control.py trunk/src/gajim.py Log: Send thread ID on ending OTR session so that self.session is defined when that event is received and the lock icon updated. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-05-19 20:04:14 UTC (rev 9681) +++ trunk/src/chat_control.py 2008-05-19 20:04:48 UTC (rev 9682) @@ -2402,15 +2402,17 @@ def _on_start_otr_menuitem_activate(self, widget): # ?OTR? gets replaced with a better message internally in otrl_message_sending - MessageControl.send_message(self, u"?OTR?", type="chat") + MessageControl.send_message(self, u'?OTR?', type='chat') def _on_end_otr_menuitem_activate(self, widget): fjid = self.contact.get_full_jid() - gajim.otr_module.otrl_message_disconnect(gajim.connections[self.account].otr_userstates, - (gajim.otr_ui_ops, {'account':self.account,'urgent':True}), - gajim.get_jid_from_account(self.account).encode(), gajim.OTR_PROTO, - fjid.encode()) - gajim.otr_ui_ops.gajim_log("Private conversation with %s lost."%fjid, - self.account, fjid.encode()) + gajim.otr_module.otrl_message_disconnect( + self.session.conn.otr_userstates, + (gajim.otr_ui_ops, {'account': self.account, + 'urgent': True, 'session': self.session}), + gajim.get_jid_from_account(self.account).encode(), + gajim.OTR_PROTO, fjid.encode()) + gajim.otr_ui_ops.gajim_log(_('Private conversation with ' \ + '%s lost.') % fjid, self.account, fjid.encode()) self.update_otr() def _on_otr_settings_menuitem_activate(self, widget): gajim.otr_windows.ContactOtrWindow(self.contact, self.account, self) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-05-19 20:04:14 UTC (rev 9681) +++ trunk/src/gajim.py 2008-05-19 20:04:48 UTC (rev 9682) @@ -375,6 +375,9 @@ # disconnect from OTR sessions before quitting stanza = XmppMessage(to = recipient, body = message, typ='chat') + if 'session' in opdata: + stanza.setThread(opdata['session'].thread_id) + gajim.connections[opdata['account']].connection. \ send(stanza, now = True) return

1 0

[commit-gajim] r9681 - trunk/src/common/xmpp
by bct＠gajim.org 19 May '08

19 May '08

Author: bct Date: 2008-05-19 22:04:14 +0200 (Mon, 19 May 2008) New Revision: 9681 Modified: trunk/src/common/xmpp/transports_nb.py Log: flush xmpppy's send queue before disconnecting Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2008-05-19 20:03:22 UTC (rev 9680) +++ trunk/src/common/xmpp/transports_nb.py 2008-05-19 20:04:14 UTC (rev 9681) @@ -393,6 +393,11 @@ def start_disconnect(self, to_send, on_disconnect): self.on_disconnect = on_disconnect + + # flush the sendqueue + while self.sendqueue: + self._do_send() + self.sendqueue = [] self.send(to_send) self.send('</stream:stream>') @@ -596,6 +601,7 @@ '''Append raw_data to the queue of messages to be send. If supplied data is unicode string, encode it to utf-8. ''' + if self.state <= 0: return r = raw_data @@ -608,6 +614,7 @@ self._do_send() else: self.sendqueue.append(r) + self._plug_idle() def _on_send(self):

1 0

[commit-gajim] r9680 - trunk
by steve-e＠gajim.org 19 May '08

19 May '08

Author: steve-e Date: 2008-05-19 22:03:22 +0200 (Mon, 19 May 2008) New Revision: 9680 Modified: trunk/launch.sh Log: Enable assertions to catch errors early. Modified: trunk/launch.sh =================================================================== --- trunk/launch.sh 2008-05-19 20:00:41 UTC (rev 9679) +++ trunk/launch.sh 2008-05-19 20:03:22 UTC (rev 9680) @@ -15,4 +15,4 @@ fi cd ${BASE}/src -exec -a gajim python -OOt gajim.py $@ +exec -a gajim python -t gajim.py $@

1 0

← Newer
1
2
3
4
5
6
7
8
...
19
Older →

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