Commits March 2008

commits@gajim.org

5 participants
80 discussions

[commit-gajim] r9407 - trunk/src
by asterix＠gajim.org 22 Mar '08

22 Mar '08

Author: asterix Date: 2008-03-22 09:52:46 +0100 (Sat, 22 Mar 2008) New Revision: 9407 Modified: trunk/src/gajim.py Log: typo in a string Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-03-21 17:17:12 UTC (rev 9406) +++ trunk/src/gajim.py 2008-03-22 08:52:46 UTC (rev 9407) @@ -2296,7 +2296,7 @@ self.handle_event_status(account, 'offline') pritext = _('Insecure connection') sectext = _('You are about to send your password on an insecure ' - 'conection. Are you sure you want to do that?') + 'connection. Are you sure you want to do that?') checktext = _('Do _not ask me again') dialog = dialogs.YesNoDialog(pritext, sectext, checktext, on_response_yes=on_yes, on_response_no=on_no)

1 0

[commit-gajim] r9406 - trunk/src/common/zeroconf
by asterix＠gajim.org 21 Mar '08

21 Mar '08

Author: asterix Date: 2008-03-21 18:17:12 +0100 (Fri, 21 Mar 2008) New Revision: 9406 Modified: trunk/src/common/zeroconf/client_zeroconf.py Log: coding standards Modified: trunk/src/common/zeroconf/client_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/client_zeroconf.py 2008-03-21 16:55:39 UTC (rev 9405) +++ trunk/src/common/zeroconf/client_zeroconf.py 2008-03-21 17:17:12 UTC (rev 9406) @@ -25,7 +25,7 @@ from common.xmpp.simplexml import ustr from common.zeroconf import zeroconf -from common.xmpp.protocol import * +from common.xmpp.protocol import * import socket import errno import sys @@ -36,8 +36,8 @@ from common.zeroconf import roster_zeroconf MAX_BUFF_LEN = 65536 -DATA_RECEIVED='DATA RECEIVED' -DATA_SENT='DATA SENT' +DATA_RECEIVED = 'DATA RECEIVED' +DATA_SENT = 'DATA SENT' TYPE_SERVER, TYPE_CLIENT = range(2) # wait XX sec to establish a connection @@ -50,14 +50,14 @@ def __init__(self, port, conn_holder): ''' handle all incomming connections on ('0.0.0.0', port)''' self.port = port - self.queue_idx = -1 + self.queue_idx = -1 #~ self.queue = None self.started = False self._sock = None self.fd = -1 self.caller = conn_holder.caller self.conn_holder = conn_holder - + def bind(self): self._serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) @@ -74,11 +74,11 @@ self.fd = self._serv.fileno() gajim.idlequeue.plug_idle(self, False, True) self.started = True - + def pollend(self): ''' called when we stop listening on (host, port) ''' self.disconnect() - + def pollin(self): ''' accept a new incomming connection and notify queue''' sock = self.accept_conn() @@ -92,7 +92,7 @@ from_jid = jid break; P2PClient(sock[0], sock[1][0], sock[1][1], self.conn_holder, [], from_jid) - + def disconnect(self): ''' free all resources, we are not listening anymore ''' gajim.idlequeue.remove_timeout(self.fd) @@ -104,15 +104,16 @@ except: pass self.conn_holder.kill_all_connections() - + def accept_conn(self): ''' accepts a new incoming connection ''' - _sock = self._serv.accept() + _sock = self._serv.accept() _sock[0].setblocking(False) return _sock class P2PClient(IdleObject): - def __init__(self, _sock, host, port, conn_holder, stanzaqueue = [], to = None, on_ok=None, on_not_ok=None): + def __init__(self, _sock, host, port, conn_holder, stanzaqueue=[], to=None, + on_ok=None, on_not_ok=None): self._owner = self self.Namespace = 'jabber:client' self.defaultNamespace = self.Namespace @@ -141,7 +142,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: @@ -159,11 +161,11 @@ on_not_ok('Connection to host could not be established.') return if self.conn_holder.number_of_awaiting_messages.has_key(self.fd): - self.conn_holder.number_of_awaiting_messages[self.fd]+=1 + self.conn_holder.number_of_awaiting_messages[self.fd] += 1 else: - self.conn_holder.number_of_awaiting_messages[self.fd]=1 + self.conn_holder.number_of_awaiting_messages[self.fd] = 1 - def add_stanza(self, stanza, is_message = False): + def add_stanza(self, stanza, is_message=False): if self.Connection: if self.Connection.state == -1: return False @@ -173,14 +175,14 @@ if is_message: if self.conn_holder.number_of_awaiting_messages.has_key(self.fd): - self.conn_holder.number_of_awaiting_messages[self.fd]+=1 + self.conn_holder.number_of_awaiting_messages[self.fd] += 1 else: self.conn_holder.number_of_awaiting_messages[self.fd] = 1 return True - + def on_message_sent(self, connection_id): - self.conn_holder.number_of_awaiting_messages[connection_id]-=1 + self.conn_holder.number_of_awaiting_messages[connection_id] -= 1 def on_connect(self, conn): self.Connection = conn @@ -201,7 +203,7 @@ self.Dispatcher.Stream.features = None if self.sock_type == TYPE_CLIENT: self.send_stream_header() - + def send_stream_header(self): self.Dispatcher._metastream = Node('stream:stream') self.Dispatcher._metastream.setNamespace(self.Namespace) @@ -210,11 +212,13 @@ 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(self.Dispatcher._metastream)[:-2]) - + self.Dispatcher.send("<?xml version='1.0'?>%s>" % str( + self.Dispatcher._metastream)[:-2]) + def _check_stream_start(self, ns, tag, attrs): if ns<>NS_STREAMS or tag<>'stream': - self.Connection.DEBUG('Incorrect stream start: (%s,%s).Terminating! ' % (tag, ns), 'error') + self.Connection.DEBUG('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.') @@ -235,12 +239,11 @@ stanza, is_message = self.stanzaqueue.pop(0) self.send(stanza, is_message) - def on_disconnect(self): if self.conn_holder: if self.conn_holder.number_of_awaiting_messages.has_key(self.fd): del self.conn_holder.number_of_awaiting_messages[self.fd] - self.conn_holder.remove_connection(self.sock_hash) + self.conn_holder.remove_connection(self.sock_hash) if self.__dict__.has_key('Dispatcher'): self.Dispatcher.PlugOut() if self.__dict__.has_key('P2PConnection'): @@ -248,13 +251,13 @@ self.Connection = None self._caller = None self.conn_holder = None - + def force_disconnect(self): if self.Connection: self.disconnect() else: self.on_disconnect() - + def _on_receive_document_attrs(self, data): if data: self.Dispatcher.ProcessNonBlocking(data) @@ -263,15 +266,16 @@ return self.onreceive(None) if self.Dispatcher.Stream._document_attrs.has_key('version') and \ - self.Dispatcher.Stream._document_attrs['version'] == '1.0': + self.Dispatcher.Stream._document_attrs['version'] == '1.0': #~ self.onreceive(self._on_receive_stream_features) #XXX continue with TLS return self.onreceive(None) return True - + def _register_handlers(self): - 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) self.RegisterHandler('iq', self._caller._siErrorCB, 'error', @@ -284,13 +288,14 @@ common.xmpp.NS_BYTESTREAM) self.RegisterHandler('iq', self._caller._bytestreamErrorCB, 'error', common.xmpp.NS_BYTESTREAM) - + class P2PConnection(IdleObject, PlugIn): - def __init__(self, sock_hash, _sock, host = None, port = None, caller = None, on_connect = None, client = None): + def __init__(self, sock_hash, _sock, host=None, port=None, caller=None, + on_connect=None, client=None): IdleObject.__init__(self) self._owner = client PlugIn.__init__(self) - self.DBG_LINE='socket' + self.DBG_LINE = 'socket' self.sendqueue = [] self.sendbuff = None self.buff_is_message = False @@ -301,20 +306,22 @@ self.client = client self.writable = False self.readable = False - self._exported_methods=[self.send, self.disconnect, self.onreceive] + self._exported_methods = [self.send, self.disconnect, self.onreceive] self.on_receive = None if _sock: self._sock = _sock - self.state = 1 + self.state = 1 self._sock.setblocking(False) self.fd = self._sock.fileno() self.on_connect(self) else: self.state = 0 try: - self.ais = socket.getaddrinfo(host, port, socket.AF_UNSPEC, socket.SOCK_STREAM) + 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() @@ -329,10 +336,10 @@ try: self._sock = socket.socket(*ai[:3]) self._sock.setblocking(False) - self._server=ai[4] + self._server = ai[4] except: if sys.exc_value[0] != errno.EINPROGRESS: - #for all errors, we try other addresses + # for all errors, we try other addresses self.connect_to_next_ip() return self.fd = self._sock.fileno() @@ -351,8 +358,8 @@ return True 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 @@ -367,10 +374,10 @@ # make sure this cb is not overriden by recursive calls if not recv_handler(None) and _tmp == self.on_receive: self.on_receive = recv_handler - - def send(self, packet, is_message = False, now = False): + + def send(self, packet, is_message=False, now=False): '''Append stanza to the queue of messages to be send if now is - False, else send it instantly. + False, else send it instantly. If supplied data is unicode string, encode it to utf-8. ''' if self.state <= 0: @@ -378,9 +385,9 @@ r = packet - if isinstance(r, unicode): + if isinstance(r, unicode): r = r.encode('utf-8') - elif not isinstance(r, str): + elif not isinstance(r, str): r = ustr(r).encode('utf-8') if now: @@ -389,13 +396,13 @@ else: self.sendqueue.append((r, is_message)) self._plug_idle() - + def read_timeout(self): if self.client.conn_holder.number_of_awaiting_messages.has_key(self.fd) \ - and self.client.conn_holder.number_of_awaiting_messages[self.fd] > 0: - self.client._caller.dispatch('MSGERROR',[unicode(self.client.to), -1, \ - _('Connection to host could not be established: Timeout while sending data.'), None, None]) - self.client.conn_holder.number_of_awaiting_messages[self.fd] = 0 + and self.client.conn_holder.number_of_awaiting_messages[self.fd] > 0: + self.client._caller.dispatch('MSGERROR',[unicode(self.client.to), -1, + _('Connection to host could not be established: Timeout while sending data.'), None, None]) + self.client.conn_holder.number_of_awaiting_messages[self.fd] = 0 self.pollend() def do_connect(self): @@ -418,30 +425,29 @@ self.state = 1 # connected # we are connected self.on_connect(self) - - + def pollout(self): if self.state == 0: self.do_connect() return gajim.idlequeue.remove_timeout(self.fd) self._do_send() - + def pollend(self): self.state = -1 self.disconnect() - + def pollin(self): ''' Reads all pending incoming data. Calls owner's disconnected() method if appropriate.''' received = '' errnum = 0 - try: + try: # get as many bites, as possible, but not more than RECV_BUFSIZE received = self._sock.recv(MAX_BUFF_LEN) except Exception, e: - if len(e.args) > 0 and isinstance(e.args[0], int): + if len(e.args) > 0 and isinstance(e.args[0], int): errnum = e[0] - # "received" will be empty anyhow + # "received" will be empty anyhow if errnum == socket.SSL_ERROR_WANT_READ: pass elif errnum in [errno.ECONNRESET, errno.ENOTCONN, errno.ESHUTDOWN]: @@ -449,13 +455,13 @@ # don't proccess result, cas it will raise error return elif not received : - if errnum != socket.SSL_ERROR_EOF: + if errnum != socket.SSL_ERROR_EOF: # 8 EOF occurred in violation of protocol self.pollend() if self.state >= 0: self.disconnect() return - + if self.state < 0: return if self.on_receive: @@ -471,7 +477,7 @@ self.DEBUG('Unhandled data received: %s' % received,'error') self.disconnect() return True - + def onreceive(self, recv_handler): if not recv_handler: if hasattr(self._owner, 'Dispatcher'): @@ -483,7 +489,7 @@ # make sure this cb is not overriden by recursive calls if not recv_handler(None) and _tmp == self.on_receive: self.on_receive = recv_handler - + def disconnect(self): ''' Closes the socket. ''' gajim.idlequeue.remove_timeout(self.fd) @@ -515,13 +521,13 @@ self._on_send() self.disconnect() return - # we are not waiting for write + # we are not waiting for write self._plug_idle() self._on_send() except socket.error, e: if e[0] == socket.SSL_ERROR_WANT_WRITE: - return True + return True if self.state < 0: self.disconnect() return @@ -530,7 +536,7 @@ if self._owner.sock_type == TYPE_CLIENT: self.set_timeout(ACTIVITY_TIMEOUT_SECONDS) return True - + def _plug_idle(self): readable = self.state != 0 if self.sendqueue or self.sendbuff: @@ -539,8 +545,8 @@ writable = False if self.writable != writable or self.readable != readable: gajim.idlequeue.plug_idle(self, writable, readable) - - + + def _on_send(self): if self.sent_data and self.sent_data.strip(): self.DEBUG(self.sent_data,'sent') @@ -556,7 +562,6 @@ self._owner.disconnected() self.sent_data = None - class ClientZeroconf: def __init__(self, caller): self.caller = caller @@ -584,21 +589,21 @@ def remove_announce(self): if self.zeroconf: return self.zeroconf.remove_announce() - + def announce(self): if self.zeroconf: return self.zeroconf.announce() - + def set_show_msg(self, show, msg): if self.zeroconf: self.zeroconf.txt['msg'] = msg self.last_msg = msg return self.zeroconf.update_txt(show) - + def resolve_all(self): if self.zeroconf: self.zeroconf.resolve_all() - + def reannounce(self, txt): self.remove_announce() self.zeroconf.txt = txt @@ -606,11 +611,11 @@ self.zeroconf.username = self.caller.username return self.announce() - 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 @@ -633,20 +638,20 @@ self.roster.zeroconf = None self.roster._data = None self.roster = None - + def kill_all_connections(self): for connection in self.connections.values(): connection.force_disconnect() - + def add_connection(self, connection, ip, port, recipient): - sock_hash = connection.sock_hash + sock_hash=connection.sock_hash if sock_hash not in self.connections: self.connections[sock_hash] = connection self.ip_to_hash[ip] = sock_hash self.hash_to_port[sock_hash] = port if recipient: self.recipient_to_hash[recipient] = sock_hash - + def remove_connection(self, sock_hash): if sock_hash in self.connections: del self.connections[sock_hash] @@ -669,13 +674,13 @@ return p self.listener = None return False - + def getRoster(self): if self.roster: return self.roster.getRoster() return {} - def send(self, stanza, is_message = False, now = False, on_ok=None, + def send(self, stanza, is_message=False, now=False, on_ok=None, on_not_ok=None): stanza.setFrom(self.roster.zeroconf.name) to = stanza.getTo() @@ -704,4 +709,5 @@ return 0 # otherwise open new connection - P2PClient(None, item['address'], item['port'], self, [(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok) + P2PClient(None, item['address'], item['port'], self, + [(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok)

1 0

[commit-gajim] r9405 - trunk/src/common/zeroconf
by asterix＠gajim.org 21 Mar '08

21 Mar '08

Author: asterix Date: 2008-03-21 17:55:39 +0100 (Fri, 21 Mar 2008) New Revision: 9405 Modified: trunk/src/common/zeroconf/client_zeroconf.py trunk/src/common/zeroconf/connection_zeroconf.py Log: fix zeroconf to be ablt to use IPv6. Fixes #3683 Modified: trunk/src/common/zeroconf/client_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/client_zeroconf.py 2008-03-21 12:46:54 UTC (rev 9404) +++ trunk/src/common/zeroconf/client_zeroconf.py 2008-03-21 16:55:39 UTC (rev 9405) @@ -30,6 +30,9 @@ import errno import sys +import logging +log = logging.getLogger('gajim.c.z.client_zeroconf') + from common.zeroconf import roster_zeroconf MAX_BUFF_LEN = 65536 @@ -109,7 +112,7 @@ return _sock class P2PClient(IdleObject): - def __init__(self, _sock, host, port, conn_holder, stanzaqueue = [], to = None): + def __init__(self, _sock, host, port, conn_holder, stanzaqueue = [], to = None, on_ok=None, on_not_ok=None): self._owner = self self.Namespace = 'jabber:client' self.defaultNamespace = self.Namespace @@ -120,6 +123,8 @@ self.stanzaqueue = stanzaqueue self.to = to self.Server = host + self.on_ok = on_ok + self.on_not_ok = on_not_ok self.DBG = 'client' self.Connection = None if gajim.verbose: @@ -137,6 +142,11 @@ self.sock_type = TYPE_CLIENT self.fd = -1 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: + on_not_ok('Connection to host could not be established.') + return self.sock_hash = conn._sock.__hash__ self.fd = conn.fd self.conn_holder.add_connection(self, self.Server, port, self.to) @@ -145,14 +155,14 @@ stanza, is_message = val if is_message: if self.fd == -1: - self._caller.dispatch('MSGERROR',[unicode(self.to), -1, \ - _('Connection to host could not be established'), None, None]) + if on_not_ok: + on_not_ok('Connection to host could not be established.') + return + if self.conn_holder.number_of_awaiting_messages.has_key(self.fd): + self.conn_holder.number_of_awaiting_messages[self.fd]+=1 else: - if self.conn_holder.number_of_awaiting_messages.has_key(self.fd): - self.conn_holder.number_of_awaiting_messages[self.fd]+=1 - else: - self.conn_holder.number_of_awaiting_messages[self.fd]=1 - + self.conn_holder.number_of_awaiting_messages[self.fd]=1 + def add_stanza(self, stanza, is_message = False): if self.Connection: if self.Connection.state == -1: @@ -177,6 +187,8 @@ self.Connection.PlugIn(self) dispatcher_nb.Dispatcher().PlugIn(self) self._register_handlers() + if self.on_ok: + self.on_ok() def StreamInit(self): ''' Send an initial stream header. ''' @@ -202,10 +214,10 @@ def _check_stream_start(self, ns, tag, attrs): if ns<>NS_STREAMS or tag<>'stream': - self._caller.dispatch('MSGERROR',[unicode(self.to), -1, \ - _('Connection to host could not be established: Incorrect answer from server.'), None, None]) self.Connection.DEBUG('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.') return if self.sock_type == TYPE_SERVER: if attrs.has_key('from'): @@ -227,9 +239,6 @@ def on_disconnect(self): if self.conn_holder: if self.conn_holder.number_of_awaiting_messages.has_key(self.fd): - if self.conn_holder.number_of_awaiting_messages[self.fd] > 0: - self._caller.dispatch('MSGERROR',[unicode(self.to), -1, \ - _('Connection to host could not be established'), None, None]) del self.conn_holder.number_of_awaiting_messages[self.fd] self.conn_holder.remove_connection(self.sock_hash) if self.__dict__.has_key('Dispatcher'): @@ -302,13 +311,35 @@ self.on_connect(self) else: self.state = 0 - self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + try: + 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) + else: + self.connect_to_next_ip() + + def connect_to_next_ip(self): + if len(self.ais) == 0: + log.error('Connection failure to %s', 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) + try: + self._sock = socket.socket(*ai[:3]) self._sock.setblocking(False) - self.fd = self._sock.fileno() - gajim.idlequeue.plug_idle(self, True, False) - self.set_timeout(CONNECT_TIMEOUT_SECONDS) - self.do_connect() - + self._server=ai[4] + except: + if sys.exc_value[0] != errno.EINPROGRESS: + #for all errors, we try other addresses + self.connect_to_next_ip() + return + self.fd = self._sock.fileno() + gajim.idlequeue.plug_idle(self, True, False) + self.set_timeout(CONNECT_TIMEOUT_SECONDS) + self.do_connect() + def set_timeout(self, timeout): gajim.idlequeue.remove_timeout(self.fd) if self.state >= 0: @@ -370,7 +401,7 @@ def do_connect(self): errnum = 0 try: - self._sock.connect((self.host, self.port)) + self._sock.connect(self._server) self._sock.setblocking(False) except Exception, ee: (errnum, errstr) = ee @@ -378,13 +409,15 @@ return # win32 needs this elif errnum not in (0, 10056, errno.EISCONN) or self.state != 0: - self.disconnect() - return None + log.error('Could not connect to %s: %s [%s]', self.host, errnum, + errstr) + self.connect_to_next_ip() + return else: # socket is already connected self._sock.setblocking(False) self.state = 1 # connected + # we are connected self.on_connect(self) - return 1 # we are connected def pollout(self): @@ -642,28 +675,33 @@ return self.roster.getRoster() return {} - def send(self, stanza, is_message = False, now = False): + def send(self, stanza, is_message = False, now = False, on_ok=None, + on_not_ok=None): stanza.setFrom(self.roster.zeroconf.name) to = stanza.getTo() - + try: item = self.roster[to] except KeyError: - self.caller.dispatch('MSGERROR', [unicode(to), '-1', _('Contact is offline. Your message could not be sent.'), None, None]) - return False - + # Contact offline + return -1 + # look for hashed connections if to in self.recipient_to_hash: conn = self.connections[self.recipient_to_hash[to]] if conn.add_stanza(stanza, is_message): - return + if on_ok: + on_ok() + return 0 if item['address'] in self.ip_to_hash: hash = self.ip_to_hash[item['address']] if self.hash_to_port[hash] == item['port']: conn = self.connections[hash] if conn.add_stanza(stanza, is_message): - return + if on_ok: + on_ok() + return 0 # otherwise open new connection - P2PClient(None, item['address'], item['port'], self, [(stanza, is_message)], to) + P2PClient(None, item['address'], item['port'], self, [(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok) Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2008-03-21 12:46:54 UTC (rev 9404) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2008-03-21 16:55:39 UTC (rev 9405) @@ -435,25 +435,33 @@ if session.enable_encryption: msg_iq = session.encrypt_stanza(msg_iq) - if not self.connection.send(msg_iq, msg != None): - return + def on_send_ok(): + no_log_for = gajim.config.get_per('accounts', self.name, 'no_log_for') + ji = gajim.get_jid_without_resource(jid) + if session.is_loggable() and self.name not in no_log_for and\ + ji not in no_log_for: + log_msg = msg + if subject: + log_msg = _('Subject: %s\n%s') % (subject, msg) + if log_msg: + if type == 'chat': + kind = 'chat_msg_sent' + else: + kind = 'single_msg_sent' + gajim.logger.write(kind, jid, log_msg) - no_log_for = gajim.config.get_per('accounts', self.name, 'no_log_for') - ji = gajim.get_jid_without_resource(jid) - if session.is_loggable() and self.name not in no_log_for and\ - ji not in no_log_for: - log_msg = msg - if subject: - log_msg = _('Subject: %s\n%s') % (subject, msg) - if log_msg: - if type == 'chat': - kind = 'chat_msg_sent' - else: - kind = 'single_msg_sent' - gajim.logger.write(kind, jid, log_msg) + self.dispatch('MSGSENT', (jid, msg, keyID)) - self.dispatch('MSGSENT', (jid, msg, keyID)) + def on_send_not_ok(reason): + reason += ' ' + _('Your message could not be sent.') + self.dispatch('MSGERROR', [jid, '-1', reason, None, None]) + ret = self.connection.send(msg_iq, msg != None, on_ok=on_send_ok, + on_not_ok=on_send_not_ok) + if ret == -1: + # Contact Offline + self.dispatch('MSGERROR', [jid, '-1', _('Contact is offline. Your message could not be sent.'), None, None]) + def send_stanza(self, stanza): # send a stanza untouched if not self.connection:

1 0

[commit-gajim] r9404 - trunk/src
by asterix＠gajim.org 21 Mar '08

21 Mar '08

Author: asterix Date: 2008-03-21 13:46:54 +0100 (Fri, 21 Mar 2008) New Revision: 9404 Modified: trunk/src/roster_window.py Log: fix call to correct function when inviting to room in roster Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-03-21 12:30:23 UTC (rev 9403) +++ trunk/src/roster_window.py 2008-03-21 12:46:54 UTC (rev 9404) @@ -2103,7 +2103,7 @@ menuitem = gtk.MenuItem(room_jid.split('@')[0]) if len(contact_list) > 1: # several resources menuitem.set_submenu(self.build_resources_submenu( - contact_list, account, self.on_invite_to_new_room, room_jid, + contact_list, account, self.on_invite_to_room, room_jid, account)) else: menuitem.connect('activate', self.on_invite_to_room, list_,

1 0

[commit-gajim] r9403 - trunk/src
by asterix＠gajim.org 21 Mar '08

21 Mar '08

Author: asterix Date: 2008-03-21 13:30:23 +0100 (Fri, 21 Mar 2008) New Revision: 9403 Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: show invitation from anonymous room in roster from a groupchat rather than from a normal Contact. fixes #3448 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-03-20 20:39:51 UTC (rev 9402) +++ trunk/src/gajim.py 2008-03-21 12:30:23 UTC (rev 9403) @@ -1666,8 +1666,12 @@ self.roster.show_title() if no_queue: # We didn't have a queue: we change icons if not gajim.contacts.get_contact_with_highest_priority(account, jid): - # add contact to roster ("Not In The Roster") if he is not - self.roster.add_to_not_in_the_roster(account, jid) + if type_ == 'gc-invitation': + self.roster.add_groupchat_to_roster(account, jid, + status='offline') + else: + # add contact to roster ("Not In The Roster") if he is not + self.roster.add_to_not_in_the_roster(account, jid) self.roster.draw_contact(jid, account) # Show contact in roster (if he is invisible for example) and select line Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-03-20 20:39:51 UTC (rev 9402) +++ trunk/src/roster_window.py 2008-03-21 12:30:23 UTC (rev 9403) @@ -445,8 +445,7 @@ self.add_contact_to_roster(contact.jid, account) return contact - def add_groupchat_to_roster(self, account, jid, nick = '', resource = '', - status = ''): + def add_groupchat_to_roster(self, account, jid, resource = '', status = ''): ''' add groupchat to roster ''' contact = gajim.contacts.get_contact_with_highest_priority(account, jid) if contact == None:

1 0

[commit-gajim] r9402 - trunk/src
by jim++＠gajim.org 20 Mar '08

20 Mar '08

Author: jim++ Date: 2008-03-20 21:39:51 +0100 (Thu, 20 Mar 2008) New Revision: 9402 Modified: trunk/src/groupchat_control.py Log: Fix TB introduced in [9400] if using minimized muc Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-03-20 20:26:58 UTC (rev 9401) +++ trunk/src/groupchat_control.py 2008-03-20 20:39:51 UTC (rev 9402) @@ -845,7 +845,8 @@ ChatControlBase.got_connected(self) # We don't redraw the whole banner here, because only icon change self._update_banner_state_image() - self.parent_win.redraw_tab(self) + if self.parent_win: + self.parent_win.redraw_tab(self) def got_disconnected(self): self.list_treeview.get_model().clear() @@ -867,7 +868,8 @@ ChatControlBase.got_disconnected(self) # We don't redraw the whole banner here, because only icon change self._update_banner_state_image() - self.parent_win.redraw_tab(self) + if self.parent_win: + self.parent_win.redraw_tab(self) def draw_roster(self): self.list_treeview.get_model().clear()

1 0

[commit-gajim] r9401 - trunk/src
by jim++＠gajim.org 20 Mar '08

20 Mar '08

Author: jim++ Date: 2008-03-20 21:26:58 +0100 (Thu, 20 Mar 2008) New Revision: 9401 Modified: trunk/src/chat_control.py trunk/src/roster_window.py Log: roster.on_quit_request() cleanups : -Check if there are pending events and send offline even if we don't ask a status message (was a indentation mistake I think) - Really make unread and recent working according to 'notify_on_all_muc_messages' value - be faster, hopefully Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-03-20 19:37:20 UTC (rev 9400) +++ trunk/src/chat_control.py 2008-03-20 20:26:58 UTC (rev 9401) @@ -663,7 +663,13 @@ if not count_as_new: return if kind == 'incoming': - gajim.last_message_time[self.account][full_jid] = time.time() + if not self.type_id == message_control.TYPE_GC or \ + gajim.config.get('notify_on_all_muc_messages') or \ + 'marked' in other_tags_for_text: + # it's a normal message, or a muc message with want to be + # notified about if quitting just after + # other_tags_for_text == ['marked'] --> highlighted gc message + gajim.last_message_time[self.account][full_jid] = time.time() if kind in ('incoming', 'incoming_queue'): gc_message = False Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-03-20 19:37:20 UTC (rev 9400) +++ trunk/src/roster_window.py 2008-03-20 20:26:58 UTC (rev 9401) @@ -4245,45 +4245,38 @@ if message is None: # user pressed Cancel to change status message dialog return - # check if we have unread or recent mesages - unread = False - recent = False - if gajim.events.get_nb_events() > 0: - unread = True - for win in gajim.interface.msg_win_mgr.windows(): - unrd = 0 - for ctrl in win.controls(): - if ctrl.type_id == message_control.TYPE_GC: - if gajim.config.get('notify_on_all_muc_messages'): - unrd += ctrl.get_nb_unread() - else: - if ctrl.attention_flag: - unrd += 1 - if unrd: - unread = True - break - for ctrl in win.controls(): - fjid = ctrl.get_full_jid() - if gajim.last_message_time[ctrl.account].has_key(fjid): - if time.time() - gajim.last_message_time[ctrl.account][fjid]\ - < 2: - recent = True - break - if unread or recent: - dialog = dialogs.ConfirmationDialog(_('You have unread messages'), - _('Messages will only be available for reading them later if you' - ' have history enabled and contact is in your roster.')) - if dialog.get_response() != gtk.RESPONSE_OK: - return + # check if we have unread messages + unread = gajim.events.get_nb_events() + if not gajim.config.get('notify_on_all_muc_messages'): + unread_not_to_notify = gajim.events.get_nb_events(['printed_gc_msg']) + unread -= unread_not_to_notify - self.quit_on_next_offline = 0 - for acct in accounts: - if gajim.connections[acct].connected: - self.quit_on_next_offline += 1 - self.send_status(acct, 'offline', message) - else: - self.quit_on_next_offline = 0 + # check if we have recent messages + recent = False + for win in gajim.interface.msg_win_mgr.windows(): + for ctrl in win.controls(): + fjid = ctrl.get_full_jid() + if gajim.last_message_time[ctrl.account].has_key(fjid): + if time.time() - gajim.last_message_time[ctrl.account][fjid] < 2: + recent = True + break + if recent: + break + + if unread or recent: + dialog = dialogs.ConfirmationDialog(_('You have unread messages'), + _('Messages will only be available for reading them later if you' + ' have history enabled and contact is in your roster.')) + if dialog.get_response() != gtk.RESPONSE_OK: + return + + self.quit_on_next_offline = 0 + for acct in accounts: + if gajim.connections[acct].connected: + self.quit_on_next_offline += 1 + self.send_status(acct, 'offline', message) + if not self.quit_on_next_offline: self.quit_gtkgui_interface()

1 0

[commit-gajim] r9400 - trunk/src
by jim++＠gajim.org 20 Mar '08

20 Mar '08

Author: jim++ Date: 2008-03-20 20:37:20 +0100 (Thu, 20 Mar 2008) New Revision: 9400 Modified: trunk/src/chat_control.py trunk/src/groupchat_control.py Log: do not redraw_tab too much if not needed Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-03-20 16:31:21 UTC (rev 9399) +++ trunk/src/chat_control.py 2008-03-20 19:37:20 UTC (rev 9400) @@ -797,9 +797,8 @@ types = type_): # There were events to remove self.redraw_after_event_removed(jid) - # Note, we send None chatstate to preserve current - self.parent_win.redraw_tab(self) + def bring_scroll_to_end(self, textview, diff_y = 0): ''' scrolls to the end of textview if end is not visible ''' if self.scroll_to_end_id: Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-03-20 16:31:21 UTC (rev 9399) +++ trunk/src/groupchat_control.py 2008-03-20 19:37:20 UTC (rev 9400) @@ -845,6 +845,7 @@ ChatControlBase.got_connected(self) # We don't redraw the whole banner here, because only icon change self._update_banner_state_image() + self.parent_win.redraw_tab(self) def got_disconnected(self): self.list_treeview.get_model().clear() @@ -866,6 +867,7 @@ ChatControlBase.got_disconnected(self) # We don't redraw the whole banner here, because only icon change self._update_banner_state_image() + self.parent_win.redraw_tab(self) def draw_roster(self): self.list_treeview.get_model().clear() @@ -1133,8 +1135,6 @@ gc_c.affiliation = affiliation gc_c.status = status self.draw_contact(nick) - if self.parent_win: - self.parent_win.redraw_tab(self) if (time.time() - self.room_creation) > 30 and \ nick != self.nick and (not statusCode or \ '303' not in statusCode):

1 0

[commit-gajim] r9399 - in trunk: data/glade src
by jim++＠gajim.org 20 Mar '08

20 Mar '08

Author: jim++ Date: 2008-03-20 17:31:21 +0100 (Thu, 20 Mar 2008) New Revision: 9399 Modified: trunk/data/glade/roster_window.glade trunk/src/roster_window.py trunk/src/systray.py Log: Clarify how roster.quit_on_next_offline works with comments. Use only one function when user wants to quit. Bad dup code ! Maybe see #3643. Modified: trunk/data/glade/roster_window.glade =================================================================== --- trunk/data/glade/roster_window.glade 2008-03-19 23:53:40 UTC (rev 9398) +++ trunk/data/glade/roster_window.glade 2008-03-20 16:31:21 UTC (rev 9399) @@ -119,7 +119,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">_Quit</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_quit_menuitem_activate"/> + <signal name="activate" handler="on_quit_request"/> <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> <widget class="GtkImage" id="image1609"> Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-03-19 23:53:40 UTC (rev 9398) +++ trunk/src/roster_window.py 2008-03-20 16:31:21 UTC (rev 9399) @@ -3847,8 +3847,10 @@ self.set_account_status_icon(account) if status == 'offline': if self.quit_on_next_offline > -1: + # we want to quit, we are waiting for all accounts to be offline self.quit_on_next_offline -= 1 if self.quit_on_next_offline < 1: + # all accounts offline, quit self.quit_gtkgui_interface() else: # No need to redraw contacts if we're quitting @@ -4142,33 +4144,15 @@ force = force) def on_roster_window_delete_event(self, widget, event): - '''When we want to close the window''' + '''Main window X button was clicked''' if gajim.interface.systray_enabled and not gajim.config.get( 'quit_on_roster_x_button'): self.tooltip.hide_tooltip() self.window.hide() else: - accounts = gajim.connections.keys() - get_msg = False - self.quit_on_next_offline = 0 - for acct in accounts: - if gajim.connections[acct].connected: - get_msg = True - break - if get_msg: - message = self.get_status_message('offline') - if message is None: - # user pressed Cancel to change status message dialog - message = '' + self.on_quit_request() + return True # do NOT destroy the window - for acct in accounts: - if gajim.connections[acct].connected: - self.quit_on_next_offline += 1 - self.send_status(acct, 'offline', message) - if not self.quit_on_next_offline: - self.quit_gtkgui_interface() - return True # do NOT destory the window - def on_roster_window_focus_in_event(self, widget, event): # roster received focus, so if we had urgency REMOVE IT # NOTE: we do not have to read the message to remove urgency @@ -4246,7 +4230,10 @@ gajim.interface.hide_systray() gtk.main_quit() - def on_quit_menuitem_activate(self, widget): + def on_quit_request(self, widget = None): + ''' user want to quit. Check if he should be warned about messages + pending. Send offline to all connected account. We do NOT really quit + gajim here ''' accounts = gajim.connections.keys() get_msg = False for acct in accounts: @@ -5414,8 +5401,12 @@ model.set_sort_func(1, self.compareIters) model.set_sort_column_id(1, gtk.SORT_ASCENDING) self.tree.set_model(model) - # when this value become 0 we quit main application + + # when this value become 0 we quit main application. If it's more than 0 + # it means we are waiting for this number of accounts to disconnect before + # quitting self.quit_on_next_offline = -1 + self.make_jabber_state_images() # uf_show, img, show, sensitive Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2008-03-19 23:53:40 UTC (rev 9398) +++ trunk/src/systray.py 2008-03-20 16:31:21 UTC (rev 9399) @@ -281,7 +281,7 @@ gajim.interface.instances['preferences'] = config.PreferencesWindow() def on_quit_menuitem_activate(self, widget): - gajim.interface.roster.on_quit_menuitem_activate(widget) + gajim.interface.roster.on_quit_request() def on_left_click(self): win = gajim.interface.roster.window

1 0

[commit-gajim] r9398 - trunk/src
by jim++＠gajim.org 19 Mar '08

19 Mar '08

Author: jim++ Date: 2008-03-20 00:53:40 +0100 (Thu, 20 Mar 2008) New Revision: 9398 Modified: trunk/src/roster_window.py Log: Restore single click behaviour. Function was called 2 times by mistake. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-03-19 23:14:58 UTC (rev 9397) +++ trunk/src/roster_window.py 2008-03-19 23:53:40 UTC (rev 9398) @@ -3392,7 +3392,6 @@ # We just save on which row we press button, and open chat window on # button release to be able to do DND without opening chat window self.clicked_path = path - self.on_row_activated(widget, path) return else: if type_ == 'group' and x < 27:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2008