Commits August 2011

commits@gajim.org

3 participants
99 discussions

gajim: set privacy_list_requested attribute as soon as Connectio...
by Yann Leboulanger 21 Aug '11

21 Aug '11

changeset 6138d8484c77 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6138d8484c77 description: set privacy_list_requested attribute as soon as Connection object is created diffstat: src/common/connection.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r b50523d2656e -r 6138d8484c77 src/common/connection.py --- a/src/common/connection.py Sun Aug 21 19:38:20 2011 +0200 +++ b/src/common/connection.py Sun Aug 21 23:13:25 2011 +0200 @@ -714,6 +714,7 @@ self.available_transports = {} # list of available transports on this # server {'icq': ['icq.server.com', 'icq2.server.com'], } self.private_storage_supported = True + self.privacy_rules_requested = False self.streamError = '' self.secret_hmac = str(random.random())[2:] gajim.ged.register_event_handler('privacy-list-received', ged.CORE,

1 0

gajim: improve connect to remote host in zeroconf under windows
by Yann Leboulanger 21 Aug '11

21 Aug '11

changeset b50523d2656e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b50523d2656e description: improve connect to remote host in zeroconf under windows diffstat: src/common/zeroconf/client_zeroconf.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 0c2c00f6df67 -r b50523d2656e src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Sun Aug 21 19:34:37 2011 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Sun Aug 21 19:38:20 2011 +0200 @@ -458,7 +458,10 @@ self._sock.setblocking(False) except Exception, ee: (errnum, errstr) = ee - if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): + errors = (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK) + if 'WSAEINVAL' in errno.__dict__: + errors += (errno.WSAEINVAL,) + if errnum in errors: return # win32 needs this elif errnum not in (0, 10056, errno.EISCONN) or self.state != 0:

1 0

gajim: codging standards
by Yann Leboulanger 21 Aug '11

21 Aug '11

changeset e92515333171 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e92515333171 description: codging standards diffstat: src/common/zeroconf/client_zeroconf.py | 92 ++++++++++++++++++--------------- 1 files changed, 49 insertions(+), 43 deletions(-) diffs (238 lines): diff -r 21d2df6f89d2 -r e92515333171 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Sun Aug 21 19:27:04 2011 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Sun Aug 21 19:32:52 2011 +0200 @@ -66,7 +66,7 @@ if hasattr(socket, 'AI_ADDRCONFIG'): flags |= socket.AI_ADDRCONFIG ai = socket.getaddrinfo(None, self.port, socket.AF_UNSPEC, - socket.SOCK_STREAM, 0, flags)[0] + socket.SOCK_STREAM, 0, flags)[0] self._serv = socket.socket(ai[0], ai[1]) self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) @@ -129,7 +129,7 @@ class P2PClient(IdleObject): def __init__(self, _sock, host, port, conn_holder, stanzaqueue=[], to=None, - on_ok=None, on_not_ok=None): + on_ok=None, on_not_ok=None): self._owner = self self.Namespace = 'jabber:client' self.protocol_type = 'XMPP' @@ -150,8 +150,8 @@ else: self.sock_type = TYPE_CLIENT self.fd = -1 - conn = P2PConnection('', _sock, host, port, self._caller, self.on_connect, - self) + conn = P2PConnection('', _sock, host, port, self._caller, + self.on_connect, self) if not self.conn_holder: # An error occured, disconnect() has been called if on_not_ok: @@ -166,18 +166,19 @@ if is_message: if self.fd == -1: if on_not_ok: - on_not_ok('Connection to host could not be established.') + on_not_ok( + 'Connection to host could not be established.') return thread_id = stanza.getThread() id_ = stanza.getID() if not id_: id_ = self.Dispatcher.getAnID() if self.conn_holder.ids_of_awaiting_messages.has_key(self.fd): - self.conn_holder.ids_of_awaiting_messages[self.fd].append((id_, - thread_id)) + self.conn_holder.ids_of_awaiting_messages[self.fd].append(( + id_, thread_id)) else: self.conn_holder.ids_of_awaiting_messages[self.fd] = [(id_, - thread_id)] + thread_id)] self.on_responses = {} @@ -196,16 +197,16 @@ id_ = self.Dispatcher.getAnID() if self.conn_holder.ids_of_awaiting_messages.has_key(self.fd): self.conn_holder.ids_of_awaiting_messages[self.fd].append((id_, - thread_id)) + thread_id)) else: self.conn_holder.ids_of_awaiting_messages[self.fd] = [(id_, - thread_id)] + thread_id)] return True def on_message_sent(self, connection_id): id_, thread_id = \ - self.conn_holder.ids_of_awaiting_messages[connection_id].pop(0) + self.conn_holder.ids_of_awaiting_messages[connection_id].pop(0) if self.on_ok: self.on_ok(id_) # use on_ok only on first message. For others it's called in @@ -235,7 +236,8 @@ self.Dispatcher._metastream.setNamespace(self.Namespace) self.Dispatcher._metastream.setAttr('version', '1.0') self.Dispatcher._metastream.setAttr('xmlns:stream', NS_STREAMS) - self.Dispatcher._metastream.setAttr('from', self.conn_holder.zeroconf.name) + self.Dispatcher._metastream.setAttr('from', + self.conn_holder.zeroconf.name) if self.to: self.Dispatcher._metastream.setAttr('to', self.to) self.Dispatcher.send("<?xml version='1.0'?>%s>" % str( @@ -243,10 +245,12 @@ def _check_stream_start(self, ns, tag, attrs): if ns != NS_STREAMS or tag != 'stream': - log.error('Incorrect stream start: (%s,%s).Terminating!' % (tag, ns), 'error') + log.error('Incorrect stream start: (%s,%s).Terminating!' % (tag, + ns), 'error') self.Connection.disconnect() if self.on_not_ok: - self.on_not_ok('Connection to host could not be established: Incorrect answer from server.') + self.on_not_ok('Connection to host could not be established: ' + 'Incorrect answer from server.') return if self.sock_type == TYPE_SERVER: if attrs.has_key('from'): @@ -303,25 +307,26 @@ def _register_handlers(self): self._caller.peerhost = self.Connection._sock.getsockname() - self.RegisterHandler('message', lambda conn, data:self._caller._messageCB( - self.Server, conn, data)) + self.RegisterHandler('message', lambda conn, + data:self._caller._messageCB(self.Server, conn, data)) self.RegisterHandler('iq', self._caller._siSetCB, 'set', - common.xmpp.NS_SI) + common.xmpp.NS_SI) self.RegisterHandler('iq', self._caller._siErrorCB, 'error', - common.xmpp.NS_SI) + common.xmpp.NS_SI) self.RegisterHandler('iq', self._caller._siResultCB, 'result', - common.xmpp.NS_SI) + common.xmpp.NS_SI) self.RegisterHandler('iq', self._caller._bytestreamSetCB, 'set', - common.xmpp.NS_BYTESTREAM) + common.xmpp.NS_BYTESTREAM) self.RegisterHandler('iq', self._caller._bytestreamResultCB, 'result', - common.xmpp.NS_BYTESTREAM) + common.xmpp.NS_BYTESTREAM) self.RegisterHandler('iq', self._caller._bytestreamErrorCB, 'error', - common.xmpp.NS_BYTESTREAM) + common.xmpp.NS_BYTESTREAM) self.RegisterHandler('iq', self._caller._DiscoverItemsGetCB, 'get', - common.xmpp.NS_DISCO_ITEMS) + common.xmpp.NS_DISCO_ITEMS) self.RegisterHandler('iq', self._caller._JingleCB, 'result') self.RegisterHandler('iq', self._caller._JingleCB, 'error') - self.RegisterHandler('iq', self._caller._JingleCB, 'set', common.xmpp.NS_JINGLE) + self.RegisterHandler('iq', self._caller._JingleCB, 'set', + common.xmpp.NS_JINGLE) class P2PConnection(IdleObject, PlugIn): def __init__(self, sock_hash, _sock, host=None, port=None, caller=None, @@ -353,8 +358,8 @@ self.ais = socket.getaddrinfo(host, port, socket.AF_UNSPEC, socket.SOCK_STREAM) except socket.gaierror, e: - log.info('Lookup failure for %s: %s[%s]', host, e[1], repr(e[0]), - exc_info=True) + log.info('Lookup failure for %s: %s[%s]', host, e[1], + repr(e[0]), exc_info=True) else: self.connect_to_next_ip() @@ -365,7 +370,7 @@ return ai = self.ais.pop(0) log.info('Trying to connect to %s through %s:%s', self.host, ai[4][0], - ai[4][1], exc_info=True) + ai[4][1], exc_info=True) try: self._sock = socket.socket(*ai[:3]) self._sock.setblocking(False) @@ -392,8 +397,8 @@ def plugout(self): """ - Disconnect from the remote server and unregister self.disconnected method - from the owner's dispatcher + Disconnect from the remote server and unregister self.disconnected + method from the owner's dispatcher """ self.disconnect() self._owner = None @@ -439,8 +444,8 @@ if self.fd in ids and len(ids[self.fd]) > 0: for (id_, thread_id) in ids[self.fd]: if hasattr(self._owner, 'Dispatcher'): - self._owner.Dispatcher.Event('', DATA_ERROR, (self.client.to, - thread_id)) + self._owner.Dispatcher.Event('', DATA_ERROR, ( + self.client.to, thread_id)) else: self._owner.on_not_ok('conenction timeout') ids[self.fd] = [] @@ -458,7 +463,7 @@ # win32 needs this elif errnum not in (0, 10056, errno.EISCONN) or self.state != 0: log.error('Could not connect to %s: %s [%s]', self.host, errnum, - errstr) + errstr) self.connect_to_next_ip() return else: # socket is already connected @@ -649,9 +654,9 @@ def zeroconf_init(self, show, msg): self.zeroconf = zeroconf.Zeroconf(self.caller._on_new_service, - self.caller._on_remove_service, self.caller._on_name_conflictCB, - self.caller._on_disconnected, self.caller._on_error, - self.caller.username, self.caller.host, self.port) + self.caller._on_remove_service, self.caller._on_name_conflictCB, + self.caller._on_disconnected, self.caller._on_error, + self.caller.username, self.caller.host, self.port) self.zeroconf.txt['msg'] = msg self.zeroconf.txt['status'] = show self.zeroconf.txt['1st'] = self.caller.first @@ -762,7 +767,7 @@ if not stanza.getID(): stanza.setID('zero') P2PClient(None, item['address'], item['port'], self, - [(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok) + [(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok) def getAnID(self): """ @@ -782,18 +787,19 @@ """ self.disconnect_handlers.remove(handler) - def SendAndWaitForResponse(self, stanza, timeout=None, func=None, args=None): + def SendAndWaitForResponse(self, stanza, timeout=None, func=None, + args=None): """ - Send stanza and wait for recipient's response to it. Will call transports - on_timeout callback if response is not retrieved in time + Send stanza and wait for recipient's response to it. Will call + transports on_timeout callback if response is not retrieved in time Be aware: Only timeout of latest call of SendAndWait is active. """ -# if timeout is None: -# timeout = DEFAULT_TIMEOUT_SECONDS +# if timeout is None: +# timeout = DEFAULT_TIMEOUT_SECONDS def on_ok(_waitid): -# if timeout: -# self._owner.set_timeout(timeout) +# if timeout: +# self._owner.set_timeout(timeout) to = stanza.getTo() conn = None if to in self.recipient_to_hash:

1 0

gajim: improving printing debug. Print str and not unicode
by Yann Leboulanger 21 Aug '11

21 Aug '11

changeset 0c2c00f6df67 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0c2c00f6df67 description: improving printing debug. Print str and not unicode diffstat: src/common/zeroconf/client_zeroconf.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (30 lines): diff -r e92515333171 -r 0c2c00f6df67 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Sun Aug 21 19:32:52 2011 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Sun Aug 21 19:34:37 2011 +0200 @@ -365,12 +365,12 @@ def connect_to_next_ip(self): if len(self.ais) == 0: - log.error('Connection failure to %s', self.host, exc_info=True) + log.error('Connection failure to %s', str(self.host), exc_info=True) self.disconnect() return ai = self.ais.pop(0) - log.info('Trying to connect to %s through %s:%s', self.host, ai[4][0], - ai[4][1], exc_info=True) + log.info('Trying to connect to %s through %s:%s', str(self.host), + ai[4][0], ai[4][1], exc_info=True) try: self._sock = socket.socket(*ai[:3]) self._sock.setblocking(False) @@ -462,8 +462,8 @@ return # win32 needs this elif errnum not in (0, 10056, errno.EISCONN) or self.state != 0: - log.error('Could not connect to %s: %s [%s]', self.host, errnum, - errstr) + log.error('Could not connect to %s: %s [%s]', str(self.host), + errnum, errstr) self.connect_to_next_ip() return else: # socket is already connected

1 0

gajim: fix presence notifications with zeroconf account
by Yann Leboulanger 21 Aug '11

21 Aug '11

changeset 21d2df6f89d2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=21d2df6f89d2 description: fix presence notifications with zeroconf account diffstat: src/common/connection_handlers_events.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 61173086f87a -r 21d2df6f89d2 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Aug 21 18:16:26 2011 +0200 +++ b/src/common/connection_handlers_events.py Sun Aug 21 19:27:04 2011 +0200 @@ -827,6 +827,7 @@ self.transport_auto_auth = False self.errcode = None self.errmsg = '' + self.popup = False # Do we want to open chat window ? return True class GcPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):

1 0

gajim: do not freeze for 2 seconds every 5 seconds when using bo...
by Yann Leboulanger 21 Aug '11

21 Aug '11

changeset 61173086f87a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=61173086f87a description: do not freeze for 2 seconds every 5 seconds when using bonjour under windows. Fixes #6791 diffstat: src/common/zeroconf/zeroconf_bonjour.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 721003dd9399 -r 61173086f87a src/common/zeroconf/zeroconf_bonjour.py --- a/src/common/zeroconf/zeroconf_bonjour.py Sun Aug 21 09:51:57 2011 +0200 +++ b/src/common/zeroconf/zeroconf_bonjour.py Sun Aug 21 18:16:26 2011 +0200 @@ -286,7 +286,7 @@ self.error_CB("Error while browsing: %s" % e) def browse_loop(self): - ready = select.select([self.browse_sdRef], [], [], 2) + ready = select.select([self.browse_sdRef], [], [], 0) if self.browse_sdRef in ready[0]: pybonjour.DNSServiceProcessResult(self.browse_sdRef)

1 0

gajim: follow chat in tabs more easily. Don't open as many chatt...
by Yann Leboulanger 21 Aug '11

21 Aug '11

changeset 721003dd9399 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=721003dd9399 description: follow chat in tabs more easily. Don't open as many chattabs as there are lowe priority chats. Fixes #5227 diffstat: src/chat_control.py | 8 ++++-- src/common/connection_handlers.py | 17 -------------- src/common/connection_handlers_events.py | 1 + src/common/stanza_session.py | 2 +- src/gui_interface.py | 12 ++------- src/message_control.py | 31 ++++++++++++++++++-------- src/message_window.py | 20 +++++++++++++++++ src/session.py | 37 ++++++------------------------- 8 files changed, 58 insertions(+), 70 deletions(-) diffs (truncated from 303 to 300 lines): diff -r bdf1d42eca18 -r 721003dd9399 src/chat_control.py --- a/src/chat_control.py Fri Aug 19 18:39:09 2011 +0200 +++ b/src/chat_control.py Sun Aug 21 09:51:57 2011 +0200 @@ -868,7 +868,7 @@ keyID=keyID, type_=type_, chatstate=chatstate, msg_id=msg_id, composing_xep=composing_xep, resource=resource, user_nick=self.user_nick, xhtml=xhtml, label=label, - callback=callback, callback_args= callback_args)) + callback=callback, callback_args=callback_args, control=self)) # Record the history of sent messages self.save_message(message, 'sent') @@ -2631,13 +2631,15 @@ if contact.our_chatstate == 'inactive' and state == 'composing': # go active before gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, - account=self.account, jid=self.contact.jid, chatstate='active')) + account=self.account, jid=self.contact.jid, chatstate='active', + control=self)) contact.our_chatstate = 'active' self.reset_kbd_mouse_timeout_vars() gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, account=self.account, jid=self.contact.jid, chatstate=state, - msg_id=contact.msg_id, composing_xep=contact.composing_xep)) + msg_id=contact.msg_id, composing_xep=contact.composing_xep, + control=self)) contact.our_chatstate = state if contact.our_chatstate == 'active': diff -r bdf1d42eca18 -r 721003dd9399 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Aug 19 18:39:09 2011 +0200 +++ b/src/common/connection_handlers.py Sun Aug 21 09:51:57 2011 +0200 @@ -926,23 +926,6 @@ continue if sess.control: sess.control.no_autonegotiation = False - if sess.enable_encryption: - sess.terminate_e2e() - self.delete_session(jid, sess.thread_id) - - if obj.ptype == 'unavailable': - for jid in (obj.jid, obj.fjid): - if jid not in self.sessions: - continue - # automatically terminate sessions that they haven't sent a - # thread ID in, only if other part support thread ID - for sess in self.sessions[jid].values(): - if not sess.received_thread_id: - contact = gajim.contacts.get_contact(self.name, jid) - if contact and (contact.supports(xmpp.NS_SSN) or \ - contact.supports(xmpp.NS_ESESSION)): - sess.terminate() - del self.sessions[jid][sess.thread_id] if gajim.config.get('log_contact_status_changes') and \ gajim.config.should_log(self.name, obj.jid): diff -r bdf1d42eca18 -r 721003dd9399 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Aug 19 18:39:09 2011 +0200 +++ b/src/common/connection_handlers_events.py Sun Aug 21 09:51:57 2011 +0200 @@ -2187,6 +2187,7 @@ self.callback_args = [] self.now = False self.is_loggable = True + self.control = None def generate(self): return True diff -r bdf1d42eca18 -r 721003dd9399 src/common/stanza_session.py --- a/src/common/stanza_session.py Fri Aug 19 18:39:09 2011 +0200 +++ b/src/common/stanza_session.py Sun Aug 21 09:51:57 2011 +0200 @@ -58,7 +58,7 @@ self.conn = conn self.jid = jid self.type = type_ - self.resource = None + self.resource = jid.getResource() if thread_id: self.received_thread_id = True diff -r bdf1d42eca18 -r 721003dd9399 src/gui_interface.py --- a/src/gui_interface.py Fri Aug 19 18:39:09 2011 +0200 +++ b/src/gui_interface.py Sun Aug 21 09:51:57 2011 +0200 @@ -358,15 +358,9 @@ highest = gajim.contacts.get_contact_with_highest_priority(account, jid) is_highest = (highest and highest.resource == resource) - # disconnect the session from the ctrl if the highest resource has - # changed - if (obj.was_highest and not is_highest) or \ - (not obj.was_highest and is_highest): - ctrl = self.msg_win_mgr.get_control(jid, account) - if ctrl: - ctrl.no_autonegotiation = False - ctrl.set_session(None) - ctrl.contact = highest + ctrl = self.msg_win_mgr.get_control(jid, account) + if ctrl and ctrl.session and ctrl.session.resource == resource: + ctrl.remove_session(ctrl.session) def handle_event_msgerror(self, obj): #'MSGERROR' (account, (jid, error_code, error_msg, msg, time[session])) diff -r bdf1d42eca18 -r 721003dd9399 src/message_control.py --- a/src/message_control.py Fri Aug 19 18:39:09 2011 +0200 +++ b/src/message_control.py Sun Aug 21 09:51:57 2011 +0200 @@ -46,7 +46,8 @@ MessageWindow """ - def __init__(self, type_id, parent_win, widget_name, contact, account, resource = None): + def __init__(self, type_id, parent_win, widget_name, contact, account, + resource=None): # dict { cb id : widget} # keep all registered callbacks of widgets, created by self.xml self.handlers = {} @@ -59,6 +60,7 @@ self.resource = resource self.session = None + self.other_sessions = [] gajim.last_message_time[self.account][self.get_full_jid()] = 0 @@ -201,15 +203,15 @@ if oldsession: oldsession.control = None + self.other_sessions.append(oldsession) - jid = self.contact.jid - if self.resource: - jid += '/' + self.resource + if self.session in self.other_sessions: + self.other_sessions.remove(self.session) crypto_changed = bool(session and isinstance(session, - EncryptedStanzaSession) and session.enable_encryption) != \ - bool(oldsession and isinstance(oldsession, - EncryptedStanzaSession) and oldsession.enable_encryption) + EncryptedStanzaSession) and session.enable_encryption) != \ + bool(oldsession and isinstance(oldsession, EncryptedStanzaSession) \ + and oldsession.enable_encryption) archiving_changed = bool(session and isinstance(session, ArchivingStanzaSession) and session.archiving) != \ @@ -219,12 +221,21 @@ if crypto_changed or archiving_changed: self.print_session_details() + def remove_session(self, session): + if session != self.session: + return + last_session = None + if self.other_sessions: + last_session = self.other_sessions.pop(0) + if session not in self.other_sessions: + self.other_sessions.append(session) + if last_session: + self.session = last_session + def _nec_message_outgoing(self, obj): # Send the given message to the active tab. # Doesn't return None if error - if obj.account != self.account: - return - if self.contact.jid != obj.jid: + if obj.control != self: return obj.message = helpers.remove_invalid_xml_chars(obj.message) diff -r bdf1d42eca18 -r 721003dd9399 src/message_window.py --- a/src/message_window.py Fri Aug 19 18:39:09 2011 +0200 +++ b/src/message_window.py Sun Aug 21 09:51:57 2011 +0200 @@ -1087,6 +1087,26 @@ return win.get_control(jid, acct) return None + def search_control(self, jid, account, resource=None): + """ + Search windows with this policy: + 1. try to find already opened tab for resource + 2. find the tab for this jid with ctrl.resource not set + 3. there is none + """ + fjid = jid + if resource: + jid += '/' + resource + ctrl = self.get_control(fjid, account) + if ctrl: + return ctrl + win = self.get_window(jid, account) + if win: + ctrl = win.get_control(jid, account) + if not ctrl.resource: + return ctrl + return None + def get_gc_control(self, jid, acct): """ Same as get_control. Was briefly required, is not any more. May be useful diff -r bdf1d42eca18 -r 721003dd9399 src/session.py --- a/src/session.py Fri Aug 19 18:39:09 2011 +0200 +++ b/src/session.py Sun Aug 21 09:51:57 2011 +0200 @@ -155,14 +155,9 @@ obj.resource == highest_contact.resource or highest_contact.show ==\ 'offline' - if not pm and is_highest: - jid_of_control = obj.jid - else: - jid_of_control = obj.fjid - if not self.control: - ctrl = gajim.interface.msg_win_mgr.get_control(jid_of_control, - self.conn.name) + ctrl = gajim.interface.msg_win_mgr.search_control(obj.jid, + obj.conn.name, obj.resource) if ctrl: self.control = ctrl self.control.set_session(self) @@ -183,8 +178,6 @@ contact = None jid = obj.jid resource = obj.resource - # if chat window will be for specific resource - resource_for_chat = resource fjid = jid @@ -211,7 +204,6 @@ else: # Default to highest prio fjid = jid - resource_for_chat = None contact = highest_contact if not contact: @@ -220,21 +212,15 @@ obj.conn.name, jid, obj.user_nick) if not self.control: - ctrl = gajim.interface.msg_win_mgr.get_control(fjid, self.conn.name) + ctrl = gajim.interface.msg_win_mgr.search_control(obj.jid, + obj.conn.name, obj.resource) if ctrl: self.control = ctrl self.control.set_session(self) else: - # if no control exists and message comes from highest prio, - # the new control shouldn't have a resource - if highest_contact and contact.resource == \ - highest_contact.resource and jid != gajim.get_jid_from_account( - self.conn.name): - fjid = jid - resource_for_chat = None + fjid = jid obj.popup = helpers.allow_popup_window(self.conn.name) - obj.resource_for_chat = resource_for_chat type_ = 'chat' event_type = 'message_received' @@ -268,9 +254,6 @@ Display the message or show notification in the roster """ contact = None - # if chat window will be for specific resource - resource_for_chat = resource - fjid = jid # Try to catch the contact with correct resource @@ -298,7 +281,6 @@ else: # Default to highest prio fjid = jid - resource_for_chat = None contact = highest_contact if not contact: @@ -312,12 +294,7 @@ self.control = ctrl self.control.set_session(self) else: - # if no control exists and message comes from highest prio, the new - # control shouldn't have a resource - if highest_contact and contact.resource == highest_contact.resource\ - and not jid == gajim.get_jid_from_account(self.conn.name): - fjid = jid - resource_for_chat = None + fjid = jid # Do we have a queue? no_queue = len(gajim.events.get_events(self.conn.name, fjid)) == 0 @@ -367,7 +344,7 @@ if popup: if not self.control: self.control = gajim.interface.new_chat(contact, - self.conn.name, resource=resource_for_chat, session=self) + self.conn.name, session=self)

1 0

gajim: add presence events to trigger plugin
by Yann Leboulanger 19 Aug '11

19 Aug '11

changeset bdf1d42eca18 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bdf1d42eca18 description: add presence events to trigger plugin diffstat: plugins/triggers/config_dialog.ui | 9 ++ plugins/triggers/manifest.ini | 2 +- plugins/triggers/triggers.py | 115 ++++++++++++++++++++---------- src/common/connection_handlers_events.py | 2 + src/roster_window.py | 22 +++-- 5 files changed, 102 insertions(+), 48 deletions(-) diffs (260 lines): diff -r 1db2eb2ba130 -r bdf1d42eca18 plugins/triggers/config_dialog.ui --- a/plugins/triggers/config_dialog.ui Thu Aug 18 20:06:31 2011 +0200 +++ b/plugins/triggers/config_dialog.ui Fri Aug 19 18:39:09 2011 +0200 @@ -28,6 +28,15 @@ <row> <col id="0" translatable="yes">Receive a Message</col> </row> + <row> + <col id="0" translatable="yes">Contact Connects</col> + </row> + <row> + <col id="0" translatable="yes">Contact Disconnects</col> + </row> + <row> + <col id="0" translatable="yes">Contact Changes Status</col> + </row> </data> </object> <object class="GtkWindow" id="advanced_notifications_window"> diff -r 1db2eb2ba130 -r bdf1d42eca18 plugins/triggers/manifest.ini --- a/plugins/triggers/manifest.ini Thu Aug 18 20:06:31 2011 +0200 +++ b/plugins/triggers/manifest.ini Fri Aug 19 18:39:09 2011 +0200 @@ -1,7 +1,7 @@ [info] name: Triggers short_name: triggers -version: 0.0.1 +version: 0.0.2 description: Configure Gajim's behaviour for each contact authors: Yann Leboulanger <asterix(a)lagaule.org> homepage: http://trac.gajim.org/wiki/ diff -r 1db2eb2ba130 -r bdf1d42eca18 plugins/triggers/triggers.py --- a/plugins/triggers/triggers.py Thu Aug 18 20:06:31 2011 +0200 +++ b/plugins/triggers/triggers.py Fri Aug 19 18:39:09 2011 +0200 @@ -40,7 +40,8 @@ self.events_handlers = {'notification' : (ged.PREGUI, self._nec_notif), 'decrypted-message-received': (ged.PREGUI2, - self._nec_decrypted_message_received)} + self._nec_decrypted_message_received), + 'presence-received': (ged.PREGUI, self._nec_presence_received)} def _check_rule_recipients(self, obj, rule): rule_recipients = [t.strip() for t in rule['recipients'].split(',')] @@ -80,12 +81,9 @@ return True - def check_rule_apply_notif(self, obj, rule): + def check_rule_all(self, event, obj, rule): # Check notification type - notif_type = '' - if obj.notif_type == 'msg': - notif_type = 'message_received' - if notif_type != rule['event']: + if rule['event'] != event: return False # notification type is ok. Now check recipient @@ -103,27 +101,34 @@ # All is ok return True + def check_rule_apply_notif(self, obj, rule): + # Check notification type + notif_type = '' + if obj.notif_type == 'msg': + notif_type = 'message_received' + elif obj.notif_type == 'pres': + if obj.base_event.old_show < 2 and obj.base_event.new_show > 1: + notif_type = 'contact_connected' + elif obj.base_event.old_show > 1 and obj.base_event.new_show < 2: + notif_type = 'contact_disconnected' + else: + notif_type = 'contact_status_change' + + return self.check_rule_all(notif_type, obj, rule) + def check_rule_apply_decrypted_msg(self, obj, rule): - # Check notification type - if rule['event'] != 'message_received': - return False + return self.check_rule_all('message_received', obj, rule) - # notification type is ok. Now check recipient - if not self._check_rule_recipients(obj, rule): - return False + def check_rule_apply_connected(self, obj, rule): + return self.check_rule_all('contact_connected', obj, rule) - # recipient is ok. Now check our status - if not self._check_rule_status(obj, rule): - return False + def check_rule_apply_disconnected(self, obj, rule): + return self.check_rule_all('contact_disconnected', obj, rule) - # our_status is ok. Now check opened chat window - if not self._check_rule_tab_opened(obj, rule): - return False + def check_rule_apply_status_changed(self, obj, rule): + return self.check_rule_all('contact_status_change', obj, rule) - # All is ok - return True - - def apply_rule(self, obj, rule): + def apply_rule_notif(self, obj, rule): if rule['sound'] == 'no': obj.do_sound = False elif rule['sound'] == 'yes': @@ -156,32 +161,58 @@ # ?? not in obj actions # elif rule['urgency_hint'] == 'yes': - def _nec_notif(self, obj): + def apply_rule_decrypted_message(self, obj, rule): + if rule['auto_open'] == 'no': + obj.popup = False + elif rule['auto_open'] == 'yes': + obj.popup = True + + def apply_rule_presence(self, obj, rule): + if rule['auto_open'] == 'no': + obj.popup = False + elif rule['auto_open'] == 'yes': + obj.popup = True + + def _nec_all(self, obj, check_func, apply_func): # check rules in order rules_num = [int(i) for i in self.config.keys()] rules_num.sort() for num in rules_num: - if self.check_rule_apply_notif(obj, self.config[str(num)]): - self.apply_rule(obj, self.config[str(num)]) + rule = self.config[str(num)] + if check_func(obj, rule): + apply_func(obj, rule) # Should we stop after first valid rule ? # break + def _nec_notif(self, obj): + self._nec_all(obj, self.check_rule_apply_notif, self.apply_rule_notif) + def _nec_decrypted_message_received(self, obj): - rules_num = [int(i) for i in self.config.keys()] - rules_num.sort() - for num in rules_num: - rule = self.config[str(num)] - if self.check_rule_apply_decrypted_msg(obj, rule): - if rule['auto_open'] == 'no': - obj.popup = False - elif rule['auto_open'] == 'yes': - obj.popup = True + self._nec_all(obj, self.check_rule_apply_decrypted_msg, + self.apply_rule_decrypted_message) + + def _nec_presence_received(self, obj): + if obj.old_show < 2 and obj.new_show > 1: + check_func = self.check_rule_apply_connected + elif obj.old_show > 1 and obj.new_show < 2: + check_func = self.check_rule_apply_disconnected + else: + check_func = self.check_rule_apply_status_changed + self._nec_all(obj, check_func, self.apply_rule_presence) class TriggersPluginConfigDialog(GajimPluginConfigDialog): - events_list = ['message_received']#, 'contact_connected', - #'contact_disconnected', 'contact_change_status', 'gc_msg_highlight', - #'gc_msg'] + # {event: widgets_to_disable, } + events_list = { + 'message_received': [], + 'contact_connected': ['use_systray_cb', 'disable_systray_cb', + 'use_roster_cb', 'disable_roster_cb'], + 'contact_disconnected': ['use_systray_cb', 'disable_systray_cb', + 'use_roster_cb', 'disable_roster_cb'], + 'contact_status_change': ['use_systray_cb', 'disable_systray_cb', + 'use_roster_cb', 'disable_roster_cb'] + #, 'gc_msg_highlight': [], 'gc_msg': []} + } recipient_types_list = ['contact', 'group', 'all'] config_options = ['event', 'recipient_type', 'recipients', 'status', 'tab_opened', 'sound', 'sound_file', 'popup', 'auto_open', @@ -278,7 +309,7 @@ # event value = self.config[self.active_num]['event'] if value: - self.event_combobox.set_active(self.events_list.index(value)) + self.event_combobox.set_active(self.events_list.keys().index(value)) else: self.event_combobox.set_active(-1) # recipient_type @@ -449,8 +480,14 @@ if active == -1: event = '' else: - event = self.events_list[active] + event = self.events_list.keys()[active] self.config[self.active_num]['event'] = event + for w in ('use_systray_cb', 'disable_systray_cb', 'use_roster_cb', + 'disable_roster_cb'): + self.__dict__[w].set_sensitive(True) + for w in self.events_list[event]: + self.__dict__[w].set_sensitive(False) + self.__dict__[w].set_state(False) self.set_treeview_string() def on_recipient_type_combobox_changed(self, widget): diff -r 1db2eb2ba130 -r bdf1d42eca18 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Aug 18 20:06:31 2011 +0200 +++ b/src/common/connection_handlers_events.py Fri Aug 19 18:39:09 2011 +0200 @@ -711,6 +711,8 @@ self.need_add_in_roster = False self.need_redraw = False + self.popup = False # Do we want to open chat window ? + if not self.conn or self.conn.connected < 2: log.debug('account is no more connected') return diff -r 1db2eb2ba130 -r bdf1d42eca18 src/roster_window.py --- a/src/roster_window.py Thu Aug 18 20:06:31 2011 +0200 +++ b/src/roster_window.py Fri Aug 19 18:39:09 2011 +0200 @@ -2487,6 +2487,15 @@ if obj.contact: self.chg_contact_status(obj.contact, obj.show, obj.status, account) + if obj.popup: + ctrl = gajim.interface.msg_win_mgr.search_control(jid, account) + if ctrl: + gobject.idle_add(ctrl.parent_win.set_active_tab, ctrl) + else: + ctrl = gajim.interface.new_chat(obj.contact, account) + if len(gajim.events.get_events(account, obj.jid)): + ctrl.read_queue() + def _nec_gc_presence_received(self, obj): account = obj.conn.name if obj.room_jid in gajim.interface.minimized_controls[account]: @@ -2580,14 +2589,11 @@ if obj.msg_id: gajim.logger.set_read_messages([obj.msg_id]) elif obj.popup: - if not obj.session.control: - contact = gajim.contacts.get_contact(obj.conn.name, obj.jid, - obj.resource_for_chat) - obj.session.control = gajim.interface.new_chat(contact, - obj.conn.name, resource=obj.resource_for_chat, - session=obj.session) - if len(gajim.events.get_events(obj.conn.name, obj.fjid)): - obj.session.control.read_queue() + contact = gajim.contacts.get_contact(obj.conn.name, obj.jid) + obj.session.control = gajim.interface.new_chat(contact, + obj.conn.name, session=obj.session) + if len(gajim.events.get_events(obj.conn.name, obj.fjid)): + obj.session.control.read_queue() if obj.show_in_roster: self.draw_contact(obj.jid, obj.conn.name)

1 0

gajim: do not connect to opened disconnected groupchats. Fixes #...
by Yann Leboulanger 19 Aug '11

19 Aug '11

changeset 1db2eb2ba130 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1db2eb2ba130 description: do not connect to opened disconnected groupchats. Fixes #6943 diffstat: src/roster_window.py | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diffs (15 lines): diff -r 3816d526650a -r 1db2eb2ba130 src/roster_window.py --- a/src/roster_window.py Thu Aug 18 19:03:31 2011 +0200 +++ b/src/roster_window.py Thu Aug 18 20:06:31 2011 +0200 @@ -2086,11 +2086,6 @@ if gajim.gc_connected[account][gc_control.room_jid]: gajim.connections[account].send_gc_status( gc_control.nick, gc_control.room_jid, status, txt) - else: - # for some reason, we are not connected to the room even - # if tab is opened, send initial join_gc() - gajim.connections[account].join_gc(gc_control.nick, - gc_control.room_jid, None) if was_invisible and status != 'offline': # We come back from invisible, join bookmarks gajim.interface.auto_join_bookmarks(account)

1 0

gajim: do not set an id when we publish a new item on pubsub. Fi...
by Yann Leboulanger 18 Aug '11

18 Aug '11

changeset 3816d526650a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3816d526650a description: do not set an id when we publish a new item on pubsub. Fixes #6947 diffstat: src/common/pubsub.py | 7 +++++-- src/groups.py | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diffs (35 lines): diff -r f7a45be37bf5 -r 3816d526650a src/common/pubsub.py --- a/src/common/pubsub.py Sun Aug 14 12:19:43 2011 +0200 +++ b/src/common/pubsub.py Thu Aug 18 19:03:31 2011 +0200 @@ -76,7 +76,7 @@ self.__callbacks[id_] = (cb, args, kwargs) - def send_pb_publish(self, jid, node, item, id_, options=None): + def send_pb_publish(self, jid, node, item, id_=None, options=None): """ Publish item to a node """ @@ -85,7 +85,10 @@ query = xmpp.Iq('set', to=jid) e = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB) p = e.addChild('publish', {'node': node}) - p.addChild('item', {'id': id_}, [item]) + attrs = {} + if id_: + attrs = {'id': id_} + p.addChild('item', attrs, [item]) if options: p = e.addChild('publish-options') p.addChild(node=options) diff -r f7a45be37bf5 -r 3816d526650a src/groups.py --- a/src/groups.py Sun Aug 14 12:19:43 2011 +0200 +++ b/src/groups.py Thu Aug 18 19:03:31 2011 +0200 @@ -61,7 +61,6 @@ author.addChild('name', {}, [self.from_entry.get_text()]) item.addChild('generator', {}, ['Gajim']) item.addChild('title', {}, [self.subject_entry.get_text()]) - item.addChild('id', {}, ['0']) buf = self.contents_textview.get_buffer() item.addChild('content', {}, [buf.get_text(buf.get_start_iter(), buf.get_end_iter())])

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2011