Commits August 2010

commits@gajim.org

6 participants
151 discussions

gajim: use NEC to handle search form request / result
by Yann Leboulanger 30 Aug '10

30 Aug '10

changeset 453cd33cf535 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=453cd33cf535 description: use NEC to handle search form request / result diffstat: src/common/connection.py | 23 ++------------- src/common/connection_handlers.py | 20 +++---------- src/common/connection_handlers_events.py | 45 +++++++++++++++++++++++++++++++ src/gui_interface.py | 16 ----------- src/search_window.py | 46 +++++++++++++++++++------------ 5 files changed, 82 insertions(+), 68 deletions(-) diffs (298 lines): diff -r 090d64323f65 -r 453cd33cf535 src/common/connection.py --- a/src/common/connection.py Sun Aug 29 20:22:20 2010 +0200 +++ b/src/common/connection.py Mon Aug 30 21:42:36 2010 +0200 @@ -2308,31 +2308,16 @@ def send_search_form(self, jid, form, is_form): iq = common.xmpp.Iq(typ = 'set', to = jid, queryNS = \ - common.xmpp.NS_SEARCH) + common.xmpp.NS_SEARCH) item = iq.getTag('query') if is_form: - item.addChild(node = form) + item.addChild(node=form) else: for i in form.keys(): item.setTagData(i, form[i]) def _on_response(resp): - jid = jid = helpers.get_jid_from_iq(resp) - tag = resp.getTag('query', namespace = common.xmpp.NS_SEARCH) - if not tag: - self.dispatch('SEARCH_RESULT', (jid, None, False)) - return - df = tag.getTag('x', namespace = common.xmpp.NS_DATA) - if df: - self.dispatch('SEARCH_RESULT', (jid, df, True)) - return - df = [] - for item in tag.getTags('item'): - # We also show attributes. jid is there - f = item.attrs - for i in item.getPayload(): - f[i.getName()] = i.getData() - df.append(f) - self.dispatch('SEARCH_RESULT', (jid, df, False)) + gajim.nec.push_incoming_event(SearchResultReceivedEvent(None, + conn=self, iq_obj=resp)) self.connection.SendAndCallForResponse(iq, _on_response) diff -r 090d64323f65 -r 453cd33cf535 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Aug 29 20:22:20 2010 +0200 +++ b/src/common/connection_handlers.py Mon Aug 30 21:42:36 2010 +0200 @@ -2244,20 +2244,10 @@ self.connection.send(iq) - def _search_fields_received(self, con, iq_obj): - jid = jid = helpers.get_jid_from_iq(iq_obj) - tag = iq_obj.getTag('query', namespace = common.xmpp.NS_SEARCH) - if not tag: - self.dispatch('SEARCH_FORM', (jid, None, False)) - return - df = tag.getTag('x', namespace = common.xmpp.NS_DATA) - if df: - self.dispatch('SEARCH_FORM', (jid, df, True)) - return - df = {} - for i in iq_obj.getQueryPayload(): - df[i.getName()] = i.getData() - self.dispatch('SEARCH_FORM', (jid, df, False)) + def _SearchCB(self, con, iq_obj): + log.debug('SearchCB') + gajim.nec.push_incoming_event(SearchFormReceivedEvent(None, + conn=self, iq_obj=iq_obj)) def _StreamCB(self, con, obj): if obj.getTag('conflict'): @@ -2343,7 +2333,7 @@ common.xmpp.NS_DISCO_ITEMS) con.RegisterHandler('iq', self._IqPingCB, 'get', common.xmpp.NS_PING) - con.RegisterHandler('iq', self._search_fields_received, 'result', + con.RegisterHandler('iq', self._SearchCB, 'result', common.xmpp.NS_SEARCH) con.RegisterHandler('iq', self._PrivacySetCB, 'set', common.xmpp.NS_PRIVACY) diff -r 090d64323f65 -r 453cd33cf535 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Aug 29 20:22:20 2010 +0200 +++ b/src/common/connection_handlers_events.py Mon Aug 30 21:42:36 2010 +0200 @@ -500,4 +500,49 @@ if ns != 'storage:bookmarks': return self.parse_bookmarks() + return True + +class SearchFormReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): + name = 'search-form-received' + base_network_events = [] + + def generate(self): + self.get_jid_resource() + self.data = None + self.is_dataform = False + tag = self.iq_obj.getTag('query', namespace=xmpp.NS_SEARCH) + if not tag: + return True + self.data = tag.getTag('x', namespace=xmpp.NS_DATA) + if self.data: + self.is_dataform = True + return True + self.data = {} + for i in self.iq_obj.getQueryPayload(): + self.data[i.getName()] = i.getData() + return True + + +class SearchResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): + name = 'search-result-received' + base_network_events = [] + + def generate(self): + self.get_jid_resource() + self.data = None + self.is_dataform = False + tag = self.iq_obj.getTag('query', namespace=xmpp.NS_SEARCH) + if not tag: + return True + self.data = tag.getTag('x', namespace=xmpp.NS_DATA) + if self.data: + self.is_dataform = True + return True + self.data = [] + for item in tag.getTags('item'): + # We also show attributes. jid is there + f = item.attrs + for i in item.getPayload(): + f[i.getName()] = i.getData() + self.data.append(f) return True \ No newline at end of file diff -r 090d64323f65 -r 453cd33cf535 src/gui_interface.py --- a/src/gui_interface.py Sun Aug 29 20:22:20 2010 +0200 +++ b/src/gui_interface.py Mon Aug 30 21:42:36 2010 +0200 @@ -1704,20 +1704,6 @@ if ctrl: ctrl.print_conversation(_('Error.'), 'status') - def handle_event_search_form(self, account, data): - # ('SEARCH_FORM', account, (jid, dataform, is_dataform)) - if data[0] not in self.instances[account]['search']: - return - self.instances[account]['search'][data[0]].on_form_arrived(data[1], - data[2]) - - def handle_event_search_result(self, account, data): - # ('SEARCH_RESULT', account, (jid, dataform, is_dataform)) - if data[0] not in self.instances[account]['search']: - return - self.instances[account]['search'][data[0]].on_result_arrived(data[1], - data[2]) - def handle_event_resource_conflict(self, account, data): # ('RESOURCE_CONFLICT', account, ()) # First we go offline, but we don't overwrite status message @@ -2132,8 +2118,6 @@ 'PING_SENT': [self.handle_event_ping_sent], 'PING_REPLY': [self.handle_event_ping_reply], 'PING_ERROR': [self.handle_event_ping_error], - 'SEARCH_FORM': [self.handle_event_search_form], - 'SEARCH_RESULT': [self.handle_event_search_result], 'RESOURCE_CONFLICT': [self.handle_event_resource_conflict], 'PEP_CONFIG': [self.handle_event_pep_config], 'UNIQUE_ROOM_ID_UNSUPPORTED': \ diff -r 090d64323f65 -r 453cd33cf535 src/search_window.py --- a/src/search_window.py Sun Aug 29 20:22:20 2010 +0200 +++ b/src/search_window.py Mon Aug 30 21:42:36 2010 +0200 @@ -22,7 +22,9 @@ import gobject import gtk -from common import gajim, dataforms +from common import gajim +from common import dataforms +from common import ged import gtkgui_helpers import dialogs @@ -57,6 +59,11 @@ # Is there a jid column in results ? if -1: no, else column number self.jid_column = -1 + gajim.ged.register_event_handler('search-form-received', ged.GUI1, + self._nec_search_form_received) + gajim.ged.register_event_handler('search-result-received', ged.GUI1, + self._nec_search_result_received) + def request_form(self): gajim.connections[self.account].request_search_fields(self.jid) @@ -72,6 +79,10 @@ if self.pulse_id: gobject.source_remove(self.pulse_id) del gajim.interface.instances[self.account]['search'][self.jid] + gajim.ged.remove_event_handler('search-form-received', ged.GUI1, + self._nec_search_form_received) + gajim.ged.remove_event_handler('search-result-received', ged.GUI1, + self._nec_search_result_received) def on_close_button_clicked(self, button): self.window.destroy() @@ -115,16 +126,16 @@ gajim.interface.instances[self.account]['infos'][jid] = \ vcard.VcardWindow(contact, self.account) - def on_form_arrived(self, form, is_form): + def _nec_search_form_received(self, obj): if self.pulse_id: gobject.source_remove(self.pulse_id) self.progressbar.hide() self.label.hide() - if is_form: + if obj.is_dataform: self.is_form = True self.data_form_widget = dataforms_widget.DataFormWidget() - self.dataform = dataforms.ExtendForm(node = form) + self.dataform = dataforms.ExtendForm(node=obj.data) self.data_form_widget.set_sensitive(True) try: self.data_form_widget.data_form = self.dataform @@ -137,7 +148,7 @@ self.data_form_widget.title) else: self.is_form = False - self.data_form_widget = config.FakeDataForm(form) + self.data_form_widget = config.FakeDataForm(obj.data) self.data_form_widget.show_all() self.search_vbox.pack_start(self.data_form_widget) @@ -155,14 +166,14 @@ self.add_contact_button.set_sensitive(False) self.information_button.set_sensitive(False) - def on_result_arrived(self, form, is_form): + def _nec_search_result_received(self, obj): if self.pulse_id: gobject.source_remove(self.pulse_id) self.progressbar.hide() self.label.hide() - if not is_form: - if not form: + if not obj.is_dataform: + if not obj.data: self.label.set_text(_('No result')) self.label.show() return @@ -171,20 +182,19 @@ sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) self.result_treeview = gtk.TreeView() self.result_treeview.connect('cursor-changed', - self.on_result_treeview_cursor_changed) + self.on_result_treeview_cursor_changed) sw.add(self.result_treeview) # Create model - fieldtypes = [str]*len(form[0]) + fieldtypes = [str]*len(obj.data[0]) model = gtk.ListStore(*fieldtypes) # Copy data to model - for item in form: + for item in obj.data: model.append(item.values()) # Create columns counter = 0 - for field in form[0].keys(): - self.result_treeview.append_column( - gtk.TreeViewColumn(field, gtk.CellRendererText(), - text = counter)) + for field in obj.data[0].keys(): + self.result_treeview.append_column(gtk.TreeViewColumn(field, + gtk.CellRendererText(), text=counter)) if field == 'jid': self.jid_column = counter counter += 1 @@ -196,7 +206,7 @@ self.information_button.show() return - self.dataform = dataforms.ExtendForm(node = form) + self.dataform = dataforms.ExtendForm(node=obj.data) if len(self.dataform.items) == 0: # No result self.label.set_text(_('No result')) @@ -215,7 +225,7 @@ selection = self.result_treeview.get_selection() selection.set_mode(gtk.SELECTION_SINGLE) self.result_treeview.connect('cursor-changed', - self.on_result_treeview_cursor_changed) + self.on_result_treeview_cursor_changed) counter = 0 for field in self.dataform.items[0].fields: @@ -230,4 +240,4 @@ self.information_button.show() if self.data_form_widget.title: self.window.set_title('%s - Search - Gajim' % \ - self.data_form_widget.title) + self.data_form_widget.title)

1 0

gajim: use NEC to handle roster receipt
by Yann Leboulanger 29 Aug '10

29 Aug '10

changeset 090d64323f65 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=090d64323f65 description: use NEC to handle roster receipt diffstat: src/common/connection_handlers.py | 64 ++++++++++++++------------------ src/common/connection_handlers_events.py | 28 ++++++++++++++ 2 files changed, 56 insertions(+), 36 deletions(-) diffs (134 lines): diff -r 07225a721fda -r 090d64323f65 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Aug 28 13:58:35 2010 +0200 +++ b/src/common/connection_handlers.py Sun Aug 29 20:22:20 2010 +0200 @@ -1100,6 +1100,8 @@ gajim.ged.register_event_handler('private-storage-rosternotes-received', ged.CORE, self._nec_private_storate_rosternotes_received) gajim.nec.register_incoming_event(RosternotesReceivedEvent) + gajim.ged.register_event_handler('roster-received', ged.CORE, + self._nec_roster_received) def build_http_auth_answer(self, iq_obj, answer): if not self.connection or self.connected < 2: @@ -2120,19 +2122,21 @@ def discover_ft_proxies(self): cfg_proxies = gajim.config.get_per('accounts', self.name, 'file_transfer_proxies') - our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name) + '/' +\ - self.server_resource) + our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name) + \ + '/' + self.server_resource) if cfg_proxies: proxies = [e.strip() for e in cfg_proxies.split(',')] for proxy in proxies: gajim.proxy65_manager.resolve(proxy, self.connection, our_jid) def _on_roster_set(self, roster): - roster_version = roster.version - received_from_server = roster.received_from_server - raw_roster = roster.getRaw() - roster = {} - our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name)) + gajim.nec.push_incoming_event(RosterReceivedEvent(None, conn=self, + xmpp_roster=roster)) + + def _nec_roster_received(self, obj): + if obj.conn.name != self.name: + return + our_jid = gajim.get_jid_from_account(self.name) if self.connected > 1 and self.continue_connect_info: msg = self.continue_connect_info[1] sign_msg = self.continue_connect_info[2] @@ -2148,37 +2152,25 @@ if send_first_presence: self._send_first_presence(signed) - for jid in raw_roster: - try: - j = helpers.parse_jid(jid) - except Exception: - print >> sys.stderr, _('JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it') % jid - else: - infos = raw_roster[jid] - if jid != our_jid and (not infos['subscription'] or \ - infos['subscription'] == 'none') and (not infos['ask'] or \ - infos['ask'] == 'none') and not infos['name'] and \ - not infos['groups']: - # remove this useless item, it won't be shown in roster anyway - self.connection.getRoster().delItem(jid) - elif jid != our_jid: # don't add our jid - roster[j] = raw_roster[jid] - if gajim.jid_is_transport(jid) and \ - not gajim.get_transport_name_from_jid(jid): - # we can't determine which iconset to use - self.discoverInfo(jid) + for jid in obj.roster: + if jid != our_jid and gajim.jid_is_transport(jid) and \ + not gajim.get_transport_name_from_jid(jid): + # we can't determine which iconset to use + self.discoverInfo(jid) - gajim.logger.replace_roster(self.name, roster_version, roster) - if received_from_server: + gajim.logger.replace_roster(self.name, obj.version, obj.roster) + if obj.received_from_server: for contact in gajim.contacts.iter_contacts(self.name): - if not contact.is_groupchat() and contact.jid not in roster and \ - contact.jid != gajim.get_jid_from_account(self.name): - self.dispatch('ROSTER_INFO', (contact.jid, None, None, None, - ())) - for jid in roster: - self.dispatch('ROSTER_INFO', (jid, roster[jid]['name'], - roster[jid]['subscription'], roster[jid]['ask'], - roster[jid]['groups'])) + if not contact.is_groupchat() and contact.jid not in obj.roster\ + and contact.jid != our_jid: + gajim.nec.push_incoming_event(RosterInfoEvent(None, + conn=self, jid=contact.jid, nickname=None, sub=None, + ask=None, groups=())) + for jid, info in obj.roster.items(): + gajim.nec.push_incoming_event(RosterInfoEvent(None, + conn=self, jid=jid, nickname=info['name'], + sub=info['subscription'], ask=info['ask'], + groups=info['groups'])) def _send_first_presence(self, signed = ''): show = self.continue_connect_info[0] diff -r 07225a721fda -r 090d64323f65 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Aug 28 13:58:35 2010 +0200 +++ b/src/common/connection_handlers_events.py Sun Aug 29 20:22:20 2010 +0200 @@ -275,6 +275,34 @@ name = 'time-revised-request-received' base_network_events = [] +class RosterReceivedEvent(nec.NetworkIncomingEvent): + name = 'roster-received' + base_network_events = [] + + def generate(self): + self.version = self.xmpp_roster.version + self.received_from_server = self.xmpp_roster.received_from_server + self.roster = {} + raw_roster = self.xmpp_roster.getRaw() + our_jid = gajim.get_jid_from_account(self.name) + + for jid in raw_roster: + try: + j = helpers.parse_jid(jid) + except Exception: + print >> sys.stderr, _('JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it') % jid + else: + infos = raw_roster[jid] + if jid != our_jid and (not infos['subscription'] or \ + infos['subscription'] == 'none') and (not infos['ask'] or \ + infos['ask'] == 'none') and not infos['name'] and \ + not infos['groups']: + # remove this useless item, it won't be shown in roster anyway + self.conn.connection.getRoster().delItem(jid) + elif jid != our_jid: # don't add our jid + self.roster[j] = raw_roster[jid] + return True + class RosterSetReceivedEvent(nec.NetworkIncomingEvent): name = 'roster-set-received' base_network_events = []

1 0

gajim: save bookmarks / annotations only for our account
by Yann Leboulanger 28 Aug '10

28 Aug '10

changeset 07225a721fda in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=07225a721fda description: save bookmarks / annotations only for our account diffstat: src/common/connection_handlers.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (21 lines): diff -r fc9579b63df5 -r 07225a721fda src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Aug 28 00:30:23 2010 +0200 +++ b/src/common/connection_handlers.py Sat Aug 28 13:58:35 2010 +0200 @@ -1147,6 +1147,8 @@ self.dispatch('ERROR_ANSWER', (id_, jid_from, errmsg, errcode)) def _nec_private_storate_bookmarks_received(self, obj): + if obj.conn.name != self.name: + return resend_to_pubsub = False bm_jids = [b['jid'] for b in self.bookmarks] for bm in obj.bookmarks: @@ -1158,6 +1160,8 @@ self.store_bookmarks('pubsub') def _nec_private_storate_rosternotes_received(self, obj): + if obj.conn.name != self.name: + return for jid in obj.annotations: self.annotations[jid] = obj.annotations[jid]

1 0

gajim: remove useless import, coding standards
by Yann Leboulanger 27 Aug '10

27 Aug '10

changeset fc9579b63df5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fc9579b63df5 description: remove useless import, coding standards diffstat: src/common/pubsub.py | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diffs (65 lines): diff -r c9a551ad0bb4 -r fc9579b63df5 src/common/pubsub.py --- a/src/common/pubsub.py Sat Aug 28 00:25:07 2010 +0200 +++ b/src/common/pubsub.py Sat Aug 28 00:30:23 2010 +0200 @@ -24,7 +24,6 @@ import xmpp import gajim import connection_handlers -import nec import ged from connection_handlers_events import PubsubReceivedEvent from connection_handlers_events import PubsubBookmarksReceivedEvent @@ -33,7 +32,7 @@ class ConnectionPubSub: def __init__(self): - self.__callbacks={} + self.__callbacks = {} gajim.nec.register_incoming_event(PubsubBookmarksReceivedEvent) gajim.ged.register_event_handler('pubsub-bookmarks-received', ged.CORE, self._nec_pubsub_bookmarks_received) @@ -47,7 +46,7 @@ id_ = self.connection.send(query) - self.__callbacks[id_]=(cb, args, kwargs) + self.__callbacks[id_] = (cb, args, kwargs) def send_pb_subscribe(self, jid, node, cb, *args, **kwargs): if not self.connection or self.connected < 2: @@ -59,7 +58,7 @@ id_ = self.connection.send(query) - self.__callbacks[id_]=(cb, args, kwargs) + self.__callbacks[id_] = (cb, args, kwargs) def send_pb_unsubscribe(self, jid, node, cb, *args, **kwargs): if not self.connection or self.connected < 2: @@ -71,7 +70,7 @@ id_ = self.connection.send(query) - self.__callbacks[id_]=(cb, args, kwargs) + self.__callbacks[id_] = (cb, args, kwargs) def send_pb_publish(self, jid, node, item, id_, options=None): """ @@ -101,7 +100,7 @@ id_ = self.connection.send(query) if cb: - self.__callbacks[id_]=(cb, args, kwargs) + self.__callbacks[id_] = (cb, args, kwargs) def send_pb_retract(self, jid, node, id_): """ @@ -148,7 +147,7 @@ self.connection.SendAndCallForResponse(query, response, {'jid': jid, 'node': node}) - def send_pb_create(self, jid, node, configure = False, configure_form = None): + def send_pb_create(self, jid, node, configure=False, configure_form=None): """ Create a new node """

1 0

gajim: move network events classes to a new file
by Yann Leboulanger 27 Aug '10

27 Aug '10

changeset c9a551ad0bb4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c9a551ad0bb4 description: move network events classes to a new file diffstat: src/common/connection_handlers.py | 421 +--------------------------- src/common/connection_handlers_events.py | 475 +++++++++++++++++++++++++++++++ src/common/pubsub.py | 36 +-- 3 files changed, 480 insertions(+), 452 deletions(-) diffs (truncated from 980 to 300 lines): diff -r e35e21903e39 -r c9a551ad0bb4 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Aug 27 23:53:17 2010 +0200 +++ b/src/common/connection_handlers.py Sat Aug 28 00:25:07 2010 +0200 @@ -38,45 +38,10 @@ from time import (altzone, daylight, gmtime, localtime, mktime, strftime, time as time_time, timezone, tzname) from calendar import timegm -import datetime import common.xmpp import common.caps_cache as capscache -# This cass is needed in pubsub.py, so we need to create it before importing -# pubsub -class BookmarksHelper: - def parse_bookmarks(self): - self.bookmarks = [] - confs = self.base_event.storage_node.getTags('conference') - for conf in confs: - autojoin_val = conf.getAttr('autojoin') - if autojoin_val is None: # not there (it's optional) - autojoin_val = False - minimize_val = conf.getAttr('minimize') - if minimize_val is None: # not there (it's optional) - minimize_val = False - print_status = conf.getTagData('print_status') - if not print_status: - print_status = conf.getTagData('show_status') - try: - jid = helpers.parse_jid(conf.getAttr('jid')) - except common.helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % conf.getAttr('jid')) - continue - bm = {'name': conf.getAttr('name'), - 'jid': jid, - 'autojoin': autojoin_val, - 'minimize': minimize_val, - 'password': conf.getTagData('password'), - 'nick': conf.getTagData('nick'), - 'print_status': print_status} - - - bm_jids = [b['jid'] for b in self.bookmarks] - if bm['jid'] not in bm_jids: - self.bookmarks.append(bm) - from common import helpers from common import gajim from common import exceptions @@ -91,6 +56,7 @@ from common.message_archiving import ARCHIVING_COLLECTIONS_ARRIVED from common.message_archiving import ARCHIVING_COLLECTION_ARRIVED from common.message_archiving import ARCHIVING_MODIFICATIONS_ARRIVED +from common.connection_handlers_events import * from common import ged from common import nec @@ -2398,387 +2364,4 @@ con.RegisterHandler('iq', self._ResultCB, 'result') con.RegisterHandler('presence', self._StanzaArrivedCB) con.RegisterHandler('message', self._StanzaArrivedCB) - con.RegisterHandler('unknown', self._StreamCB, 'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams') - -class HelperEvent: - def get_jid_resource(self): - if hasattr(self, 'id_') and self.id_ in self.conn.groupchat_jids: - self.fjid = self.conn.groupchat_jids[self.id_] - del self.conn.groupchat_jids[self.id_] - else: - self.fjid = helpers.get_full_jid_from_iq(self.iq_obj) - self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) - - def get_id(self): - self.id_ = self.iq_obj.getID() - -class HttpAuthReceivedEvent(nec.NetworkIncomingEvent): - name = 'http-auth-received' - base_network_events = [] - - def generate(self): - self.opt = gajim.config.get_per('accounts', self.conn.name, 'http_auth') - self.iq_id = self.iq_obj.getTagAttr('confirm', 'id') - self.method = self.iq_obj.getTagAttr('confirm', 'method') - self.url = self.iq_obj.getTagAttr('confirm', 'url') - # In case it's a message with a body - self.msg = self.iq_obj.getTagData('body') - return True - -class LastResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'last-result-received' - base_network_events = [] - - def generate(self): - self.get_id() - self.get_jid_resource() - if self.id_ in self.conn.last_ids: - self.conn.last_ids.remove(self.id_) - - self.status = '' - self.seconds = -1 - - if self.iq_obj.getType() == 'error': - return True - - qp = self.iq_obj.getTag('query') - sec = qp.getAttr('seconds') - self.status = qp.getData() - try: - self.seconds = int(sec) - except Exception: - return - - return True - -class VersionResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'version-result-received' - base_network_events = [] - - def generate(self): - self.get_id() - self.get_jid_resource() - if self.id_ in self.conn.version_ids: - self.conn.version_ids.remove(self.id_) - - self.client_info = '' - self.os_info = '' - - if self.iq_obj.getType() == 'error': - return True - - qp = self.iq_obj.getTag('query') - if qp.getTag('name'): - self.client_info += qp.getTag('name').getData() - if qp.getTag('version'): - self.client_info += ' ' + qp.getTag('version').getData() - if qp.getTag('os'): - self.os_info += qp.getTag('os').getData() - - return True - -class TimeResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'time-result-received' - base_network_events = [] - - def generate(self): - self.get_id() - self.get_jid_resource() - if self.id_ in self.conn.entity_time_ids: - self.conn.entity_time_ids.remove(self.id_) - - self.time_info = '' - - if self.iq_obj.getType() == 'error': - return True - - qp = self.iq_obj.getTag('time') - if not qp: - # wrong answer - return - tzo = qp.getTag('tzo').getData() - if tzo.lower() == 'z': - tzo = '0:0' - tzoh, tzom = tzo.split(':') - utc_time = qp.getTag('utc').getData() - ZERO = datetime.timedelta(0) - class UTC(datetime.tzinfo): - def utcoffset(self, dt): - return ZERO - def tzname(self, dt): - return "UTC" - def dst(self, dt): - return ZERO - - class contact_tz(datetime.tzinfo): - def utcoffset(self, dt): - return datetime.timedelta(hours=int(tzoh), minutes=int(tzom)) - def tzname(self, dt): - return "remote timezone" - def dst(self, dt): - return ZERO - - try: - t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%SZ') - t = t.replace(tzinfo=UTC()) - self.time_info = t.astimezone(contact_tz()).strftime('%c') - except ValueError, e: - log.info('Wrong time format: %s' % str(e)) - return - - return True - -class GMailQueryReceivedEvent(nec.NetworkIncomingEvent): - name = 'gmail-notify' - base_network_events = [] - - def generate(self): - if not self.iq_obj.getTag('mailbox'): - return - mb = self.iq_obj.getTag('mailbox') - if not mb.getAttr('url'): - return - self.conn.gmail_url = mb.getAttr('url') - if mb.getNamespace() != common.xmpp.NS_GMAILNOTIFY: - return - self.newmsgs = mb.getAttr('total-matched') - if not self.newmsgs: - return - if self.newmsgs == '0': - return - # there are new messages - self.gmail_messages_list = [] - if mb.getTag('mail-thread-info'): - gmail_messages = mb.getTags('mail-thread-info') - for gmessage in gmail_messages: - unread_senders = [] - for sender in gmessage.getTag('senders').getTags( - 'sender'): - if sender.getAttr('unread') != '1': - continue - if sender.getAttr('name'): - unread_senders.append(sender.getAttr('name') + \ - '< ' + sender.getAttr('address') + '>') - else: - unread_senders.append(sender.getAttr('address')) - - if not unread_senders: - continue - gmail_subject = gmessage.getTag('subject').getData() - gmail_snippet = gmessage.getTag('snippet').getData() - tid = int(gmessage.getAttr('tid')) - if not self.conn.gmail_last_tid or \ - tid > self.conn.gmail_last_tid: - self.conn.gmail_last_tid = tid - self.gmail_messages_list.append({ - 'From': unread_senders, - 'Subject': gmail_subject, - 'Snippet': gmail_snippet, - 'url': gmessage.getAttr('url'), - 'participation': gmessage.getAttr('participation'), - 'messages': gmessage.getAttr('messages'), - 'date': gmessage.getAttr('date')}) - self.conn.gmail_last_time = int(mb.getAttr('result-time')) - - self.jid = gajim.get_jid_from_account(self.name) - log.debug(('You have %s new gmail e-mails on %s.') % (self.newmsgs, - self.jid)) - return True - -class RosterItemExchangeEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'roster-item-exchange-received' - base_network_events = [] - - def generate(self): - self.get_id() - self.get_jid_resource() - self.exchange_items_list = {} - items_list = self.iq_obj.getTag('x').getChildren() - if not items_list: - return - self.action = items_list[0].getAttr('action') - if self.action is None: - self.action = 'add' - for item in self.iq_obj.getTag('x', namespace=common.xmpp.NS_ROSTERX).\ - getChildren(): - try: - jid = helpers.parse_jid(item.getAttr('jid')) - except common.helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % item.getAttr('jid')) - continue - name = item.getAttr('name') - contact = gajim.contacts.get_contact(self.conn.name, jid) - groups = [] - same_groups = True - for group in item.getTags('group'): - groups.append(group.getData()) - # check that all suggested groups are in the groups we have for this - # contact - if not contact or group not in contact.groups: - same_groups = False - if contact: - # check that all groups we have for this contact are in the - # suggested groups - for group in contact.groups: - if group not in groups: - same_groups = False - if contact.sub in ('both', 'to') and same_groups: - continue - self.exchange_items_list[jid] = [] - self.exchange_items_list[jid].append(name) - self.exchange_items_list[jid].append(groups) - if self.exchange_items_list: - return True - -class VersionRequestEvent(nec.NetworkIncomingEvent): - name = 'version-request-received' - base_network_events = [] - -class LastRequestEvent(nec.NetworkIncomingEvent): - name = 'last-request-received' - base_network_events = []

1 0

gajim: use NEC to handle bookmarks via pubsub.
by Yann Leboulanger 27 Aug '10

27 Aug '10

changeset e35e21903e39 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e35e21903e39 description: use NEC to handle bookmarks via pubsub. diffstat: src/common/connection_handlers.py | 112 ++++++++++++------------------------- src/common/pubsub.py | 60 +++++++++++++++---- 2 files changed, 82 insertions(+), 90 deletions(-) diffs (232 lines): diff -r dd6208b3e902 -r e35e21903e39 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Aug 27 22:45:59 2010 +0200 +++ b/src/common/connection_handlers.py Fri Aug 27 23:53:17 2010 +0200 @@ -43,6 +43,40 @@ import common.xmpp import common.caps_cache as capscache +# This cass is needed in pubsub.py, so we need to create it before importing +# pubsub +class BookmarksHelper: + def parse_bookmarks(self): + self.bookmarks = [] + confs = self.base_event.storage_node.getTags('conference') + for conf in confs: + autojoin_val = conf.getAttr('autojoin') + if autojoin_val is None: # not there (it's optional) + autojoin_val = False + minimize_val = conf.getAttr('minimize') + if minimize_val is None: # not there (it's optional) + minimize_val = False + print_status = conf.getTagData('print_status') + if not print_status: + print_status = conf.getTagData('show_status') + try: + jid = helpers.parse_jid(conf.getAttr('jid')) + except common.helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % conf.getAttr('jid')) + continue + bm = {'name': conf.getAttr('name'), + 'jid': jid, + 'autojoin': autojoin_val, + 'minimize': minimize_val, + 'password': conf.getTagData('password'), + 'nick': conf.getTagData('nick'), + 'print_status': print_status} + + + bm_jids = [b['jid'] for b in self.bookmarks] + if bm['jid'] not in bm_jids: + self.bookmarks.append(bm) + from common import helpers from common import gajim from common import exceptions @@ -1196,49 +1230,6 @@ self.seclabel_catalogues[to] = [[], None, None] self.seclabel_catalogues[to][0].append(callback) - def _parse_bookmarks(self, storage, storage_type): - """ - storage_type can be 'pubsub' or 'xml' to tell from where we got bookmarks - """ - # Bookmarked URLs and Conferences - # http://www.xmpp.org/extensions/xep-0048.html - resend_to_pubsub = False - confs = storage.getTags('conference') - for conf in confs: - autojoin_val = conf.getAttr('autojoin') - if autojoin_val is None: # not there (it's optional) - autojoin_val = False - minimize_val = conf.getAttr('minimize') - if minimize_val is None: # not there (it's optional) - minimize_val = False - print_status = conf.getTagData('print_status') - if not print_status: - print_status = conf.getTagData('show_status') - try: - bm = {'name': conf.getAttr('name'), - 'jid': helpers.parse_jid(conf.getAttr('jid')), - 'autojoin': autojoin_val, - 'minimize': minimize_val, - 'password': conf.getTagData('password'), - 'nick': conf.getTagData('nick'), - 'print_status': print_status} - except common.helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % conf.getAttr('jid')) - continue - - bm_jids = [b['jid'] for b in self.bookmarks] - if bm['jid'] not in bm_jids: - self.bookmarks.append(bm) - if storage_type == 'xml': - # We got a bookmark that was not in pubsub - resend_to_pubsub = True - self.dispatch('BOOKMARKS', self.bookmarks) - if storage_type == 'pubsub': - # We gor bookmarks from pubsub, now get those from xml to merge them - self.get_bookmarks(storage_type='xml') - if self.pubsub_supported and resend_to_pubsub: - self.store_bookmarks('pubsub') - def _rosterSetCB(self, con, iq_obj): log.debug('rosterSetCB') gajim.nec.push_incoming_event(RosterSetReceivedEvent(None, conn=self, @@ -2740,38 +2731,6 @@ self.namespace = self.storage_node.getNamespace() return True -class BookmarksHelper: - def parse_bookmarks(self): - self.bookmarks = [] - confs = self.base_event.storage_node.getTags('conference') - for conf in confs: - autojoin_val = conf.getAttr('autojoin') - if autojoin_val is None: # not there (it's optional) - autojoin_val = False - minimize_val = conf.getAttr('minimize') - if minimize_val is None: # not there (it's optional) - minimize_val = False - print_status = conf.getTagData('print_status') - if not print_status: - print_status = conf.getTagData('show_status') - try: - jid = helpers.parse_jid(conf.getAttr('jid')) - except common.helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % conf.getAttr('jid')) - continue - bm = {'name': conf.getAttr('name'), - 'jid': jid, - 'autojoin': autojoin_val, - 'minimize': minimize_val, - 'password': conf.getTagData('password'), - 'nick': conf.getTagData('nick'), - 'print_status': print_status} - - - bm_jids = [b['jid'] for b in self.bookmarks] - if bm['jid'] not in bm_jids: - self.bookmarks.append(bm) - class PrivateStorageBookmarksReceivedEvent(nec.NetworkIncomingEvent, BookmarksHelper): name = 'private-storage-bookmarks-received' @@ -2786,7 +2745,8 @@ class BookmarksReceivedEvent(nec.NetworkIncomingEvent): name = 'bookmarks-received' - base_network_events = ['private-storage-bookmarks-received'] + base_network_events = ['private-storage-bookmarks-received', + 'pubsub-bookmarks-received'] def generate(self): self.conn = self.base_event.conn diff -r dd6208b3e902 -r e35e21903e39 src/common/pubsub.py --- a/src/common/pubsub.py Fri Aug 27 22:45:59 2010 +0200 +++ b/src/common/pubsub.py Fri Aug 27 23:53:17 2010 +0200 @@ -24,12 +24,17 @@ import xmpp import gajim import connection_handlers +import nec +import ged import logging log = logging.getLogger('gajim.c.pubsub') class ConnectionPubSub: def __init__(self): self.__callbacks={} + gajim.nec.register_incoming_event(PubsubBookmarksReceivedEvent) + gajim.ged.register_event_handler('pubsub-bookmarks-received', + ged.CORE, self._nec_pubsub_bookmarks_received) def send_pb_subscription_query(self, jid, cb, *args, **kwargs): if not self.connection or self.connected < 2: @@ -174,21 +179,16 @@ cb(conn, stanza, *args, **kwargs) except Exception: pass + gajim.nec.push_incoming_event(PubsubReceivedEvent(None, + conn=self, iq_obj=stanza)) - pubsub = stanza.getTag('pubsub') - if not pubsub: - return - items = pubsub.getTag('items') - if not items: - return - item = items.getTag('item') - if not item: - return - storage = item.getTag('storage') - if storage: - ns = storage.getNamespace() - if ns == 'storage:bookmarks': - self._parse_bookmarks(storage, 'pubsub') + def _nec_pubsub_bookmarks_received(self, obj): + bm_jids = [b['jid'] for b in self.bookmarks] + for bm in obj.bookmarks: + if bm['jid'] not in bm_jids: + self.bookmarks.append(bm) + # We got bookmarks from pubsub, now get those from xml to merge them + self.get_bookmarks(storage_type='xml') def _PubSubErrorCB(self, conn, stanza): log.debug('_PubsubErrorCB') @@ -212,3 +212,35 @@ query.setID(id_) self.awaiting_answers[id_] = (connection_handlers.PEP_CONFIG,) self.connection.send(query) + +class PubsubReceivedEvent(nec.NetworkIncomingEvent): + name = 'pubsub-received' + base_network_events = [] + + def generate(self): + self.pubsub_node = self.iq_obj.getTag('pubsub') + if not self.pubsub_node: + return + self.items_node = self.pubsub_node.getTag('items') + if not self.items_node: + return + self.item_node = self.items_node.getTag('item') + if not self.item_node: + return + return True + +class PubsubBookmarksReceivedEvent(nec.NetworkIncomingEvent, +connection_handlers.BookmarksHelper): + name = 'pubsub-bookmarks-received' + base_network_events = ['pubsub-received'] + + def generate(self): + self.conn = self.base_event.conn + storage = self.base_event.item_node.getTag('storage') + if not storage: + return + ns = storage.getNamespace() + if ns != 'storage:bookmarks': + return + self.parse_bookmarks() + return True \ No newline at end of file

1 0

gajim: use NEC to handle private storage stanza
by Yann Leboulanger 27 Aug '10

27 Aug '10

changeset dd6208b3e902 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dd6208b3e902 description: use NEC to handle private storage stanza diffstat: src/common/connection_handlers.py | 155 ++++++++++++++++++++++++++++++------- src/gui_interface.py | 16 +-- 2 files changed, 133 insertions(+), 38 deletions(-) diffs (285 lines): diff -r 25c13cc61f07 -r dd6208b3e902 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Aug 27 22:45:16 2010 +0200 +++ b/src/common/connection_handlers.py Fri Aug 27 22:45:59 2010 +0200 @@ -1091,6 +1091,15 @@ ged.CORE, self._nec_time_revised_request_received) gajim.ged.register_event_handler('roster-set-received', ged.CORE, self._nec_roster_set_received) + gajim.nec.register_incoming_event(PrivateStorageBookmarksReceivedEvent) + gajim.ged.register_event_handler('private-storage-bookmarks-received', + ged.CORE, self._nec_private_storate_bookmarks_received) + gajim.nec.register_incoming_event(BookmarksReceivedEvent) + gajim.nec.register_incoming_event( + PrivateStorageRosternotesReceivedEvent) + gajim.ged.register_event_handler('private-storage-rosternotes-received', + ged.CORE, self._nec_private_storate_rosternotes_received) + gajim.nec.register_incoming_event(RosternotesReceivedEvent) def build_http_auth_answer(self, iq_obj, answer): if not self.connection or self.connected < 2: @@ -1137,34 +1146,28 @@ errcode = iq_obj.getErrorCode() self.dispatch('ERROR_ANSWER', (id_, jid_from, errmsg, errcode)) + def _nec_private_storate_bookmarks_received(self, obj): + resend_to_pubsub = False + bm_jids = [b['jid'] for b in self.bookmarks] + for bm in obj.bookmarks: + if bm['jid'] not in bm_jids: + self.bookmarks.append(bm) + # We got a bookmark that was not in pubsub + resend_to_pubsub = True + if self.pubsub_supported and resend_to_pubsub: + self.store_bookmarks('pubsub') + + def _nec_private_storate_rosternotes_received(self, obj): + for jid in obj.annotations: + self.annotations[jid] = obj.annotations[jid] + def _PrivateCB(self, con, iq_obj): """ Private Data (XEP 048 and 049) """ log.debug('PrivateCB') - query = iq_obj.getTag('query') - storage = query.getTag('storage') - if storage: - ns = storage.getNamespace() - if ns == 'storage:bookmarks': - self._parse_bookmarks(storage, 'xml') - elif ns == 'gajim:prefs': - # Preferences data - # http://www.xmpp.org/extensions/xep-0049.html - #TODO: implement this - pass - elif ns == 'storage:rosternotes': - # Annotations - # http://www.xmpp.org/extensions/xep-0145.html - notes = storage.getTags('note') - for note in notes: - try: - jid = helpers.parse_jid(note.getAttr('jid')) - except common.helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % note.getAttr('jid')) - continue - annotation = note.getData() - self.annotations[jid] = annotation + gajim.nec.push_incoming_event(PrivateStorageReceivedEvent(None, + conn=self, iq_obj=iq_obj)) def _SecLabelCB(self, con, iq_obj): """ @@ -1264,7 +1267,7 @@ gajim.nec.push_incoming_event(VersionRequestEvent(None, conn=self, iq_obj=iq_obj)) raise common.xmpp.NodeProcessed - + def _nec_version_request_received(self, obj): if obj.conn.name != self.name: return @@ -2434,7 +2437,7 @@ class LastResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'last-result-received' base_network_events = [] - + def generate(self): self.get_id() self.get_jid_resource() @@ -2460,7 +2463,7 @@ class VersionResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'version-result-received' base_network_events = [] - + def generate(self): self.get_id() self.get_jid_resource() @@ -2594,7 +2597,7 @@ class RosterItemExchangeEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'roster-item-exchange-received' base_network_events = [] - + def generate(self): self.get_id() self.get_jid_resource() @@ -2639,11 +2642,11 @@ class VersionRequestEvent(nec.NetworkIncomingEvent): name = 'version-request-received' base_network_events = [] - + class LastRequestEvent(nec.NetworkIncomingEvent): name = 'last-request-received' base_network_events = [] - + class TimeRequestEvent(nec.NetworkIncomingEvent): name = 'time-request-received' base_network_events = [] @@ -2725,3 +2728,97 @@ if reason: self.users_dict[jid]['reason'] = reason return True + +class PrivateStorageReceivedEvent(nec.NetworkIncomingEvent): + name = 'private-storage-received' + base_network_events = [] + + def generate(self): + query = self.iq_obj.getTag('query') + self.storage_node = query.getTag('storage') + if self.storage_node: + self.namespace = self.storage_node.getNamespace() + return True + +class BookmarksHelper: + def parse_bookmarks(self): + self.bookmarks = [] + confs = self.base_event.storage_node.getTags('conference') + for conf in confs: + autojoin_val = conf.getAttr('autojoin') + if autojoin_val is None: # not there (it's optional) + autojoin_val = False + minimize_val = conf.getAttr('minimize') + if minimize_val is None: # not there (it's optional) + minimize_val = False + print_status = conf.getTagData('print_status') + if not print_status: + print_status = conf.getTagData('show_status') + try: + jid = helpers.parse_jid(conf.getAttr('jid')) + except common.helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % conf.getAttr('jid')) + continue + bm = {'name': conf.getAttr('name'), + 'jid': jid, + 'autojoin': autojoin_val, + 'minimize': minimize_val, + 'password': conf.getTagData('password'), + 'nick': conf.getTagData('nick'), + 'print_status': print_status} + + + bm_jids = [b['jid'] for b in self.bookmarks] + if bm['jid'] not in bm_jids: + self.bookmarks.append(bm) + +class PrivateStorageBookmarksReceivedEvent(nec.NetworkIncomingEvent, +BookmarksHelper): + name = 'private-storage-bookmarks-received' + base_network_events = ['private-storage-received'] + + def generate(self): + self.conn = self.base_event.conn + if self.base_event.namespace != 'storage:bookmarks': + return + self.parse_bookmarks() + return True + +class BookmarksReceivedEvent(nec.NetworkIncomingEvent): + name = 'bookmarks-received' + base_network_events = ['private-storage-bookmarks-received'] + + def generate(self): + self.conn = self.base_event.conn + self.bookmarks = self.base_event.bookmarks + return True + +class PrivateStorageRosternotesReceivedEvent(nec.NetworkIncomingEvent): + name = 'private-storage-rosternotes-received' + base_network_events = ['private-storage-received'] + + def generate(self): + self.conn = self.base_event.conn + if self.base_event.namespace != 'storage:rosternotes': + return + notes = self.base_event.storage_node.getTags('note') + self.annotations = {} + for note in notes: + try: + jid = helpers.parse_jid(note.getAttr('jid')) + except common.helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % note.getAttr('jid')) + continue + annotation = note.getData() + self.annotations[jid] = annotation + if self.annotations: + return True + +class RosternotesReceivedEvent(nec.NetworkIncomingEvent): + name = 'rosternotes-received' + base_network_events = ['private-storage-rosternotes-received'] + + def generate(self): + self.conn = self.base_event.conn + self.annotations = self.base_event.annotations + return True \ No newline at end of file diff -r 25c13cc61f07 -r dd6208b3e902 src/gui_interface.py --- a/src/gui_interface.py Fri Aug 27 22:45:16 2010 +0200 +++ b/src/gui_interface.py Fri Aug 27 22:45:59 2010 +0200 @@ -1008,12 +1008,10 @@ f.value = True elif f.var == 'public_list': f.value = False - gajim.connections[account].send_gc_config(obj.jid, - obj.dataform.get_purged()) + obj.conn.send_gc_config(obj.jid, obj.dataform.get_purged()) else: # use default configuration - gajim.connections[account].send_gc_config(obj.jid, - obj.form_node) + obj.conn.send_gc_config(obj.jid, obj.form_node) # invite contacts # check if it is necessary to add <continue /> continue_tag = False @@ -1021,7 +1019,7 @@ continue_tag = True if 'invities' in gajim.automatic_rooms[account][obj.jid]: for jid in gajim.automatic_rooms[account][obj.jid]['invities']: - gajim.connections[account].send_invite(obj.jid, jid, + obj.conn.send_invite(obj.jid, jid, continue_tag=continue_tag) del gajim.automatic_rooms[account][obj.jid] elif obj.jid not in self.instances[account]['gc_config']: @@ -1254,7 +1252,7 @@ self.roster.draw_group(group, account) self.roster.draw_contact(obj.jid, account) - def handle_event_bookmarks(self, account, bms): + def handle_event_bookmarks(self, obj): # ('BOOKMARKS', account, [{name,jid,autojoin,password,nick}, {}]) # We received a bookmark item from the server (JEP48) # Auto join GC windows if neccessary @@ -1262,10 +1260,10 @@ self.roster.set_actions_menu_needs_rebuild() invisible_show = gajim.SHOW_LIST.index('invisible') # do not autojoin if we are invisible - if gajim.connections[account].connected == invisible_show: + if obj.conn.connected == invisible_show: return - self.auto_join_bookmarks(account) + self.auto_join_bookmarks(obj.conn.name) def handle_event_file_send_error(self, account, array): jid = array[0] @@ -2110,7 +2108,6 @@ 'GC_PASSWORD_REQUIRED': [self.handle_event_gc_password_required], 'GC_ERROR': [self.handle_event_gc_error], 'BAD_PASSPHRASE': [self.handle_event_bad_passphrase], - 'BOOKMARKS': [self.handle_event_bookmarks], 'CON_TYPE': [self.handle_event_con_type], 'CONNECTION_LOST': [self.handle_event_connection_lost], 'FILE_REQUEST': [self.handle_event_file_request], @@ -2160,6 +2157,7 @@ 'CAPS_RECEIVED': [self.handle_event_caps_received], 'ARCHIVING_CHANGED': [self.handle_event_archiving_changed], 'ARCHIVING_ERROR': [self.handle_event_archiving_error], + 'bookmarks-received': [self.handle_event_bookmarks], 'gmail-notify': [self.handle_event_gmail_notify], 'http-auth-received': [self.handle_event_http_auth], 'last-result-received': [self.handle_event_last_status_time],

1 0

gajim: raise event through ged before generating child events
by Yann Leboulanger 27 Aug '10

27 Aug '10

changeset 25c13cc61f07 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=25c13cc61f07 description: raise event through ged before generating child events diffstat: src/common/nec.py | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diffs (44 lines): diff -r 2c0a0c1658b2 -r 25c13cc61f07 src/common/nec.py --- a/src/common/nec.py Fri Aug 27 11:47:38 2010 +0200 +++ b/src/common/nec.py Fri Aug 27 22:45:16 2010 +0200 @@ -58,8 +58,8 @@ def push_incoming_event(self, event_object): if event_object.generate(): - if self._generate_events_based_on_incoming_event(event_object): - gajim.ged.raise_event(event_object.name, event_object) + gajim.ged.raise_event(event_object.name, event_object) + self._generate_events_based_on_incoming_event(event_object) def push_outgoing_event(self, event_object): pass @@ -78,9 +78,8 @@ for new_event_class in self.incoming_events_generators[base_event_name]: new_event_object = new_event_class(None, base_event=event_object) if new_event_object.generate(): - if self._generate_events_based_on_incoming_event(new_event_object): - gajim.ged.raise_event(new_event_object.name, new_event_object) - return True + gajim.ged.raise_event(new_event_object.name, new_event_object) + self._generate_events_based_on_incoming_event(new_event_object) class NetworkEvent(object): name = '' @@ -96,7 +95,7 @@ def init(self): pass - + def generate(self): ''' Generates new event (sets it's attributes) based on event object. @@ -122,7 +121,7 @@ def __repr__(self): return '<NetworkEvent object> Attributes: %s'%(pformat(self.__dict__)) - + class NetworkIncomingEvent(NetworkEvent): base_network_events = [] '''

1 0

gajim: fix test suite
by Yann Leboulanger 27 Aug '10

27 Aug '10

changeset 2c0a0c1658b2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2c0a0c1658b2 description: fix test suite diffstat: test/integration/test_roster.py | 5 +- test/integration/test_xmpp_client_nb.py | 2 +- test/lib/__init__.py | 3 + test/lib/gajim_mocks.py | 2 + test/runtests.py | 26 +++++++------- test/unit/test_gui_interface.py | 59 --------------------------------- 6 files changed, 22 insertions(+), 75 deletions(-) diffs (175 lines): diff -r 778f3f4314f8 -r 2c0a0c1658b2 test/integration/test_roster.py --- a/test/integration/test_roster.py Fri Aug 27 11:47:29 2010 +0200 +++ b/test/integration/test_roster.py Fri Aug 27 11:47:38 2010 +0200 @@ -73,8 +73,9 @@ msg='Contact iter invalid') c_model = self.roster.model[titerC] - self.assertEquals(contact.get_shown_name(), c_model[self.C_NAME], - msg='Contact name missmatch') + # name can be stricked if contact or group is blocked +# self.assertEquals(contact.get_shown_name(), c_model[self.C_NAME], +# msg='Contact name missmatch') self.assertEquals(contact.jid, c_model[self.C_JID], msg='Jid missmatch') diff -r 778f3f4314f8 -r 2c0a0c1658b2 test/integration/test_xmpp_client_nb.py --- a/test/integration/test_xmpp_client_nb.py Fri Aug 27 11:47:29 2010 +0200 +++ b/test/integration/test_xmpp_client_nb.py Fri Aug 27 11:47:38 2010 +0200 @@ -50,7 +50,7 @@ ''' class TempConnection(): - def get_password(self, cb): + def get_password(self, cb, mechanism): if wrong_pass: cb('wrong pass') else: diff -r 778f3f4314f8 -r 2c0a0c1658b2 test/lib/__init__.py --- a/test/lib/__init__.py Fri Aug 27 11:47:29 2010 +0200 +++ b/test/lib/__init__.py Fri Aug 27 11:47:38 2010 +0200 @@ -19,6 +19,8 @@ # a temporary version of ~/.gajim for testing configdir = gajim_root + '/test/tmp' +# plugins config dir +pluginsconfigdir = configdir + '/pluginsconfig' # define _ for i18n import __builtin__ @@ -31,6 +33,7 @@ shutil.rmtree(configdir) os.mkdir(configdir) + os.mkdir(pluginsconfigdir) import common.configpaths common.configpaths.gajimpaths.init(configdir) diff -r 778f3f4314f8 -r 2c0a0c1658b2 test/lib/gajim_mocks.py --- a/test/lib/gajim_mocks.py Fri Aug 27 11:47:29 2010 +0200 +++ b/test/lib/gajim_mocks.py Fri Aug 27 11:47:38 2010 +0200 @@ -4,6 +4,7 @@ from mock import Mock from common import gajim +from common import ged from common.connection_handlers import ConnectionHandlersBase @@ -96,6 +97,7 @@ gajim.interface = self self.msg_win_mgr = Mock() self.roster = Mock() + gajim.ged = ged.GlobalEventsDispatcher() self.remote_ctrl = None self.instances = {} diff -r 778f3f4314f8 -r 2c0a0c1658b2 test/runtests.py --- a/test/runtests.py Fri Aug 27 11:47:29 2010 +0200 +++ b/test/runtests.py Fri Aug 27 11:47:38 2010 +0200 @@ -36,23 +36,23 @@ # new test modules need to be added manually modules = ( 'unit.test_xmpp_dispatcher_nb', - 'unit.test_xmpp_transports_nb', - 'unit.test_protocol_caps', - 'unit.test_caps_cache', - 'unit.test_contacts', - 'unit.test_sessions', - 'unit.test_account', - 'unit.test_gui_interface', - ) + 'unit.test_xmpp_transports_nb', + 'unit.test_protocol_caps', + 'unit.test_caps_cache', + 'unit.test_contacts', + 'unit.test_sessions', + 'unit.test_account', + 'unit.test_gui_interface', + ) #modules = () if use_x: modules += ('integration.test_gui_event_integration', - 'integration.test_roster', - 'integration.test_resolver', - 'integration.test_xmpp_client_nb', - 'integration.test_xmpp_transports_nb' - ) + 'integration.test_roster', + 'integration.test_resolver', + 'integration.test_xmpp_client_nb', + 'integration.test_xmpp_transports_nb' + ) nb_errors = 0 nb_failures = 0 diff -r 778f3f4314f8 -r 2c0a0c1658b2 test/unit/test_gui_interface.py --- a/test/unit/test_gui_interface.py Fri Aug 27 11:47:29 2010 +0200 +++ b/test/unit/test_gui_interface.py Fri Aug 27 11:47:38 2010 +0200 @@ -23,65 +23,6 @@ interface = Interface() interface.run() - def test_dispatch(self): - ''' Test dispatcher forwarding network events to handler_* methods ''' - sut = Interface() - - success = sut.dispatch('No Such Event', None, None) - self.assertFalse(success, msg="Unexisting event handled") - - success = sut.dispatch('STANZA_ARRIVED', None, None) - self.assertTrue(success, msg="Existing event must be handled") - - def test_register_unregister_single_handler(self): - ''' Register / Unregister a custom event handler ''' - sut = Interface() - event = 'TESTS_ARE_COOL_EVENT' - - self.called = False - def handler(account, data): - self.assertEqual(account, 'account') - self.assertEqual(data, 'data') - self.called = True - - self.assertFalse(self.called) - sut.register_handler('TESTS_ARE_COOL_EVENT', handler) - sut.dispatch(event, 'account', 'data') - self.assertTrue(self.called, msg="Handler should have been called") - - self.called = False - sut.unregister_handler('TESTS_ARE_COOL_EVENT', handler) - sut.dispatch(event, 'account', 'data') - self.assertFalse(self.called, msg="Handler should no longer be called") - - - def test_dispatch_to_multiple_handlers(self): - ''' Register and dispatch a single event to multiple handlers ''' - sut = Interface() - event = 'SINGLE_EVENT' - - self.called_a = False - self.called_b = False - - def handler_a(account, data): - self.assertFalse(self.called_a, msg="One must only be notified once") - self.called_a = True - - def handler_b(account, data): - self.assertFalse(self.called_b, msg="One must only be notified once") - self.called_b = True - - sut.register_handler(event, handler_a) - sut.register_handler(event, handler_b) - - # register again - sut.register_handler('SOME_OTHER_EVENT', handler_b) - sut.register_handler(event, handler_a) - - sut.dispatch(event, 'account', 'data') - self.assertTrue(self.called_a and self.called_b, - msg="Both handlers should have been called") - def test_links_regexp_entire(self): sut = Interface() def assert_matches_all(str_):

1 0

gajim: better test
by Yann Leboulanger 27 Aug '10

27 Aug '10

changeset 778f3f4314f8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=778f3f4314f8 description: better test diffstat: src/roster_window.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 86508b573578 -r 778f3f4314f8 src/roster_window.py --- a/src/roster_window.py Thu Aug 26 17:19:39 2010 +0200 +++ b/src/roster_window.py Fri Aug 27 11:47:29 2010 +0200 @@ -1747,6 +1747,7 @@ # 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 account in self._iters: self._iters[account] = {'account': None, 'groups': {}, 'contacts': {}} if account not in gajim.groups:

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 August 2010