Commits July 2007

commits@gajim.org

8 participants
98 discussions

[commit-gajim] r8356 - trunk/src/common
by asterix＠gajim.org 04 Jul '07

04 Jul '07

Author: asterix Date: 2007-07-04 15:29:06 +0200 (Wed, 04 Jul 2007) New Revision: 8356 Modified: trunk/src/common/connection_handlers.py Log: prevent message spoofing. Thanks Misc. Fixes #3281 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-07-04 13:23:16 UTC (rev 8355) +++ trunk/src/common/connection_handlers.py 2007-07-04 13:29:06 UTC (rev 8356) @@ -1433,7 +1433,8 @@ frm = helpers.get_full_jid_from_iq(msg) jid = helpers.get_jid_from_iq(msg) addressTag = msg.getTag('addresses', namespace = common.xmpp.NS_ADDRESS) - if addressTag: + # 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'}) if address: frm = address.getAttr('jid')

1 0

[commit-gajim] r8355 - in trunk/src: . common
by asterix＠gajim.org 04 Jul '07

04 Jul '07

Author: asterix Date: 2007-07-04 15:23:16 +0200 (Wed, 04 Jul 2007) New Revision: 8355 Modified: trunk/src/chat_control.py trunk/src/common/contacts.py trunk/src/dialogs.py trunk/src/gajim.py trunk/src/remote_control.py trunk/src/roster_window.py trunk/src/vcard.py Log: [Lukas] split get_contact into get_contacts and get_contact. get_contact_from_full_jid uses get_contact. Maybe could be merged with optional argument, but it's clearer this way. Fixes #3275 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-07-03 18:00:09 UTC (rev 8354) +++ trunk/src/chat_control.py 2007-07-04 13:23:16 UTC (rev 8355) @@ -4,6 +4,7 @@ ## Copyright (C) 2006-2007 Nikos Kouremenos <kourem(a)gmail.com> ## Copyright (C) 2006 Travis Shirk <travis(a)pobox.com> ## Copyright (C) 2006 Dimitur Kirov <dkirov(a)gmail.com> +## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published @@ -1838,7 +1839,7 @@ show_transports = gajim.config.get('show_transports_group') if (not show_transports and gajim.jid_is_transport(jid)) or \ (not show_offline and typ == 'chat' and \ - len(gajim.contacts.get_contact(self.account, jid)) < 2): + len(gajim.contacts.get_contacts(self.account, jid)) < 2): gajim.interface.roster.really_remove_contact(self.contact, self.account) elif typ == 'pm': Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-07-03 18:00:09 UTC (rev 8354) +++ trunk/src/common/contacts.py 2007-07-04 13:23:16 UTC (rev 8355) @@ -2,6 +2,7 @@ ## ## Copyright (C) 2006 Yann Le Boulanger <asterix(a)lagaule.org> ## Copyright (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> ## ## ## This program is free software; you can redistribute it and/or modify @@ -210,31 +211,26 @@ # remove metacontacts info self.remove_metacontact(account, jid) - def get_contact(self, account, jid, resource = None): - '''Returns the list of contact instances for this jid (one per resource) - or [] if no resource is given - returns the contact instance for the given resource if it's given + def get_contacts(self, account, jid): + '''Returns the list of contact instances for this jid.''' + if jid in self._contacts[account]: + return self._contacts[account][jid] + else: + return [] + + def get_contact(self, account, jid, resource): + '''Returns the contact instance for the given resource if it's given or None if there is not''' if jid in self._contacts[account]: - contacts = self._contacts[account][jid] - if not resource: - return contacts - for c in contacts: + for c in self._contacts[account][jid]: if c.resource == resource: return c - if resource: - return None - return [] + return None def get_contact_from_full_jid(self, account, fjid): ''' Get Contact object for specific resource of given jid''' barejid, resource = common.gajim.get_room_and_nick_from_fjid(fjid) - if barejid in self._contacts[account]: - contacts = self._contacts[account][barejid] - for c in contacts: - if c.resource==resource: - return c - return None + return self.get_contact(account, barejid, resource) def get_highest_prio_contact_from_contacts(self, contacts): if not contacts: @@ -246,7 +242,7 @@ return prim_contact def get_contact_with_highest_priority(self, account, jid): - contacts = self.get_contact(account, jid) + contacts = self.get_contacts(account, jid) if not contacts and '/' in jid: # jid may be a fake jid, try it room, nick = jid.split('/', 1) @@ -263,7 +259,7 @@ '''Returns all contacts in the given group''' group_contacts = [] for jid in self._contacts[account]: - contacts = self.get_contact(account, jid) + contacts = self.get_contacts(account, jid) if group in contacts[0].groups: group_contacts += contacts return group_contacts Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-07-03 18:00:09 UTC (rev 8354) +++ trunk/src/dialogs.py 2007-07-04 13:23:16 UTC (rev 8355) @@ -115,7 +115,7 @@ if not gajim.interface.roster.regroup and _account != account: continue for _jid in all_jid[_account]: - contacts = gajim.contacts.get_contact(_account, _jid) + contacts = gajim.contacts.get_contacts(_account, _jid) for c in contacts: if group in c.groups: c.groups.remove(group) @@ -133,7 +133,7 @@ if not gajim.interface.roster.regroup and _account != account: continue for _jid in all_jid[_account]: - contacts = gajim.contacts.get_contact(_account, _jid) + contacts = gajim.contacts.get_contacts(_account, _jid) for c in contacts: if not group in c.groups: c.groups.append(group) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-07-03 18:00:09 UTC (rev 8354) +++ trunk/src/gajim.py 2007-07-04 13:23:16 UTC (rev 8355) @@ -6,6 +6,7 @@ ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov(a)gmail.com> ## Copyright (C) 2005 Travis Shirk <travis(a)pobox.com> +## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published @@ -543,7 +544,7 @@ # Update contact jid_list = gajim.contacts.get_jid_list(account) if ji in jid_list or jid == gajim.get_jid_from_account(account): - lcontact = gajim.contacts.get_contact(account, ji) + lcontact = gajim.contacts.get_contacts(account, ji) contact1 = None resources = [] for c in lcontact: @@ -726,7 +727,7 @@ chat_control = self.msg_win_mgr.get_control(jid, account) # Handle chat states - contact = gajim.contacts.get_contact(account, jid, resource) + contact = gajim.contacts.get_contacts(account, jid, resource) if contact and isinstance(contact, list): contact = contact[0] if contact: @@ -755,7 +756,7 @@ return if gajim.config.get('ignore_unknown_contacts') and \ - not gajim.contacts.get_contact(account, jid) and not pm: + not gajim.contacts.get_contacts(account, jid) and not pm: return if not contact: # contact is not in the roster, create a fake one to display @@ -1052,7 +1053,7 @@ elif self.instances[account]['infos'].has_key(array[0] + '/' + array[1]): win = self.instances[account]['infos'][array[0] + '/' + array[1]] if win: - c = gajim.contacts.get_contact(account, array[0], array[1]) + c = gajim.contacts.get_contacts(account, array[0], array[1]) # c is a list when no resource is given. it probably means that contact # is offline, so only on Contact instance if isinstance(c, list) and len(c): @@ -1274,7 +1275,7 @@ sub = array[2] ask = array[3] groups = array[4] - contacts = gajim.contacts.get_contact(account, jid) + contacts = gajim.contacts.get_contacts(account, jid) # contact removes us. if (not sub or sub == 'none') and (not ask or ask == 'none') and \ not name and not groups: @@ -2189,7 +2190,7 @@ gajim.events.change_jid(account, fjid, jid) resource = None fjid = jid - contact = gajim.contacts.get_contact(account, jid, resource) + contact = gajim.contacts.get_contacts(account, jid, resource) if not contact or isinstance(contact, list): contact = highest_contact self.roster.new_chat(contact, account, resource = resource) Modified: trunk/src/remote_control.py =================================================================== --- trunk/src/remote_control.py 2007-07-03 18:00:09 UTC (rev 8354) +++ trunk/src/remote_control.py 2007-07-04 13:23:16 UTC (rev 8355) @@ -4,6 +4,7 @@ ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov(a)gmail.com> ## Copyright (C) 2005-2006 Andrew Sayman <lorien420(a)myrealbox.com> +## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published @@ -410,7 +411,7 @@ if acct in accounts: for jid in gajim.contacts.get_jid_list(acct): item = self._contacts_as_dbus_structure( - gajim.contacts.get_contact(acct, jid)) + gajim.contacts.get_contacts(acct, jid)) if item: result.append(item) return result @@ -503,7 +504,7 @@ accounts = [account] contact_exists = False for account in accounts: - contacts = gajim.contacts.get_contact(account, jid) + contacts = gajim.contacts.get_contacts(account, jid) if contacts: gajim.connections[account].unsubscribe(jid) for contact in contacts: @@ -531,12 +532,12 @@ nick_in_roster = None # Is jid a nick ? for account in accounts: # Does jid exists in roster of one account ? - if gajim.contacts.get_contact(account, jid): + if gajim.contacts.get_contacts(account, jid): return jid if not nick_in_roster: # look in all contact if one has jid as nick for jid_ in gajim.contacts.get_jid_list(account): - c = gajim.contacts.get_contact(account, jid_) + c = gajim.contacts.get_contacts(account, jid_) if c[0].name == jid: nick_in_roster = jid_ break Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-07-03 18:00:09 UTC (rev 8354) +++ trunk/src/roster_window.py 2007-07-04 13:23:16 UTC (rev 8355) @@ -4,6 +4,7 @@ ## Copyright (C) 2003-2006 Yann Le Boulanger <asterix(a)lagaule.org> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem(a)gmail.com> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov(a)gmail.com> +## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published @@ -260,7 +261,7 @@ contact = gajim.contacts.get_first_contact_from_jid(account, jid) nb_events = gajim.events.get_nb_roster_events(account, contact.jid) # count events from all resources - for contact_ in gajim.contacts.get_contact(account, jid): + for contact_ in gajim.contacts.get_contacts(account, jid): if contact_.resource: nb_events += gajim.events.get_nb_roster_events(account, contact_.get_full_jid()) @@ -337,14 +338,14 @@ if (contact.show in ('offline', 'error') or hide) and \ not showOffline and (not _('Transports') in contact.groups or \ gajim.connections[account].connected < 2) and \ - len(gajim.contacts.get_contact(account, jid)) == 1 and nb_events == 0 and\ + len(gajim.contacts.get_contacts(account, jid)) == 1 and nb_events == 0 and\ not _('Not in Roster') in contact.groups: return # Remove brother contacts that are already in roster to add them # under this iter for data in shown_family: - contacts = gajim.contacts.get_contact(data['account'], + contacts = gajim.contacts.get_contacts(data['account'], data['jid']) for c in contacts: self.remove_contact(c, data['account']) @@ -390,7 +391,7 @@ self.draw_avatar(jid, account) # put the children under this iter for data in shown_family: - contacts = gajim.contacts.get_contact(data['account'], + contacts = gajim.contacts.get_contacts(data['account'], data['jid']) self.add_contact_to_roster(data['jid'], data['account']) @@ -589,7 +590,7 @@ iters = self.get_contact_iter(jid, account) if len(iters) == 0: return - contact_instances = gajim.contacts.get_contact(account, jid) + contact_instances = gajim.contacts.get_contacts(account, jid) contact = gajim.contacts.get_highest_prio_contact_from_contacts( contact_instances) if not contact: @@ -1281,7 +1282,7 @@ def chg_contact_status(self, contact, show, status, account): '''When a contact changes his or her status''' - contact_instances = gajim.contacts.get_contact(account, contact.jid) + contact_instances = gajim.contacts.get_contacts(account, contact.jid) contact.show = show contact.status = status if show in ('offline', 'error') and \ @@ -1399,7 +1400,7 @@ jid = model[iter][C_JID].decode('utf-8') if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: self.tooltip.id = row - contacts = gajim.contacts.get_contact(account, jid) + contacts = gajim.contacts.get_contacts(account, jid) connected_contacts = [] for c in contacts: if c.show not in ('offline', 'error'): @@ -1415,7 +1416,7 @@ jid = model[iter][C_JID].decode('utf-8') if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: self.tooltip.id = row - contact = gajim.contacts.get_contact(account, jid) + contact = gajim.contacts.get_contacts(account, jid) self.tooltip.account = account self.tooltip.timeout = gobject.timeout_add(500, self.show_tooltip, contact) @@ -1706,7 +1707,7 @@ if row_type in ('contact', 'agent'): if old_text == new_text: return - for u in gajim.contacts.get_contact(account, jid): + for u in gajim.contacts.get_contacts(account, jid): u.name = new_text gajim.connections[account].update_contact(jid, new_text, u.groups) self.draw_contact(jid, account) @@ -1787,7 +1788,7 @@ self.add_contact_to_roster(contact.jid, account) else: gajim.connections[account].unsubscribe(contact.jid) - for c in gajim.contacts.get_contact(account, contact.jid): + for c in gajim.contacts.get_contacts(account, contact.jid): self.remove_contact(c, account) gajim.contacts.remove_jid(account, c.jid) self.readd_if_needed(contact, account) @@ -1815,11 +1816,11 @@ if keyID[0] == _('None'): if contact.jid in keys: del keys[contact.jid] - for u in gajim.contacts.get_contact(account, contact.jid): + for u in gajim.contacts.get_contacts(account, contact.jid): u.keyID = '' else: keys[contact.jid] = keyID[0] - for u in gajim.contacts.get_contact(account, contact.jid): + for u in gajim.contacts.get_contacts(account, contact.jid): u.keyID = keyID[0] if gajim.interface.msg_win_mgr.has_window(contact.jid, account): ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, account) @@ -1920,7 +1921,7 @@ information_menuitem = xml.get_widget('information_menuitem') history_menuitem = xml.get_widget('history_menuitem') - contacts = gajim.contacts.get_contact(account, jid) + contacts = gajim.contacts.get_contacts(account, jid) if len(contacts) > 1: # several resources sub_menu = gtk.Menu() start_chat_menuitem.set_submenu(sub_menu) @@ -2081,7 +2082,7 @@ information_menuitem = xml.get_widget('information_menuitem') history_menuitem = xml.get_widget('history_menuitem') - contacts = gajim.contacts.get_contact(account, jid) + contacts = gajim.contacts.get_contacts(account, jid) # Invite to invite_to_submenu = gtk.Menu() @@ -3189,7 +3190,7 @@ remove_auth = False for (contact, account) in list_: gajim.connections[account].unsubscribe(contact.jid, remove_auth) - for c in gajim.contacts.get_contact(account, contact.jid): + for c in gajim.contacts.get_contacts(account, contact.jid): self.remove_contact(c, account) gajim.contacts.remove_jid(account, contact.jid) # redraw group rows for contact numbers @@ -3625,7 +3626,7 @@ if gajim.con_types.has_key(account): gajim.con_types[account] = None for jid in gajim.contacts.get_jid_list(account): - lcontact = gajim.contacts.get_contact(account, jid) + lcontact = gajim.contacts.get_contacts(account, jid) lcontact_copy = [] for contact in lcontact: lcontact_copy.append(contact) @@ -3717,7 +3718,7 @@ if not contact: # If there is another resource, it may be a message from an invisible # resource - lcontact = gajim.contacts.get_contact(account, jid) + lcontact = gajim.contacts.get_contacts(account, jid) if (len(lcontact) > 1 or (lcontact and lcontact[0].resource and \ lcontact[0].show != 'offline')) and jid.find('@') > 0: contact = gajim.contacts.copy_contact(highest_contact) @@ -4121,7 +4122,7 @@ first_ev = gajim.events.get_first_event(account, jid) if not first_ev: # look in other resources - for c in gajim.contacts.get_contact(account, jid): + for c in gajim.contacts.get_contacts(account, jid): fjid = c.get_full_jid() first_ev = gajim.events.get_first_event(account, fjid) if first_ev: @@ -4570,13 +4571,13 @@ jid1 = model[iter1][C_JID].decode('utf-8') jid2 = model[iter2][C_JID].decode('utf-8') if type1 == 'contact': - lcontact1 = gajim.contacts.get_contact(account1, jid1) + lcontact1 = gajim.contacts.get_contacts(account1, jid1) contact1 = gajim.contacts.get_first_contact_from_jid(account1, jid1) if not contact1: return 0 name1 = contact1.get_shown_name() if type2 == 'contact': - lcontact2 = gajim.contacts.get_contact(account2, jid2) + lcontact2 = gajim.contacts.get_contacts(account2, jid2) contact2 = gajim.contacts.get_first_contact_from_jid(account2, jid2) if not contact2: return 0 Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2007-07-03 18:00:09 UTC (rev 8354) +++ trunk/src/vcard.py 2007-07-04 13:23:16 UTC (rev 8355) @@ -3,6 +3,7 @@ ## Copyright (C) 2003-2006 Yann Le Boulanger <asterix(a)lagaule.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> ## Copyright (C) 2006 Stefan Bethge <stefan(a)lanpartei.de> +## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published @@ -334,7 +335,7 @@ def fill_status_label(self): if self.xml.get_widget('information_notebook').get_n_pages() < 5: return - contact_list = gajim.contacts.get_contact(self.account, self.contact.jid) + contact_list = gajim.contacts.get_contacts(self.account, self.contact.jid) connected_contact_list = [] for c in contact_list: if c.show not in ('offline', 'error'): @@ -429,7 +430,7 @@ self.os_info = {0: {'resource': self.contact.resource, 'client': '', 'os': ''}} i = 1 - contact_list = gajim.contacts.get_contact(self.account, self.contact.jid) + contact_list = gajim.contacts.get_contacts(self.account, self.contact.jid) if contact_list: for c in contact_list: if c.resource != self.contact.resource: @@ -522,7 +523,7 @@ def fill_status_label(self): if self.xml.get_widget('information_notebook').get_n_pages() < 2: return - contact_list = gajim.contacts.get_contact(self.account, self.contact.jid) + contact_list = gajim.contacts.get_contacts(self.account, self.contact.jid) # stats holds show and status message stats = '' one = True # Are we adding the first line ?

1 0

[commit-gajim] r8354 - in branches/e2e_encryption/src: . common
by bct＠gajim.org 03 Jul '07

03 Jul '07

Author: bct Date: 2007-07-03 20:00:09 +0200 (Tue, 03 Jul 2007) New Revision: 8354 Modified: branches/e2e_encryption/src/chat_control.py branches/e2e_encryption/src/common/connection_handlers.py branches/e2e_encryption/src/gajim.py branches/e2e_encryption/src/message_control.py branches/e2e_encryption/src/roster_window.py Log: fixed a traceback Modified: branches/e2e_encryption/src/chat_control.py =================================================================== --- branches/e2e_encryption/src/chat_control.py 2007-07-03 17:34:33 UTC (rev 8353) +++ branches/e2e_encryption/src/chat_control.py 2007-07-03 18:00:09 UTC (rev 8354) @@ -508,7 +508,6 @@ if not message or message == '\n': return 1 - if not self._process_command(message): ret = MessageControl.send_message(self, message, keyID, type = type, chatstate = chatstate, msg_id = msg_id, @@ -1495,7 +1494,7 @@ toggle_gpg_menuitem.set_property('sensitive', is_sensitive) # TODO: check that the remote client supports e2e - isactive = self.session.enable_encryption + isactive = int(self.session != None and self.session.enable_encryption) toggle_e2e_menuitem.set_active(isactive) # If we don't have resource, we can't do file transfer @@ -1947,7 +1946,7 @@ tb.set_active(not tb.get_active()) def _on_toggle_e2e_menuitem_activate(self, widget): - if self.session.enable_encryption: + if self.session and self.session.enable_encryption: self.session.terminate_e2e() jid = str(self.session.jid) @@ -1955,6 +1954,9 @@ gajim.connections[self.account].delete_session(jid, self.session.thread_id) self.session = gajim.connections[self.account].make_new_session(jid) else: + if not self.session: + self.session = gajim.connections[self.account].make_new_session(self.contact.jid) + self.session.negotiate_e2e() def got_connected(self): Modified: branches/e2e_encryption/src/common/connection_handlers.py =================================================================== --- branches/e2e_encryption/src/common/connection_handlers.py 2007-07-03 17:34:33 UTC (rev 8353) +++ branches/e2e_encryption/src/common/connection_handlers.py 2007-07-03 18:00:09 UTC (rev 8354) @@ -1582,7 +1582,6 @@ if bare_jid != jid: session = self.find_session(bare_jid, thread_id, type) if session: - print repr(bare_jid), repr(thread_id), repr(jid.split("/")[1]) self.move_session(bare_jid, thread_id, jid.split("/")[1]) return session Modified: branches/e2e_encryption/src/gajim.py =================================================================== --- branches/e2e_encryption/src/gajim.py 2007-07-03 17:34:33 UTC (rev 8353) +++ branches/e2e_encryption/src/gajim.py 2007-07-03 18:00:09 UTC (rev 8354) @@ -1726,6 +1726,7 @@ if form.getField('terminate'): if form.getField('terminate').getValue() in ('1', 'true'): session.acknowledge_termination() + gajim.connections[account].delete_session(str(jid), session.thread_id) ctrl = gajim.interface.msg_win_mgr.get_control(str(jid), account) Modified: branches/e2e_encryption/src/message_control.py =================================================================== --- branches/e2e_encryption/src/message_control.py 2007-07-03 17:34:33 UTC (rev 8353) +++ branches/e2e_encryption/src/message_control.py 2007-07-03 18:00:09 UTC (rev 8354) @@ -113,9 +113,10 @@ def set_session(self, session): if session == self.session: return + if self.session: - print "starting a new session, forgetting about the old one!" - gajim.connections[self.account].delete_session(self.contact.jid, self.session.thread_id) + print "starting a new session, dropping the old one!" + gajim.connections[self.account].delete_session(self.contact.get_full_jid(), self.session.thread_id) self.session = session @@ -126,6 +127,9 @@ ''' jid = self.contact.jid + if not self.session: + self.session = gajim.connections[self.account].make_new_session(self.contact.get_full_jid()) + # Send and update history return gajim.connections[self.account].send_message(jid, message, keyID, type = type, chatstate = chatstate, msg_id = msg_id, Modified: branches/e2e_encryption/src/roster_window.py =================================================================== --- branches/e2e_encryption/src/roster_window.py 2007-07-03 17:34:33 UTC (rev 8353) +++ branches/e2e_encryption/src/roster_window.py 2007-07-03 18:00:09 UTC (rev 8354) @@ -3488,9 +3488,6 @@ if resource: fjid += '/' + resource - if not session: - session = gajim.connections[account].make_new_session(fjid) - mw = gajim.interface.msg_win_mgr.get_window(fjid, account) if not mw: mw = gajim.interface.msg_win_mgr.create_window(contact, account, type_)

1 0

[commit-gajim] r8353 - trunk/src
by asterix＠gajim.org 03 Jul '07

03 Jul '07

Author: asterix Date: 2007-07-03 19:34:33 +0200 (Tue, 03 Jul 2007) New Revision: 8353 Modified: trunk/src/dialogs.py Log: ask user before overwriting a preset status message. Fixes #3277 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-07-03 16:52:09 UTC (rev 8352) +++ trunk/src/dialogs.py 2007-07-03 17:34:33 UTC (rev 8353) @@ -428,13 +428,20 @@ if not msg_name: # msg_name was '' msg_name = msg_text_1l msg_name = msg_name.decode('utf-8') - iter_ = self.message_liststore.append((msg_name,)) - gajim.config.add_per('statusmsg', msg_name) + if msg_name in self.preset_messages_dict: + dlg2 = ConfirmationDialog(_('Overwrite Status Message?'), + _('This name is already used. Do you want to overwrite this status message?')) + resp = dlg2.run() + if resp != gtk.RESPONSE_OK: + return + else: + iter_ = self.message_liststore.append((msg_name,)) + gajim.config.add_per('statusmsg', msg_name) + # select in combobox the one we just saved + self.message_combobox.set_active_iter(iter_) gajim.config.set_per('statusmsg', msg_name, 'message', msg_text_1l) self.preset_messages_dict[msg_name] = msg_text - # select in combobox the one we just saved - self.message_combobox.set_active_iter(iter_) class AddNewContactWindow:

1 0

[commit-gajim] r8352 - trunk
by jim++＠gajim.org 03 Jul '07

03 Jul '07

Author: jim++ Date: 2007-07-03 18:52:09 +0200 (Tue, 03 Jul 2007) New Revision: 8352 Modified: trunk/AUTHORS Log: Removing me from active devs, I don't have time nor motivation to work on gajim. I will probably still patch a little sometimes. Modified: trunk/AUTHORS =================================================================== --- trunk/AUTHORS 2007-07-03 10:22:41 UTC (rev 8351) +++ trunk/AUTHORS 2007-07-03 16:52:09 UTC (rev 8352) @@ -3,10 +3,10 @@ Yann Le Boulanger (asterix AT lagaule.org) Nikos Kouremenos (kourem AT gmail.com) Travis Shirk (travis AT pobox.com) -Jean-Marie Traissard (jim AT lapin.org) PAST DEVELOPERS: +Jean-Marie Traissard (jim AT lapin.org) Stefan Bethge (stefan AT lanpartei.de) Dimitur Kirov (dkirov AT gmail.com) Vincent Hanquez (tab AT snarc.org)

1 0

[commit-gajim] r8351 - in trunk/src: . common
by asterix＠gajim.org 03 Jul '07

03 Jul '07

Author: asterix Date: 2007-07-03 12:22:41 +0200 (Tue, 03 Jul 2007) New Revision: 8351 Modified: trunk/src/common/contacts.py trunk/src/gajim.py trunk/src/remote_control.py trunk/src/roster_window.py Log: remove useless function get_contcats_from_jid (same as get_contact). see #3275 Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-07-03 09:31:43 UTC (rev 8350) +++ trunk/src/common/contacts.py 2007-07-03 10:22:41 UTC (rev 8351) @@ -226,13 +226,6 @@ return None return [] - def get_contacts_from_jid(self, account, jid): - '''we may have two or more resources on that jid''' - if jid in self._contacts[account]: - contacts_instances = self._contacts[account][jid] - return contacts_instances - return [] - def get_contact_from_full_jid(self, account, fjid): ''' Get Contact object for specific resource of given jid''' barejid, resource = common.gajim.get_room_and_nick_from_fjid(fjid) @@ -253,7 +246,7 @@ return prim_contact def get_contact_with_highest_priority(self, account, jid): - contacts = self.get_contacts_from_jid(account, jid) + contacts = self.get_contact(account, jid) if not contacts and '/' in jid: # jid may be a fake jid, try it room, nick = jid.split('/', 1) @@ -270,7 +263,7 @@ '''Returns all contacts in the given group''' group_contacts = [] for jid in self._contacts[account]: - contacts = self.get_contacts_from_jid(account, jid) + contacts = self.get_contact(account, jid) if group in contacts[0].groups: group_contacts += contacts return group_contacts Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-07-03 09:31:43 UTC (rev 8350) +++ trunk/src/gajim.py 2007-07-03 10:22:41 UTC (rev 8351) @@ -543,7 +543,7 @@ # Update contact jid_list = gajim.contacts.get_jid_list(account) if ji in jid_list or jid == gajim.get_jid_from_account(account): - lcontact = gajim.contacts.get_contacts_from_jid(account, ji) + lcontact = gajim.contacts.get_contact(account, ji) contact1 = None resources = [] for c in lcontact: @@ -1274,7 +1274,7 @@ sub = array[2] ask = array[3] groups = array[4] - contacts = gajim.contacts.get_contacts_from_jid(account, jid) + contacts = gajim.contacts.get_contact(account, jid) # contact removes us. if (not sub or sub == 'none') and (not ask or ask == 'none') and \ not name and not groups: Modified: trunk/src/remote_control.py =================================================================== --- trunk/src/remote_control.py 2007-07-03 09:31:43 UTC (rev 8350) +++ trunk/src/remote_control.py 2007-07-03 10:22:41 UTC (rev 8351) @@ -531,12 +531,12 @@ nick_in_roster = None # Is jid a nick ? for account in accounts: # Does jid exists in roster of one account ? - if gajim.contacts.get_contacts_from_jid(account, jid): + if gajim.contacts.get_contact(account, jid): return jid if not nick_in_roster: # look in all contact if one has jid as nick for jid_ in gajim.contacts.get_jid_list(account): - c = gajim.contacts.get_contacts_from_jid(account, jid_) + c = gajim.contacts.get_contact(account, jid_) if c[0].name == jid: nick_in_roster = jid_ break Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-07-03 09:31:43 UTC (rev 8350) +++ trunk/src/roster_window.py 2007-07-03 10:22:41 UTC (rev 8351) @@ -3717,7 +3717,7 @@ if not contact: # If there is another resource, it may be a message from an invisible # resource - lcontact = gajim.contacts.get_contacts_from_jid(account, jid) + lcontact = gajim.contacts.get_contact(account, jid) if (len(lcontact) > 1 or (lcontact and lcontact[0].resource and \ lcontact[0].show != 'offline')) and jid.find('@') > 0: contact = gajim.contacts.copy_contact(highest_contact) @@ -3883,7 +3883,8 @@ '''close all the windows from an account if force is True, do not ask confirmation before closing chat/gc windows ''' - self.close_all_from_dict(gajim.interface.instances[account]) + if account in gajim.interface.instances: + self.close_all_from_dict(gajim.interface.instances[account]) for ctrl in gajim.interface.msg_win_mgr.get_controls(acct = account): ctrl.parent_win.remove_tab(ctrl, ctrl.parent_win.CLOSE_CLOSE_BUTTON, force = force)

1 0

[commit-gajim] r8350 - in trunk/src: . common
by asterix＠gajim.org 03 Jul '07

03 Jul '07

Author: asterix Date: 2007-07-03 11:31:43 +0200 (Tue, 03 Jul 2007) New Revision: 8350 Modified: trunk/src/common/helpers.py trunk/src/tooltips.py Log: [lukas and I] improve tooltip to show info about pending events. fixes #1971 Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2007-07-02 16:53:19 UTC (rev 8349) +++ trunk/src/common/helpers.py 2007-07-03 09:31:43 UTC (rev 8350) @@ -5,6 +5,7 @@ ## Copyright (C) 2005 ## Dimitur Kirov <dkirov(a)gmail.com> ## Travis Shirk <travis(a)pobox.com> +## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published @@ -874,62 +875,121 @@ reduced_text = '' return reduced_text +def get_account_status(account): + status = reduce_chars_newlines(account['status_line'], 100, 1) + return status + +def get_notification_icon_tooltip_dict(): + '''returns a dict of the form {acct: {'show': show, 'message': message, + 'event_lines': [list of text lines to show in tooltip]}''' + # How many events must there be before they're shown summarized, not per-user + max_ungrouped_events = 10 + + accounts = get_accounts_info() + + # Gather events. (With accounts, when there are more.) + for account in accounts: + account_name = account['name'] + account['event_lines'] = [] + # Gather events per-account + pending_events = gajim.events.get_events(account = account_name) + messages, non_messages, total_messages, total_non_messages = {}, {}, 0, 0 + for jid in pending_events: + for event in pending_events[jid]: + if event.type_.count('file') > 0: + # This is a non-messagee event. + messages[jid] = non_messages.get(jid, 0) + 1 + total_non_messages = total_non_messages + 1 + else: + # This is a message. + messages[jid] = messages.get(jid, 0) + 1 + total_messages = total_messages + 1 + # Display unread messages numbers, if any + if total_messages > 0: + if total_messages > max_ungrouped_events: + text = ngettext( + '%d message pending', + '%d messages pending', + total_messages, total_messages, total_messages) + account['event_lines'].append(text) + else: + for jid in messages.keys(): + text = ngettext( + '%d message pending', + '%d messages pending', + messages[jid], messages[jid], messages[jid]) + contact = gajim.contacts.get_first_contact_from_jid( + account['name'], jid) + if jid in gajim.gc_connected[account['name']]: + text += _(' from room %s') % (jid) + elif contact: + name = contact.get_shown_name() + text += _(' from user %s') % (name) + else: + text += _(' from %s') % (jid) + account['event_lines'].append(text) + + # Display unseen events numbers, if any + if total_non_messages > 0: + if total_non_messages > max_ungrouped_events: + text = ngettext( + '%d event pending', + '%d events pending', + total_non_messages, total_non_messages, total_non_messages) + accounts[account]['event_lines'].append(text) + else: + for jid in non_messages.keys(): + text = ngettext( + '%d event pending', + '%d events pending', + non_messages[jid], non_messages[jid], non_messages[jid]) + text += _(' from user %s') % (jid) + accounts[account]['event_lines'].append(text) + + return accounts + def get_notification_icon_tooltip_text(): text = None - unread_chat = gajim.events.get_nb_events(types = ['printed_chat', - 'chat']) - unread_single_chat = gajim.events.get_nb_events(types = ['normal']) - unread_gc = gajim.events.get_nb_events(types = ['printed_gc_msg', - 'printed_marked_gc_msg', 'gc_msg']) - unread_pm = gajim.events.get_nb_events(types = ['printed_pm', 'pm']) + # How many events must there be before they're shown summarized, not per-user + max_ungrouped_events = 10 + # Character which should be used to indent in the tooltip. + indent_with = ' ' - accounts = get_accounts_info() + accounts = get_notification_icon_tooltip_dict() - if unread_chat or unread_single_chat or unread_gc or unread_pm: - text = 'Gajim ' - awaiting_events = unread_chat + unread_single_chat + unread_gc + unread_pm - if awaiting_events == unread_chat or awaiting_events == unread_single_chat \ - or awaiting_events == unread_gc or awaiting_events == unread_pm: - # This condition is like previous if but with xor... - # Print in one line - text += '-' + if len(accounts) == 0: + # No configured account + return _('Gajim') + + # at least one account present + + # Is there more that one account? + if len(accounts) == 1: + show_more_accounts = False + else: + show_more_accounts = True + + # If there is only one account, its status is shown on the first line. + if show_more_accounts: + text = _('Gajim') + else: + text = _('Gajim - %s') % (get_account_status(accounts[0])) + + # Gather and display events. (With accounts, when there are more.) + for account in accounts: + account_name = account['name'] + # Set account status, if not set above + if (show_more_accounts): + message = '\n' + indent_with + ' %s - %s' + text += message % (account_name, get_account_status(account)) + # Account list shown, messages need to be indented more + indent_how = 2 else: - # Print in multiple lines - text += '\n ' - if unread_chat: - text += ngettext( - ' %d unread message', - ' %d unread messages', - unread_chat, unread_chat, unread_chat) - text += '\n ' - if unread_single_chat: - text += ngettext( - ' %d unread single message', - ' %d unread single messages', - unread_single_chat, unread_single_chat, unread_single_chat) - text += '\n ' - if unread_gc: - text += ngettext( - ' %d unread group chat message', - ' %d unread group chat messages', - unread_gc, unread_gc, unread_gc) - text += '\n ' - if unread_pm: - text += ngettext( - ' %d unread private message', - ' %d unread private messages', - unread_pm, unread_pm, unread_pm) - text += '\n ' - text = text[:-4] # remove latest '\n ' - elif len(accounts) > 1: - text = _('Gajim') - elif len(accounts) == 1: - message = accounts[0]['status_line'] - message = reduce_chars_newlines(message, 100, 1) - text = _('Gajim - %s') % message - else: - text = _('Gajim - %s') % get_uf_show('offline') - + # If no account list is shown, messages could have default indenting. + indent_how = 1 + for line in account['event_lines']: + text += '\n' + indent_with * indent_how + ' ' + text += line return text def get_accounts_info(): Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2007-07-02 16:53:19 UTC (rev 8349) +++ trunk/src/tooltips.py 2007-07-03 09:31:43 UTC (rev 8350) @@ -160,13 +160,15 @@ self.table = gtk.Table(4, 1) self.table.set_property('column-spacing', 2) - def add_text_row(self, text): + def add_text_row(self, text, col_inc = 0): + self.current_row += 1 self.text_label = gtk.Label() self.text_label.set_line_wrap(True) self.text_label.set_alignment(0, 0) self.text_label.set_selectable(False) self.text_label.set_markup(text) - self.table.attach(self.text_label, 1, 4, 1, 2) + self.table.attach(self.text_label, 1 + col_inc, 4, self.current_row, + self.current_row + 1) def get_status_info(self, resource, priority, show, status): str_status = resource + ' (' + unicode(priority) + ')' @@ -247,21 +249,20 @@ self.add_status_row(file_path, acct['show'], gobject.markup_escape_text(acct['name']) , show_lock=show_lock) + for line in acct['event_lines']: + self.add_text_row(' ' + line, 2) def populate(self, data): self.create_window() self.create_table() - accounts = helpers.get_accounts_info() + + accounts = helpers.get_notification_icon_tooltip_dict() if len(accounts) > 1: self.table.resize(2, 1) self.fill_table_with_accounts(accounts) self.hbox = gtk.HBox() self.table.set_property('column-spacing', 1) - text = helpers.get_notification_icon_tooltip_text() - text = gobject.markup_escape_text(text) - - self.add_text_row(text) self.hbox.add(self.table) self.win.add(self.hbox)

1 0

[commit-gajim] r8349 - branches/e2e_encryption/src
by bct＠gajim.org 02 Jul '07

02 Jul '07

Author: bct Date: 2007-07-02 18:53:19 +0200 (Mon, 02 Jul 2007) New Revision: 8349 Modified: branches/e2e_encryption/src/gajim.py branches/e2e_encryption/src/negotiation.py Log: human-readable feature negotiation dialogs Modified: branches/e2e_encryption/src/gajim.py =================================================================== --- branches/e2e_encryption/src/gajim.py 2007-06-30 17:31:27 UTC (rev 8348) +++ branches/e2e_encryption/src/gajim.py 2007-07-02 16:53:19 UTC (rev 8349) @@ -1659,7 +1659,7 @@ jid, session, form = data if form.getField('accept') and not form['accept'] in ('1', 'true'): - dialogs.InformationDialog(_('Session negotiation cancelled.'), + dialogs.InformationDialog(_('Session negotiation cancelled'), _('The client at %s cancelled the session negotiation.') % (jid)) session.cancelled_negotiation() return @@ -1679,15 +1679,15 @@ def reject_nondefault_options(widget): for key in ask_user.keys(): - not_acceptable.append(key) # XXX for some reason I can't concatenate using += here? + not_acceptable.append(key) session.respond_e2e_bob(form, negotiated, not_acceptable) dialog.destroy() - dialog = dialogs.ConfirmationDialog(_('confirm these negotiation options'), - _('are the following options acceptable? %s') % (ask_user), - on_response_ok = accept_nondefault_options, - on_response_cancel = reject_nondefault_options) + dialog = dialogs.YesNoDialog(_('Confirm these session options'), + _('The remote client wants to negotiate an session with these features:\n\n%s\n\nAre these options acceptable?') % (negotiation.describe_features(ask_user)), + on_response_yes = accept_nondefault_options, + on_response_no = reject_nondefault_options) else: session.respond_e2e_bob(form, negotiated, not_acceptable) @@ -1708,10 +1708,10 @@ session.reject_negotiation() dialog.destroy() - dialog = dialogs.ConfirmationDialog(_('confirm these negotiation options'), - _('are the following options acceptable? %s') % (ask_user), - on_response_ok = accept_nondefault_options, - on_response_cancel = reject_nondefault_options) + dialog = dialogs.YesNoDialog(_('Confirm these session options'), + _('The remote client selected these options:\n\n%s\n\nContinue with the session?') % (negotiation.describe_features(ask_user)), + on_response_yes = accept_nondefault_options, + on_response_no = reject_nondefault_options) else: session.accept_e2e_alice(form, negotiated) Modified: branches/e2e_encryption/src/negotiation.py =================================================================== --- branches/e2e_encryption/src/negotiation.py 2007-06-30 17:31:27 UTC (rev 8348) +++ branches/e2e_encryption/src/negotiation.py 2007-07-02 16:53:19 UTC (rev 8349) @@ -5,6 +5,13 @@ from common import gajim from common import xmpp +def describe_features(features): + '''a human-readable description of the features that have been negotiated''' + if features['logging'] == 'may': + return '- messages will be logged' + elif features['logging'] == 'mustnot': + return '- messages will not be logged' + class FeatureNegotiationWindow: '''FeatureNegotiotionWindow class''' def __init__(self, account, jid, session, form):

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2007