Commits November 2010

commits@gajim.org

3 participants
111 discussions

gajim: Fix gtk warning again. Fixed #6053
by Denis Fomin 29 Nov '10

29 Nov '10

changeset d7a7be8def5d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d7a7be8def5d description: Fix gtk warning again. Fixed #6053 diffstat: src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r d41e8ac7d98d -r d7a7be8def5d src/roster_window.py --- a/src/roster_window.py Mon Nov 29 13:20:30 2010 +0300 +++ b/src/roster_window.py Mon Nov 29 13:25:17 2010 +0300 @@ -1085,6 +1085,9 @@ return False def draw_contact(self, jid, account, selected=False, focus=False): + gobject.idle_add(self._draw_contact, jid, account, selected, focus) + + def _draw_contact(self, jid, account, selected=False, focus=False): """ Draw the correct state image, name BUT not avatar """

1 0

gajim: Revert [12651]
by Denis Fomin 29 Nov '10

29 Nov '10

changeset d41e8ac7d98d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d41e8ac7d98d description: Revert [12651] diffstat: src/roster_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r fa54f28d6da8 -r d41e8ac7d98d src/roster_window.py --- a/src/roster_window.py Mon Nov 29 11:11:24 2010 +0100 +++ b/src/roster_window.py Mon Nov 29 13:20:30 2010 +0300 @@ -1196,8 +1196,8 @@ self._get_nearby_family_and_big_brother(family, account)[1:] is_big_brother = (jid, account) == (bb_jid, bb_account) iters = self._get_contact_iter(jid, account) - if iters != [] and is_big_brother and (len(family) > 1): - have_visible_children = self.modelfilter.iter_has_child(iters[0]) + have_visible_children = iters and \ + self.modelfilter.iter_has_child(iters[0]) if have_visible_children: # We are the big brother and have a visible family

1 0

gajim: use NEC to handle signed-in events
by Yann Leboulanger 29 Nov '10

29 Nov '10

changeset fa54f28d6da8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fa54f28d6da8 description: use NEC to handle signed-in events diffstat: src/common/connection.py | 2 +- src/common/connection_handlers.py | 2 +- src/common/connection_handlers_events.py | 4 ++ src/common/zeroconf/connection_zeroconf.py | 2 +- src/groupchat_control.py | 13 ++++++++ src/gui_interface.py | 48 +++++++++++------------------ src/roster_window.py | 6 +++ 7 files changed, 45 insertions(+), 32 deletions(-) diffs (201 lines): diff -r f383d60c4dd3 -r fa54f28d6da8 src/common/connection.py --- a/src/common/connection.py Mon Nov 29 10:50:30 2010 +0100 +++ b/src/common/connection.py Mon Nov 29 11:11:24 2010 +0100 @@ -1547,7 +1547,7 @@ self.get_annotations() # Inform GUI we just signed in - self.dispatch('SIGNED_IN', ()) + gajim.nec.push_incoming_event(SignedInEvent(None, conn=self)) def get_signed_presence(self, msg, callback = None): if gajim.config.get_per('accounts', self.name, 'gpg_sign_presence'): diff -r f383d60c4dd3 -r fa54f28d6da8 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Nov 29 10:50:30 2010 +0100 +++ b/src/common/connection_handlers.py Mon Nov 29 11:11:24 2010 +0100 @@ -2031,7 +2031,7 @@ self.get_annotations() # Inform GUI we just signed in - self.dispatch('SIGNED_IN', ()) + gajim.nec.push_incoming_event(SignedInEvent(None, conn=self)) self.send_awaiting_pep() self.continue_connect_info = None diff -r f383d60c4dd3 -r fa54f28d6da8 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Nov 29 10:50:30 2010 +0100 +++ b/src/common/connection_handlers_events.py Mon Nov 29 11:11:24 2010 +0100 @@ -1574,3 +1574,7 @@ self.session = self.msg_obj.session self.printed_in_chat = False return True + +class SignedInEvent(nec.NetworkIncomingEvent): + name = 'signed-in' + base_network_events = [] diff -r f383d60c4dd3 -r fa54f28d6da8 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Mon Nov 29 10:50:30 2010 +0100 +++ b/src/common/zeroconf/connection_zeroconf.py Mon Nov 29 11:11:24 2010 +0100 @@ -279,7 +279,7 @@ check = self.connection.announce() else: self.connected = STATUS_LIST.index(show) - self.dispatch('SIGNED_IN', ()) + gajim.nec.push_incoming_event(SignedInEvent(None, conn=self)) # stay offline when zeroconf does something wrong if check: diff -r f383d60c4dd3 -r fa54f28d6da8 src/groupchat_control.py --- a/src/groupchat_control.py Mon Nov 29 10:50:30 2010 +0100 +++ b/src/groupchat_control.py Mon Nov 29 11:11:24 2010 +0100 @@ -464,6 +464,8 @@ self._nec_gc_subject_received) gajim.ged.register_event_handler('gc-config-changed-received', ged.GUI1, self._nec_gc_config_changed_received) + gajim.ged.register_event_handler('signed-in', ged.GUI1, + self._nec_signed_in) gajim.gc_connected[self.account][self.room_jid] = False # disable win, we are not connected yet ChatControlBase.got_disconnected(self) @@ -1228,6 +1230,15 @@ for change in changes: self.print_conversation(change) + def _nec_signed_in(self, obj): + if obj.conn.name != self.account: + return + if self.room_jid in gajim.gc_connected[obj.conn.name] and \ + gajim.gc_connected[obj.conn.name][self.room_jid]: + return + password = gajim.gc_passwords.get(self.room_jid, '') + obj.conn.join_gc(self.nick, self.room_jid, password) + def got_connected(self): # Make autorejoin stop. if self.autorejoin: @@ -1855,6 +1866,8 @@ self._nec_gc_subject_received) gajim.ged.remove_event_handler('gc-config-changed-received', ged.GUI1, self._nec_gc_config_changed_received) + gajim.ged.remove_event_handler('signed-in', ged.GUI1, + self._nec_signed_in) if self.room_jid in gajim.gc_connected[self.account] and \ gajim.gc_connected[self.account][self.room_jid]: diff -r f383d60c4dd3 -r fa54f28d6da8 src/gui_interface.py --- a/src/gui_interface.py Mon Nov 29 10:50:30 2010 +0100 +++ b/src/gui_interface.py Mon Nov 29 11:11:24 2010 +0100 @@ -1002,17 +1002,16 @@ gajim.connections[account].request_last_status_time(contact.jid, contact.resource) - def handle_event_signed_in(self, account, empty): + def handle_event_signed_in(self, obj): """ SIGNED_IN event is emitted when we sign in, so handle it """ # ('SIGNED_IN', account, ()) # block signed in notifications for 30 seconds + account = obj.conn.name gajim.block_signed_in_notifications[account] = True - self.roster.set_actions_menu_needs_rebuild() - self.roster.draw_account(account) state = self.sleeper.getState() - connected = gajim.connections[account].connected + connected = obj.conn.connected if gajim.config.get('ask_offline_status_on_connection'): # Ask offline status in 1 minute so w'are sure we got all online # presences @@ -1021,41 +1020,32 @@ # we go online or free for chat, so we activate auto status gajim.sleeper_state[account] = 'online' elif not ((state == common.sleepy.STATE_AWAY and connected == 4) or \ - (state == common.sleepy.STATE_XA and connected == 5)): + (state == common.sleepy.STATE_XA and connected == 5)): # If we are autoaway/xa and come back after a disconnection, do # nothing # Else disable autoaway gajim.sleeper_state[account] = 'off' + + if obj.conn.archiving_supported: + # Start merging logs from server + obj.conn.request_modifications_page(gajim.config.get_per('accounts', + account, 'last_archiving_time')) + gajim.config.set_per('accounts', account, 'last_archiving_time', + time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())) + invisible_show = gajim.SHOW_LIST.index('invisible') # We cannot join rooms if we are invisible - if gajim.connections[account].connected == invisible_show: + if connected == invisible_show: return - # join already open groupchats - for gc_control in self.msg_win_mgr.get_controls( - message_control.TYPE_GC) + self.minimized_controls[account].values(): - if account != gc_control.account: - continue - room_jid = gc_control.room_jid - if room_jid in gajim.gc_connected[account] and \ - gajim.gc_connected[account][room_jid]: - continue - nick = gc_control.nick - password = gajim.gc_passwords.get(room_jid, '') - gajim.connections[account].join_gc(nick, room_jid, password) # send currently played music - if gajim.connections[account].pep_supported and dbus_support.supported \ - and gajim.config.get_per('accounts', account, 'publish_tune'): + if obj.conn.pep_supported and dbus_support.supported and \ + gajim.config.get_per('accounts', account, 'publish_tune'): self.enable_music_listener() # enable location listener - if gajim.connections[account].pep_supported and dbus_support.supported \ - and gajim.config.get_per('accounts', account, 'publish_location'): + if obj.conn.pep_supported and dbus_support.supported and \ + gajim.config.get_per('accounts', account, 'publish_location'): location_listener.enable() - if gajim.connections[account].archiving_supported: - # Start merging logs from server - gajim.connections[account].request_modifications_page( - gajim.config.get_per('accounts', account, 'last_archiving_time')) - gajim.config.set_per('accounts', account, 'last_archiving_time', - time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())) + def handle_event_metacontacts(self, obj): gajim.contacts.define_metacontacts(obj.conn.name, obj.meta_list) @@ -1403,7 +1393,6 @@ 'FILE_REQUEST': [self.handle_event_file_request], 'FILE_REQUEST_ERROR': [self.handle_event_file_request_error], 'FILE_SEND_ERROR': [self.handle_event_file_send_error], - 'SIGNED_IN': [self.handle_event_signed_in], 'atom-entry-received': [self.handle_atom_entry], 'bad-gpg-passphrase': [self.handle_event_bad_gpg_passphrase], 'bookmarks-received': [self.handle_event_bookmarks], @@ -1438,6 +1427,7 @@ 'roster-info': [self.handle_event_roster_info], 'roster-item-exchange-received': \ [self.handle_event_roster_item_exchange], + 'signed-in': [self.handle_event_signed_in], 'ssl-error': [self.handle_event_ssl_error], 'stream-conflict-received': [self.handle_event_resource_conflict], 'subscribe-presence-received': [ diff -r f383d60c4dd3 -r fa54f28d6da8 src/roster_window.py --- a/src/roster_window.py Mon Nov 29 10:50:30 2010 +0100 +++ b/src/roster_window.py Mon Nov 29 11:11:24 2010 +0100 @@ -2517,6 +2517,10 @@ def _nec_metacontacts_received(self, obj): self.redraw_metacontacts(obj.conn.name) + def _nec_signed_in(self, obj): + self.set_actions_menu_needs_rebuild() + self.draw_account(obj.conn.name) + ################################################################################ ### Menu and GUI callbacks ### FIXME: order callbacks in itself... @@ -6271,3 +6275,5 @@ self._nec_gc_subject_received) gajim.ged.register_event_handler('metacontacts-received', ged.GUI2, self._nec_metacontacts_received) + gajim.ged.register_event_handler('signed-in', ged.GUI1, + self._nec_signed_in)

1 0

gajim: use NEC to handle failed-decrypt events
by Yann Leboulanger 29 Nov '10

29 Nov '10

changeset f383d60c4dd3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f383d60c4dd3 description: use NEC to handle failed-decrypt events diffstat: src/chat_control.py | 25 ++++++++++++++++ src/common/connection_handlers.py | 4 +- src/common/connection_handlers_events.py | 12 +++++++ src/common/zeroconf/connection_handlers_zeroconf.py | 2 +- src/gui_interface.py | 32 ++++++-------------- 5 files changed, 50 insertions(+), 25 deletions(-) diffs (154 lines): diff -r 636901a4fb36 -r f383d60c4dd3 src/chat_control.py --- a/src/chat_control.py Mon Nov 29 10:00:23 2010 +0100 +++ b/src/chat_control.py Mon Nov 29 10:50:30 2010 +0100 @@ -1601,6 +1601,8 @@ self._nec_pep_received) gajim.ged.register_event_handler('vcard-received', ged.GUI1, self._nec_vcard_received) + gajim.ged.register_event_handler('failed-decrypt', ged.GUI1, + self._nec_failed_decrypt) # PluginSystem: adding GUI extension point for this ChatControl # instance object @@ -2589,6 +2591,8 @@ self._nec_pep_received) gajim.ged.remove_event_handler('vcard-received', ged.GUI1, self._nec_vcard_received) + gajim.ged.remove_event_handler('failed-decrypt', ged.GUI1, + self._nec_failed_decrypt) self.send_chatstate('gone', self.contact) self.contact.chatstate = None @@ -3036,6 +3040,27 @@ self.begin_negotiation() self.session.negotiate_archiving() + def _nec_failed_decrypt(self, obj): + if obj.session != self.session: + return + + obj.printed_in_chat = True + + details = _('Unable to decrypt message from %s\nIt may have been ' + 'tampered with.') % obj.fjid + self.print_conversation_line(details, 'status', '', obj.timestamp) + + # terminate the session + thread_id = self.session.thread_id + self.session.terminate_e2e() + obj.conn.delete_session(obj.fjid, thread_id) + + # restart the session + self.begin_e2e_negotiation() + + # Stop emission so it doesn't go to gui_interface + return True + def got_connected(self): ChatControlBase.got_connected(self) # Refreshing contact diff -r 636901a4fb36 -r f383d60c4dd3 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Nov 29 10:00:23 2010 +0100 +++ b/src/common/connection_handlers.py Mon Nov 29 10:50:30 2010 +0100 @@ -1407,8 +1407,8 @@ obj.stanza = obj.session.decrypt_stanza(obj.stanza) obj.msgtxt = obj.stanza.getBody() except Exception: - self.dispatch('FAILED_DECRYPT', (obj.fjid, obj.timestamp, - obj.session)) + gajim.nec.push_incoming_event(FailedDecryptEvent(None, + conn=self, msg_obj=obj)) return if obj.enc_tag and self.USE_GPG: diff -r 636901a4fb36 -r f383d60c4dd3 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Nov 29 10:00:23 2010 +0100 +++ b/src/common/connection_handlers_events.py Mon Nov 29 10:50:30 2010 +0100 @@ -1562,3 +1562,15 @@ class PasswordRequiredEvent(nec.NetworkIncomingEvent): name = 'password-required' base_network_events = [] + +class FailedDecryptEvent(nec.NetworkIncomingEvent): + name = 'failed-decrypt' + base_network_events = [] + + def generate(self): + self.conn = self.msg_obj.conn + self.fjid = self.msg_obj.fjid + self.timestamp = self.msg_obj.timestamp + self.session = self.msg_obj.session + self.printed_in_chat = False + return True diff -r 636901a4fb36 -r f383d60c4dd3 src/common/zeroconf/connection_handlers_zeroconf.py --- a/src/common/zeroconf/connection_handlers_zeroconf.py Mon Nov 29 10:00:23 2010 +0100 +++ b/src/common/zeroconf/connection_handlers_zeroconf.py Mon Nov 29 10:50:30 2010 +0100 @@ -132,7 +132,7 @@ try: msg = session.decrypt_stanza(msg) except Exception: - self.dispatch('FAILED_DECRYPT', (frm, tim)) + self.dispatch('FAILED_DECRYPT', (frm, tim, session)) msgtxt = msg.getBody() subject = msg.getSubject() # if not there, it's None diff -r 636901a4fb36 -r f383d60c4dd3 src/gui_interface.py --- a/src/gui_interface.py Mon Nov 29 10:00:23 2010 +0100 +++ b/src/gui_interface.py Mon Nov 29 10:50:30 2010 +0100 @@ -1063,26 +1063,10 @@ def handle_atom_entry(self, obj): AtomWindow.newAtomEntry(obj.atom_entry) - def handle_event_failed_decrypt(self, account, data): - jid, tim, session = data - - details = _('Unable to decrypt message from ' - '%s\nIt may have been tampered with.') % jid - - ctrl = session.control - if ctrl: - ctrl.print_conversation_line(details, 'status', '', tim) - else: - dialogs.WarningDialog(_('Unable to decrypt message'), - details) - - # terminate the session - session.terminate_e2e() - session.conn.delete_session(jid, session.thread_id) - - # restart the session - if ctrl: - ctrl.begin_e2e_negotiation() + def handle_event_failed_decrypt(self, obj): + details = _('Unable to decrypt message from %s\nIt may have been ' + 'tampered with.') % obj.fjid + dialogs.WarningDialog(_('Unable to decrypt message'), details) def handle_event_zc_name_conflict(self, obj): def on_ok(new_name): @@ -1420,11 +1404,11 @@ 'FILE_REQUEST_ERROR': [self.handle_event_file_request_error], 'FILE_SEND_ERROR': [self.handle_event_file_send_error], 'SIGNED_IN': [self.handle_event_signed_in], - 'FAILED_DECRYPT': [self.handle_event_failed_decrypt], 'atom-entry-received': [self.handle_atom_entry], 'bad-gpg-passphrase': [self.handle_event_bad_gpg_passphrase], 'bookmarks-received': [self.handle_event_bookmarks], 'connection-lost': [self.handle_event_connection_lost], + 'failed-decrypt': [(self.handle_event_failed_decrypt, ged.GUI2)], 'fingerprint-error': [self.handle_event_fingerprint_error], 'gc-invitation-received': [self.handle_event_gc_invitation], 'gc-presence-received': [self.handle_event_gc_presence], @@ -1474,7 +1458,11 @@ """ for event_name, event_handlers in self.handlers.iteritems(): for event_handler in event_handlers: - gajim.ged.register_event_handler(event_name, ged.GUI1, + prio = ged.GUI1 + if type(event_handler) == tuple: + prio = event_handler[1] + event_handler = event_handler[0] + gajim.ged.register_event_handler(event_name, prio, event_handler) ################################################################################

1 0

gajim: use NEC to handle password-required events
by Yann Leboulanger 29 Nov '10

29 Nov '10

changeset 636901a4fb36 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=636901a4fb36 description: use NEC to handle password-required events diffstat: src/common/connection.py | 2 +- src/common/connection_handlers_events.py | 4 ++++ src/gui_interface.py | 7 ++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diffs (62 lines): diff -r df1b82bde80a -r 636901a4fb36 src/common/connection.py --- a/src/common/connection.py Sun Nov 28 16:11:27 2010 +0300 +++ b/src/common/connection.py Mon Nov 29 10:00:23 2010 +0100 @@ -2287,7 +2287,7 @@ if self.password: self.set_password(self.password) return - self.dispatch('PASSWORD_REQUIRED', None) + gajim.nec.push_incoming_event(PasswordRequiredEvent(None, conn=self)) def set_password(self, password): self.password = password diff -r df1b82bde80a -r 636901a4fb36 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Nov 28 16:11:27 2010 +0300 +++ b/src/common/connection_handlers_events.py Mon Nov 29 10:00:23 2010 +0100 @@ -1558,3 +1558,7 @@ class ZeroconfNameConflictEvent(nec.NetworkIncomingEvent): name = 'zeroconf-name-conflict' base_network_events = [] + +class PasswordRequiredEvent(nec.NetworkIncomingEvent): + name = 'password-required' + base_network_events = [] diff -r df1b82bde80a -r 636901a4fb36 src/gui_interface.py --- a/src/gui_interface.py Sun Nov 28 16:11:27 2010 +0300 +++ b/src/gui_interface.py Mon Nov 29 10:00:23 2010 +0100 @@ -696,8 +696,9 @@ 'this message?'), checktext=_('_Do not ask me again'), on_response_yes=on_yes, on_response_no=on_no) - def handle_event_password_required(self, account, array): + def handle_event_password_required(self, obj): #('PASSWORD_REQUIRED', account, None) + account = obj.conn.name if account in self.pass_dialog: return text = _('Enter your password for account %s') % account @@ -711,7 +712,7 @@ if save: gajim.config.set_per('accounts', account, 'savepass', True) passwords.save_password(account, passphrase) - gajim.connections[account].set_password(passphrase) + obj.conn.set_password(passphrase) del self.pass_dialog[account] def on_cancel(): @@ -1420,7 +1421,6 @@ 'FILE_SEND_ERROR': [self.handle_event_file_send_error], 'SIGNED_IN': [self.handle_event_signed_in], 'FAILED_DECRYPT': [self.handle_event_failed_decrypt], - 'PASSWORD_REQUIRED': [self.handle_event_password_required], 'atom-entry-received': [self.handle_atom_entry], 'bad-gpg-passphrase': [self.handle_event_bad_gpg_passphrase], 'bookmarks-received': [self.handle_event_bookmarks], @@ -1448,6 +1448,7 @@ 'muc-admin-received': [self.handle_event_gc_affiliation], 'muc-owner-received': [self.handle_event_gc_config], 'our-show': [self.handle_event_status], + 'password-required': [self.handle_event_password_required], 'plain-connection': [self.handle_event_plain_connection], 'presence-received': [self.handle_event_presence], 'roster-info': [self.handle_event_roster_info],

1 0

gajim: fix var names
by Denis Fomin 28 Nov '10

28 Nov '10

changeset df1b82bde80a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=df1b82bde80a description: fix var names diffstat: src/common/connection_handlers_events.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r beebab4f2c44 -r df1b82bde80a src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Nov 28 11:17:48 2010 +0000 +++ b/src/common/connection_handlers_events.py Sun Nov 28 16:11:27 2010 +0300 @@ -1533,8 +1533,8 @@ # http://www.xmpp.org/extensions/xep-0209.html self.meta_list = {} query = self.stanza.getTag('query') - storage = self.stanza.getTag('storage') - metas = self.stanza.getTags('meta') + storage = query.getTag('storage') + metas = storage.getTags('meta') for meta in metas: try: jid = helpers.parse_jid(meta.getAttr('jid'))

1 0

gajim: use NEC to handle zeroconf name conflict event
by Yann Leboulanger 28 Nov '10

28 Nov '10

changeset 991f8e6375d7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=991f8e6375d7 description: use NEC to handle zeroconf name conflict event diffstat: src/common/connection_handlers_events.py | 4 ++++ src/common/zeroconf/connection_zeroconf.py | 3 ++- src/gui_interface.py | 16 ++++++++-------- 3 files changed, 14 insertions(+), 9 deletions(-) diffs (70 lines): diff -r c4a51dc63ab4 -r 991f8e6375d7 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Nov 28 10:37:05 2010 +0100 +++ b/src/common/connection_handlers_events.py Sun Nov 28 11:00:53 2010 +0100 @@ -1554,3 +1554,7 @@ else: self.meta_list[tag] = [data] return True + +class ZeroconfNameConflictEvent(nec.NetworkIncomingEvent): + name = 'zeroconf-name-conflict' + base_network_events = [] diff -r c4a51dc63ab4 -r 991f8e6375d7 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Sun Nov 28 10:37:05 2010 +0100 +++ b/src/common/zeroconf/connection_zeroconf.py Sun Nov 28 11:00:53 2010 +0100 @@ -178,7 +178,8 @@ self.disconnect() gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) - self.dispatch('ZC_NAME_CONFLICT', alt_name) + gajim.nec.push_incoming_event(ZeroconfNameConflictEvent(None, conn=self, + alt_name=alt_name)) def _on_error(self, message): self.dispatch('ERROR', (_('Avahi error'), diff -r c4a51dc63ab4 -r 991f8e6375d7 src/gui_interface.py --- a/src/gui_interface.py Sun Nov 28 10:37:05 2010 +0100 +++ b/src/gui_interface.py Sun Nov 28 11:00:53 2010 +0100 @@ -1083,19 +1083,19 @@ if ctrl: ctrl.begin_e2e_negotiation() - def handle_event_zc_name_conflict(self, account, data): + def handle_event_zc_name_conflict(self, obj): def on_ok(new_name): gajim.config.set_per('accounts', account, 'name', new_name) - show = gajim.connections[account].old_show - status = gajim.connections[account].status - gajim.connections[account].username = new_name - gajim.connections[account].change_status(show, status) + show = obj.conn.old_show + status = obj.conn.status + obj.conn.username = new_name + obj.conn.change_status(show, status) def on_cancel(): - gajim.connections[account].change_status('offline', '') + obj.conn.change_status('offline', '') dlg = dialogs.InputDialog(_('Username Conflict'), _('Please type a new username for your local account'), - input_str=data, is_modal=True, ok_handler=on_ok, + input_str=obj.alt_name, is_modal=True, ok_handler=on_ok, cancel_handler=on_cancel) def handle_event_resource_conflict(self, obj): @@ -1420,7 +1420,6 @@ 'FILE_SEND_ERROR': [self.handle_event_file_send_error], 'SIGNED_IN': [self.handle_event_signed_in], 'FAILED_DECRYPT': [self.handle_event_failed_decrypt], - 'ZC_NAME_CONFLICT': [self.handle_event_zc_name_conflict], 'PASSWORD_REQUIRED': [self.handle_event_password_required], 'atom-entry-received': [self.handle_atom_entry], 'bad-gpg-passphrase': [self.handle_event_bad_gpg_passphrase], @@ -1463,6 +1462,7 @@ 'unsubscribed-presence-received': [ self.handle_event_unsubscribed_presence], 'vcard-received': [self.handle_event_vcard], + 'zeroconf-name-conflict': [self.handle_event_zc_name_conflict], } def register_core_handlers(self):

1 0

gajim: use NEC to handle metacontacts events
by Yann Leboulanger 28 Nov '10

28 Nov '10

changeset c4a51dc63ab4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c4a51dc63ab4 description: use NEC to handle metacontacts events diffstat: src/common/connection_handlers.py | 27 +------------------------ src/common/connection_handlers_events.py | 33 +++++++++++++++++++++++++++++++- src/gui_interface.py | 7 ++--- src/roster_window.py | 5 ++++ 4 files changed, 42 insertions(+), 30 deletions(-) diffs (128 lines): diff -r 72c469a59514 -r c4a51dc63ab4 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Nov 28 01:33:03 2010 +0300 +++ b/src/common/connection_handlers.py Sun Nov 28 10:37:05 2010 +0100 @@ -651,31 +651,8 @@ if not self.connection: return if iq_obj.getType() == 'result': - # Metacontact tags - # http://www.xmpp.org/extensions/xep-0209.html - meta_list = {} - query = iq_obj.getTag('query') - storage = query.getTag('storage') - metas = storage.getTags('meta') - for meta in metas: - try: - jid = helpers.parse_jid(meta.getAttr('jid')) - except common.helpers.InvalidFormat: - continue - tag = meta.getAttr('tag') - data = {'jid': jid} - order = meta.getAttr('order') - try: - order = int(order) - except Exception: - order = 0 - if order is not None: - data['order'] = order - if tag in meta_list: - meta_list[tag].append(data) - else: - meta_list[tag] = [data] - self.dispatch('METACONTACTS', meta_list) + gajim.nec.push_incoming_event(MetacontactsReceivedEvent(None, + conn=self, stanza=iq_obj)) else: if iq_obj.getErrorCode() not in ('403', '406', '404'): self.private_storage_supported = False diff -r 72c469a59514 -r c4a51dc63ab4 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Nov 28 01:33:03 2010 +0300 +++ b/src/common/connection_handlers_events.py Sun Nov 28 10:37:05 2010 +0100 @@ -1522,4 +1522,35 @@ class PEPConfigReceivedEvent(nec.NetworkIncomingEvent): name = 'pep-config-received' - base_network_events = [] \ No newline at end of file + base_network_events = [] + +class MetacontactsReceivedEvent(nec.NetworkIncomingEvent): + name = 'metacontacts-received' + base_network_events = [] + + def generate(self): + # Metacontact tags + # http://www.xmpp.org/extensions/xep-0209.html + self.meta_list = {} + query = self.stanza.getTag('query') + storage = self.stanza.getTag('storage') + metas = self.stanza.getTags('meta') + for meta in metas: + try: + jid = helpers.parse_jid(meta.getAttr('jid')) + except common.helpers.InvalidFormat: + continue + tag = meta.getAttr('tag') + data = {'jid': jid} + order = meta.getAttr('order') + try: + order = int(order) + except Exception: + order = 0 + if order is not None: + data['order'] = order + if tag in self.meta_list: + self.meta_list[tag].append(data) + else: + self.meta_list[tag] = [data] + return True diff -r 72c469a59514 -r c4a51dc63ab4 src/gui_interface.py --- a/src/gui_interface.py Sun Nov 28 01:33:03 2010 +0300 +++ b/src/gui_interface.py Sun Nov 28 10:37:05 2010 +0100 @@ -1056,9 +1056,8 @@ gajim.config.set_per('accounts', account, 'last_archiving_time', time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())) - def handle_event_metacontacts(self, account, tags_list): - gajim.contacts.define_metacontacts(account, tags_list) - self.roster.redraw_metacontacts(account) + def handle_event_metacontacts(self, obj): + gajim.contacts.define_metacontacts(obj.conn.name, obj.meta_list) def handle_atom_entry(self, obj): AtomWindow.newAtomEntry(obj.atom_entry) @@ -1420,7 +1419,6 @@ 'FILE_REQUEST_ERROR': [self.handle_event_file_request_error], 'FILE_SEND_ERROR': [self.handle_event_file_send_error], 'SIGNED_IN': [self.handle_event_signed_in], - 'METACONTACTS': [self.handle_event_metacontacts], 'FAILED_DECRYPT': [self.handle_event_failed_decrypt], 'ZC_NAME_CONFLICT': [self.handle_event_zc_name_conflict], 'PASSWORD_REQUIRED': [self.handle_event_password_required], @@ -1447,6 +1445,7 @@ 'last-result-received': [self.handle_event_last_status_time], 'message-not-sent': [self.handle_event_msgnotsent], 'message-sent': [self.handle_event_msgsent], + 'metacontacts-received': [self.handle_event_metacontacts], 'muc-admin-received': [self.handle_event_gc_affiliation], 'muc-owner-received': [self.handle_event_gc_config], 'our-show': [self.handle_event_status], diff -r 72c469a59514 -r c4a51dc63ab4 src/roster_window.py --- a/src/roster_window.py Sun Nov 28 01:33:03 2010 +0300 +++ b/src/roster_window.py Sun Nov 28 10:37:05 2010 +0100 @@ -2514,6 +2514,9 @@ contact.status = obj.subject self.draw_contact(obj.room_jid, obj.conn.name) + def _nec_metacontacts_received(self, obj): + self.redraw_metacontacts(obj.conn.name) + ################################################################################ ### Menu and GUI callbacks ### FIXME: order callbacks in itself... @@ -6266,3 +6269,5 @@ self._nec_vcard_received) gajim.ged.register_event_handler('gc-subject-received', ged.GUI1, self._nec_gc_subject_received) + gajim.ged.register_event_handler('metacontacts-received', ged.GUI2, + self._nec_metacontacts_received)

1 0

gajim: fix var name.
by Denis Fomin 27 Nov '10

27 Nov '10

changeset 72c469a59514 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=72c469a59514 description: fix var name. diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 33485f5ba79b -r 72c469a59514 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Nov 27 22:04:42 2010 +0100 +++ b/src/common/connection_handlers.py Sun Nov 28 01:33:03 2010 +0300 @@ -732,7 +732,7 @@ if form_tag: form = common.dataforms.ExtendForm(node=form_tag) gajim.nec.push_incoming_event(PEPConfigReceivedEvent(None, - conn=self.conn, node=node, form=form)) + conn=self, node=node, form=form)) elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTIONS_ARRIVED: # TODO

1 0

gajim: remove unused function
by Yann Leboulanger 27 Nov '10

27 Nov '10

changeset 33485f5ba79b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=33485f5ba79b description: remove unused function diffstat: src/gui_interface.py | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diffs (15 lines): diff -r 2a0f33c6d203 -r 33485f5ba79b src/gui_interface.py --- a/src/gui_interface.py Sun Nov 28 00:02:36 2010 +0300 +++ b/src/gui_interface.py Sat Nov 27 22:04:42 2010 +0100 @@ -1202,11 +1202,6 @@ if ctrl: ctrl.set_audio_state('error', reason=obj.reason) - def handle_event_pep_config(self, account, data): - # ('PEP_CONFIG', account, (node, form)) - if 'pep_services' in self.instances[account]: - self.instances[account]['pep_services'].config(data[0], data[1]) - def handle_event_roster_item_exchange(self, obj): # data = (action in [add, delete, modify], exchange_list, jid_from) dialogs.RosterItemExchangeWindow(obj.conn.name, obj.action,

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2010