Commits July 2008

commits@gajim.org

7 participants
229 discussions

[commit-gajim] r10019 - trunk/src
by js＠gajim.org 24 Jul '08

24 Jul '08

Author: js Date: 2008-07-25 00:13:37 +0200 (Fri, 25 Jul 2008) New Revision: 10019 Modified: trunk/src/chat_control.py Log: Start autonegotiation when the user starts typing. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-24 22:13:13 UTC (rev 10018) +++ trunk/src/chat_control.py 2008-07-24 22:13:37 UTC (rev 10019) @@ -1152,14 +1152,11 @@ self.print_esession_details() # Enable encryption if needed + self.no_autonegotiation = False e2e_is_active = self.session and self.session.enable_encryption self.gpg_is_active = False gpg_pref = gajim.config.get_per('contacts', contact.jid, 'gpg_enabled') - e2e_pref = gajim.config.get_per('accounts', self.account, - 'autonegotiate_esessions') and \ - gajim.config.get_per('contacts', contact.jid, - 'autonegotiate_esessions') # try GPG first if not e2e_is_active and gpg_pref and \ @@ -1178,12 +1175,6 @@ self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, self.session and self.session.is_loggable(), True) - # then try E2E - # XXX: Once we have fallback to disco, remove notexistant check - elif not e2e_is_active and gajim.HAVE_PYCRYPTO and e2e_pref \ - and gajim.capscache.is_supported(contact, NS_ESESSION) \ - and not gajim.capscache.is_supported(contact, 'notexistant'): - self.begin_e2e_negotiation() self.status_tooltip = gtk.Tooltips() @@ -2260,6 +2251,23 @@ self.kbd_activity_in_last_30_secs = True if textbuffer.get_char_count(): self.send_chatstate('composing', self.contact) + + e2e_is_active = self.session and \ + self.session.enable_encryption + e2e_pref = gajim.config.get_per('accounts', + self.account, 'autonegotiate_esessions') and \ + gajim.config.get_per('contacts', + self.contact.jid, 'autonegotiate_esessions') + # XXX: Once we have fallback to disco, remove + # notexistant check + if not e2e_is_active and e2e_pref and \ + not self.no_autonegotiation and gajim.HAVE_PYCRYPTO \ + and e2e_pref and gajim.capscache.is_supported( + self.contact, NS_ESESSION) and not \ + gajim.capscache.is_supported(self.contact, + 'notexistant'): + self.no_autonegotiation = True + self.begin_e2e_negotiation() else: self.send_chatstate('active', self.contact)

1 0

[commit-gajim] r10018 - trunk/src/common
by js＠gajim.org 24 Jul '08

24 Jul '08

Author: js Date: 2008-07-25 00:13:13 +0200 (Fri, 25 Jul 2008) New Revision: 10018 Modified: trunk/src/common/config.py Log: If there are no per-contact settings, return defaults. Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-07-24 22:12:21 UTC (rev 10017) +++ trunk/src/common/config.py 2008-07-24 22:13:13 UTC (rev 10018) @@ -585,6 +585,10 @@ if not key: return dict.keys() if not dict.has_key(key): + if self.__options_per_key.has_key(optname) \ + and self.__options_per_key[optname][0].has_key(subname): + return self.__options_per_key \ + [optname][0][subname][1] return None obj = dict[key] if not subname:

1 0

[commit-gajim] r10017 - trunk/data/glade
by js＠gajim.org 24 Jul '08

24 Jul '08

Author: js Date: 2008-07-25 00:12:21 +0200 (Fri, 25 Jul 2008) New Revision: 10017 Modified: trunk/data/glade/message_window.glade Log: We don't want that huge spacing on the left. Modified: trunk/data/glade/message_window.glade =================================================================== --- trunk/data/glade/message_window.glade 2008-07-24 22:11:48 UTC (rev 10016) +++ trunk/data/glade/message_window.glade 2008-07-24 22:12:21 UTC (rev 10017) @@ -94,11 +94,22 @@ <property name="position">2</property> </packing> </child> + <child> + <widget class="GtkAlignment" id="alignment3"> + <property name="width_request">11</property> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="position">3</property> + </packing> + </child> </widget> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="padding">15</property> <property name="position">2</property> </packing> </child>

1 0

[commit-gajim] r10016 - trunk/src
by js＠gajim.org 24 Jul '08

24 Jul '08

Author: js Date: 2008-07-25 00:11:48 +0200 (Fri, 25 Jul 2008) New Revision: 10016 Modified: trunk/src/chat_control.py Log: Show tooltip for chat states. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-23 18:38:52 UTC (rev 10015) +++ trunk/src/chat_control.py 2008-07-24 22:11:48 UTC (rev 10016) @@ -1401,6 +1401,7 @@ jid = contact.jid banner_name_label = self.xml.get_widget('banner_name_label') + banner_name_tooltip = gtk.Tooltips() banner_eventbox = self.xml.get_widget('banner_eventbox') name = contact.get_shown_name() @@ -1456,12 +1457,17 @@ # When does that happen ? See [7797] and [7804] chatstate = helpers.get_uf_chatstate(cs) - label_text = '%s%s %s' % \ - (font_attrs, name, font_attrs_small, acct_info, chatstate) + label_text = '%s%s %s' \ + % (font_attrs, name, font_attrs_small, + acct_info, chatstate) + label_tooltip = '%s%s %s' % (name, ' ' + acct_info \ + if acct_info else '', chatstate) else: # weight="heavy" size="x-large" label_text = '%s%s' % \ (font_attrs, name, font_attrs_small, acct_info) + label_tooltip = '%s%s' % (name, ' ' + acct_info \ + if acct_info else '') if status_escaped: if gajim.HAVE_PYSEXY: @@ -1481,6 +1487,7 @@ self.banner_status_label.set_markup(status_text) # setup the label that holds name and jid banner_name_label.set_markup(label_text) + banner_name_tooltip.set_tip(banner_name_label, label_tooltip) def _toggle_gpg(self): ec = gajim.encrypted_chats[self.account]

1 0

[commit-gajim] r10015 - trunk/src/common
by js＠gajim.org 23 Jul '08

23 Jul '08

Author: js Date: 2008-07-23 20:38:52 +0200 (Wed, 23 Jul 2008) New Revision: 10015 Modified: trunk/src/common/caps.py Log: If no resource is left, we shouldn't have caps left either! Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-07-23 18:34:26 UTC (rev 10014) +++ trunk/src/common/caps.py 2008-07-23 18:38:52 UTC (rev 10015) @@ -180,9 +180,17 @@ con.discoverInfo(jid, '%s#%s' % (node, hash)) def is_supported(self, contact, feature): + # No resource -> can't have any caps if not contact or not contact.resource: return False + # Unfortunately, if all resources are offline, the contact + # includes the last resource that was online. Check for its + # show, so we can be sure it's existant. Otherwise, we still + # return caps for a contact that has no resources left. + if contact.show == 'offline': + return False + # FIXME: We assume everything is supported if we got no caps. # This is the "Asterix way", after 0.12 release, I will # likely implement a fallback to disco (could be disabled

1 0

[commit-gajim] r10014 - trunk/src
by js＠gajim.org 23 Jul '08

23 Jul '08

Author: js Date: 2008-07-23 20:34:26 +0200 (Wed, 23 Jul 2008) New Revision: 10014 Modified: trunk/src/chat_control.py Log: Fix a TB. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-23 18:28:55 UTC (rev 10013) +++ trunk/src/chat_control.py 2008-07-23 18:34:26 UTC (rev 10014) @@ -142,9 +142,10 @@ if resource is None: # We very likely got a contact with a random resource. # This is bad, we need the highest for caps etc. - contact = gajim.contacts. \ - get_contact_with_highest_priority( + c = gajim.contacts.get_contact_with_highest_priority( acct, contact.jid) + if c: + contact = c MessageControl.__init__(self, type_id, parent_win, widget_name, contact, acct, resource = resource);

1 0

[commit-gajim] r10013 - trunk/src/common
by js＠gajim.org 23 Jul '08

23 Jul '08

Author: js Date: 2008-07-23 20:28:55 +0200 (Wed, 23 Jul 2008) New Revision: 10013 Modified: trunk/src/common/caps.py Log: Handle it correctly if caps were removed. YES, it CAN happen that we had caps and now got a presence without! And that WILL happen very often, for example if the other end signs off! Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-07-23 18:21:02 UTC (rev 10012) +++ trunk/src/common/caps.py 2008-07-23 18:28:55 UTC (rev 10013) @@ -202,32 +202,42 @@ ''' Handle incoming presence stanzas... This is a callback for xmpp registered in connection_handlers.py''' + # we will put these into proper Contact object and ask + # for disco... so that disco will learn how to interpret + # these caps + jid = helpers.get_full_jid_from_iq(presence) + 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: + # TODO: a way to put contact not-in-roster + # into Contacts + return + # get the caps element caps = presence.getTag('c') if not caps: + contact.caps_node = None + contact.caps_hash = None + contact.hash_method = None return - hash_method, node, hash = caps['hash'], caps['node'], caps['ver'] + hash_method, node, hash = \ + caps['hash'], caps['node'], caps['ver'] + if hash_method is None or node is None or hash is None: # improper caps in stanza, ignoring + contact.caps_node = None + contact.caps_hash = None + contact.hash_method = None return - # we will put these into proper Contact object and ask - # for disco... so that disco will learn how to interpret - # these caps - - jid = helpers.get_full_jid_from_iq(presence) - # 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 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 contact.caps_hash_method = hash_method

1 0

[commit-gajim] r10012 - trunk/src
by js＠gajim.org 23 Jul '08

23 Jul '08

Author: js Date: 2008-07-23 20:21:02 +0200 (Wed, 23 Jul 2008) New Revision: 10012 Modified: trunk/src/chat_control.py trunk/src/gajim.py Log: Always have self.contact of a chat control point to the hightest resource if none was specified. As it's still possible to start E2E when the only E2E-capable resource goes offline, this means that caps is definitely broken. (Yes, I verified it with a print contact.resource - it IS checked for the right contact!) Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-23 17:40:02 UTC (rev 10011) +++ trunk/src/chat_control.py 2008-07-23 18:21:02 UTC (rev 10012) @@ -139,6 +139,13 @@ def __init__(self, type_id, parent_win, widget_name, contact, acct, resource = None): + if resource is None: + # We very likely got a contact with a random resource. + # This is bad, we need the highest for caps etc. + contact = gajim.contacts. \ + get_contact_with_highest_priority( + acct, contact.jid) + MessageControl.__init__(self, type_id, parent_win, widget_name, contact, acct, resource = resource); Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-23 17:40:02 UTC (rev 10011) +++ trunk/src/gajim.py 2008-07-23 18:21:02 UTC (rev 10012) @@ -833,6 +833,7 @@ ctrl = self.msg_win_mgr.get_control(jid, account) if ctrl: ctrl.set_session(None) + ctrl.contact = highest def handle_event_msgerror(self, account, array): #'MSGERROR' (account, (jid, error_code, error_msg, msg, time[, session]))

1 0

[commit-gajim] r10011 - trunk/src
by js＠gajim.org 23 Jul '08

23 Jul '08

Author: js Date: 2008-07-23 19:40:02 +0200 (Wed, 23 Jul 2008) New Revision: 10011 Modified: trunk/src/chat_control.py trunk/src/gajim.py Log: Fix #4069. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-23 17:28:01 UTC (rev 10010) +++ trunk/src/chat_control.py 2008-07-23 17:40:02 UTC (rev 10011) @@ -1348,6 +1348,7 @@ def update_ui(self): # The name banner is drawn here ChatControlBase.update_ui(self) + self.update_toolbar() def _update_banner_state_image(self): contact = gajim.contacts.get_contact_with_highest_priority(self.account, Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-23 17:28:01 UTC (rev 10010) +++ trunk/src/gajim.py 2008-07-23 17:40:02 UTC (rev 10011) @@ -1790,9 +1790,11 @@ '%s\nIt may have been tampered with.') % (jid) if session.control: - session.control.print_conversation_line(details, 'status', '', tim) + session.control.print_conversation_line(details, + 'status', '', tim) else: - dialogs.WarningDialog(_('Unable to decrypt message'), details) + dialogs.WarningDialog(_('Unable to decrypt message'), + details) # terminate the session session.terminate_e2e()

1 0

[commit-gajim] r10010 - trunk/src
by js＠gajim.org 23 Jul '08

23 Jul '08

Author: js Date: 2008-07-23 19:28:01 +0200 (Wed, 23 Jul 2008) New Revision: 10010 Modified: trunk/src/chat_control.py Log: Finally fix status message tooltip in conversation window. This also doesn't leave the tooltip when the status was removed anymore Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-23 16:27:06 UTC (rev 10009) +++ trunk/src/chat_control.py 2008-07-23 17:28:01 UTC (rev 10010) @@ -1460,12 +1460,12 @@ status_text = '%s' % (font_attrs_small, status_text) else: status_text = '%s' % (font_attrs_small, status_escaped) - self.status_tooltip.set_tip(banner_eventbox, status) + self.status_tooltip.set_tip(self.banner_status_label, + status) self.banner_status_label.show() self.banner_status_label.set_no_show_all(False) else: status_text = '' - self.status_tooltip.disable() self.banner_status_label.hide() self.banner_status_label.set_no_show_all(True)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
23
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 July 2008