Commits December 2006

commits@gajim.org

6 participants
160 discussions

[commit-gajim] r7724 - trunk/src/common/xmpp
by junglecow＠gajim.org 27 Dec '06

27 Dec '06

Author: junglecow Date: 2006-12-27 21:44:21 +0100 (Wed, 27 Dec 2006) New Revision: 7724 Modified: trunk/src/common/xmpp/transports_nb.py Log: Check if self._sock exists before trying to close it. Fixes #2839. Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2006-12-27 18:57:30 UTC (rev 7723) +++ trunk/src/common/xmpp/transports_nb.py 2006-12-27 20:44:21 UTC (rev 7724) @@ -366,13 +366,15 @@ self.remove_timeout() self._owner.disconnected() self.idlequeue.unplug_idle(self.fd) - try: - self._sock.shutdown(socket.SHUT_RDWR) - except socket.error, e: - if e[0] != errno.ENOTCONN: - log.error("Error shutting down socket for %s:", self.getName(), exc_info=True) - try: self._sock.close() - except: log.error("Error closing socket for %s:", self.getName(), exc_info=True) + sock = getattr(self, '_sock', None) + if sock: + try: + sock.shutdown(socket.SHUT_RDWR) + except socket.error, e: + if e[0] != errno.ENOTCONN: + log.error("Error shutting down socket for %s:", self.getName(), exc_info=True) + try: sock.close() + except: log.error("Error closing socket for %s:", self.getName(), exc_info=True) # socket descriptor cannot be (un)plugged anymore self.fd = -1 if self.on_disconnect:

1 0

[commit-gajim] r7723 - trunk/src/common/xmpp
by junglecow＠gajim.org 27 Dec '06

27 Dec '06

Author: junglecow Date: 2006-12-27 19:57:30 +0100 (Wed, 27 Dec 2006) New Revision: 7723 Modified: trunk/src/common/xmpp/dispatcher_nb.py Log: Re-deleted exc_clear. Reason: - It's unnecessary - It confuses people See [7433] and #1575. This is an old workaround for psyco braindeadness, which we don't use anymore. If there's a reason this should stay in code, please document clearly, and re-add. Thanks. Modified: trunk/src/common/xmpp/dispatcher_nb.py =================================================================== --- trunk/src/common/xmpp/dispatcher_nb.py 2006-12-27 18:38:50 UTC (rev 7722) +++ trunk/src/common/xmpp/dispatcher_nb.py 2006-12-27 18:57:30 UTC (rev 7723) @@ -135,7 +135,6 @@ self._owner.Connection.disconnect() return 0 except ExpatError: - sys.exc_clear() self.DEBUG('Invalid XML received from server. Forcing disconnect.', 'error') self._owner.Connection.pollend() return 0

1 0

[commit-gajim] r7722 - in trunk/src: . common common/xmpp
by junglecow＠gajim.org 27 Dec '06

27 Dec '06

Author: junglecow Date: 2006-12-27 19:38:50 +0100 (Wed, 27 Dec 2006) New Revision: 7722 Modified: trunk/src/common/connection.py trunk/src/common/xmpp/transports_nb.py trunk/src/gajim.py Log: - Started new way of logging, with configurable level for each subsystem - Added -q, --quiet (speaks for itself) - Added -l, --loglevel subsystem=LEVEL,subsystem2=LEVEL2,... - Quell winsock 10035 error. (Equivalent of EINPROGRESS, but winsock likes to have its own error numbers.) - Hide SSL certificate debug stuff unless gajim.c.x.transports loglevel is DEBUG or lower - Avoid unicode problems if we set a profile - Move fingerprint checks from _register_handlers to _connect_success - Some enhancements to fpr checking code Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-12-27 11:32:01 UTC (rev 7721) +++ trunk/src/common/connection.py 2006-12-27 18:38:50 UTC (rev 7722) @@ -470,8 +470,8 @@ self.disconnect(on_purpose = True) self.dispatch('STATUS', 'offline') self.dispatch('CONNECTION_LOST', - (_('Bad fingerprint for "%s"') % self._hostname, - _("Server's key changed, or spy attack."))) + (_('Security error connecting to "%s"') % self._hostname, + _("The server's key has changed, or someone is trying to hack your connection."))) if self.on_connect_auth: self.on_connect_auth(None) self.on_connect_auth = None Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2006-12-27 11:32:01 UTC (rev 7721) +++ trunk/src/common/xmpp/transports_nb.py 2006-12-27 18:38:50 UTC (rev 7722) @@ -423,7 +423,7 @@ # get as many bites, as possible, but not more than RECV_BUFSIZE received = self._recv(RECV_BUFSIZE) except (socket.error, socket.herror, socket.gaierror), e: - log.error("_do_receive: got %s:", e.__class__, exc_info=True) + log.debug("_do_receive: got %s:", e.__class__, exc_info=True) #traceback.print_exc() #print "Current Stack:" #traceback.print_stack() Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-12-27 11:32:01 UTC (rev 7721) +++ trunk/src/gajim.py 2006-12-27 18:38:50 UTC (rev 7722) @@ -23,11 +23,11 @@ import logging consoleloghandler = logging.StreamHandler() -consoleloghandler.setLevel(logging.WARNING) +consoleloghandler.setLevel(1) consoleloghandler.setFormatter( logging.Formatter('%(asctime)s %(name)s: %(levelname)s: %(message)s')) log = logging.getLogger('gajim') -log.setLevel(logging.INFO) +log.setLevel(logging.WARNING) log.addHandler(consoleloghandler) log.propagate = False log = logging.getLogger('gajim.gajim') @@ -53,21 +53,20 @@ return 'gajim.' + arg def parseAndSetLogLevels(arg): - directives = arg.split(',') - for directive in directives: + for directive in arg.split(','): directive = directive.strip() - target, level = directive.split('=') - target = parseLogTarget(target.strip()) + targets, level = directive.rsplit('=', 1) level = parseLogLevel(level.strip()) + for target in targets.split('='): + target = parseLogTarget(target.strip()) + if target == '': + consoleloghandler.setLevel(level) + print "consoleloghandler level set to %s" % level + else: + logger = logging.getLogger(target) + logger.setLevel(level) + print "Logger %s level set to %d" % (target, level) - if target == '': - consoleloghandler.setLevel(level) - print "consoleloghandler level set to %s" % level - else: - logger = logging.getLogger(target) - logger.setLevel(level) - print "Logger %s level set to %d" % (target, level) - def parseOpts(): profile = '' verbose = False @@ -97,6 +96,7 @@ return profile, verbose profile, verbose = parseOpts() +del parseOpts, parseAndSetLogLevels, parseLogTarget, parseLogLevel import message_control

1 0

[commit-gajim] r7721 - trunk/src
by asterix＠gajim.org 27 Dec '06

27 Dec '06

Author: asterix Date: 2006-12-27 12:32:01 +0100 (Wed, 27 Dec 2006) New Revision: 7721 Modified: trunk/src/gajim.py Log: don't show empty () when a pm contact changes his status. fixes #2832 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-12-27 10:39:03 UTC (rev 7720) +++ trunk/src/gajim.py 2006-12-27 11:32:01 UTC (rev 7721) @@ -1054,8 +1054,12 @@ contact.status = status ctrl.update_ui() uf_show = helpers.get_uf_show(show) - ctrl.print_conversation(_('%s is now %s (%s)') % (nick, uf_show, status), - 'status') + if status: + ctrl.print_conversation(_('%s is now %s (%s)') % (nick, uf_show, + status), 'status') + else: + ctrl.print_conversation(_('%s is now %s') % (nick, uf_show), + 'status') ctrl.parent_win.redraw_tab(ctrl) if self.remote_ctrl: self.remote_ctrl.raise_signal('GCPresence', (account, array))

1 0

[commit-gajim] r7720 - trunk/src
by asterix＠gajim.org 27 Dec '06

27 Dec '06

Author: asterix Date: 2006-12-27 11:39:03 +0100 (Wed, 27 Dec 2006) New Revision: 7720 Modified: trunk/src/dialogs.py Log: don't add empty group when we add a contact. fixes #2833 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-12-27 06:09:15 UTC (rev 7719) +++ trunk/src/dialogs.py 2006-12-27 10:39:03 UTC (rev 7720) @@ -639,9 +639,12 @@ else: message= '' group = self.group_comboboxentry.child.get_text().decode('utf-8') + groups = [] + if group: + groups = [group] auto_auth = self.auto_authorize_checkbutton.get_active() gajim.interface.roster.req_sub(self, jid, message, self.account, - groups = [group], nickname = nickname, auto_auth = auto_auth) + groups = groups, nickname = nickname, auto_auth = auto_auth) self.window.destroy() def on_protocol_combobox_changed(self, widget):

1 0

[commit-gajim] r7719 - trunk/src/common/xmpp
by nk＠gajim.org 27 Dec '06

27 Dec '06

Author: nk Date: 2006-12-27 07:09:15 +0100 (Wed, 27 Dec 2006) New Revision: 7719 Modified: trunk/src/common/xmpp/dispatcher_nb.py Log: readd something, unless there is a reason it got removed in [7706] Modified: trunk/src/common/xmpp/dispatcher_nb.py =================================================================== --- trunk/src/common/xmpp/dispatcher_nb.py 2006-12-26 14:56:28 UTC (rev 7718) +++ trunk/src/common/xmpp/dispatcher_nb.py 2006-12-27 06:09:15 UTC (rev 7719) @@ -135,6 +135,7 @@ self._owner.Connection.disconnect() return 0 except ExpatError: + sys.exc_clear() self.DEBUG('Invalid XML received from server. Forcing disconnect.', 'error') self._owner.Connection.pollend() return 0

1 0

[commit-gajim] r7718 - trunk/src
by asterix＠gajim.org 26 Dec '06

26 Dec '06

Author: asterix Date: 2006-12-26 15:56:28 +0100 (Tue, 26 Dec 2006) New Revision: 7718 Modified: trunk/src/network_manager_listener.py Log: reconnect only previously connected account when connection manager detect the reconnection, and with correct status message. fixes #2813 Modified: trunk/src/network_manager_listener.py =================================================================== --- trunk/src/network_manager_listener.py 2006-12-26 13:40:01 UTC (rev 7717) +++ trunk/src/network_manager_listener.py 2006-12-26 14:56:28 UTC (rev 7718) @@ -17,13 +17,15 @@ def device_now_active(self, *args): for connection in gajim.connections.itervalues(): - if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): - connection.change_status('online', '') + if gajim.config.get_per('accounts', connection.name, + 'listen_to_network_manager') and connection.time_to_reconnect: + connection._reconnect() def device_no_longer_active(self, *args): for connection in gajim.connections.itervalues(): - if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): - connection.change_status('offline', '') + if gajim.config.get_per('accounts', connection.name, + 'listen_to_network_manager') and connection.connected > 1: + connection._disconnectedReconnCB() from common.dbus_support import system_bus

1 0

[commit-gajim] r7717 - trunk/src/common
by asterix＠gajim.org 26 Dec '06

26 Dec '06

Author: asterix Date: 2006-12-26 14:40:01 +0100 (Tue, 26 Dec 2006) New Revision: 7717 Modified: trunk/src/common/contacts.py Log: do not count transport in global online / total users. fixes #2801 Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2006-12-26 13:33:09 UTC (rev 7716) +++ trunk/src/common/contacts.py 2006-12-26 13:40:01 UTC (rev 7717) @@ -264,7 +264,7 @@ if jid == our_jid: continue if common.gajim.jid_is_transport(jid) and not \ - common.gajim.config.get('show_transports_group'): + _('Transports') in groups: # do not count transports continue contact = self.get_contact_with_highest_priority(account, jid)

1 0

[commit-gajim] r7716 - trunk/src/common
by asterix＠gajim.org 26 Dec '06

26 Dec '06

Author: asterix Date: 2006-12-26 14:33:09 +0100 (Tue, 26 Dec 2006) New Revision: 7716 Modified: trunk/src/common/contacts.py Log: do not count not in roster contacts in online / total users. see #2801 Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2006-12-26 13:30:35 UTC (rev 7715) +++ trunk/src/common/contacts.py 2006-12-26 13:33:09 UTC (rev 7716) @@ -268,6 +268,8 @@ # do not count transports continue contact = self.get_contact_with_highest_priority(account, jid) + if _('Not in roster') in contact.groups: + continue in_groups = False if groups == []: in_groups = True

1 0

[commit-gajim] r7715 - trunk/src
by asterix＠gajim.org 26 Dec '06

26 Dec '06

Author: asterix Date: 2006-12-26 14:30:35 +0100 (Tue, 26 Dec 2006) New Revision: 7715 Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: redraw account row when we remove a group and when an observer removes us. see #2801 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-12-26 12:04:22 UTC (rev 7714) +++ trunk/src/gajim.py 2006-12-26 13:30:35 UTC (rev 7715) @@ -1169,6 +1169,7 @@ c = contacts[0] self.roster.remove_contact(c, account) gajim.contacts.remove_jid(account, jid) + self.roster.draw_account(account) if gajim.events.get_events(account, c.jid): keyID = '' attached_keys = gajim.config.get_per('accounts', account, Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-12-26 12:04:22 UTC (rev 7714) +++ trunk/src/roster_window.py 2006-12-26 13:30:35 UTC (rev 7715) @@ -1472,6 +1472,27 @@ old_text, False, (on_renamed, account, row_type, jid, old_text), on_canceled) + def readd_if_needed(self, contact, account): + need_readd = False + if len(gajim.events.get_events(account, contact.jid)): + need_readd = True + elif gajim.interface.msg_win_mgr.has_window(contact.jid, account): + if _('Not in Roster') in contact.groups: + # Close chat window + msg_win = gajim.interface.msg_win_mgr.get_window(contact.jid, + account) + ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, account) + msg_win.remove_tab(ctrl, msg_win.CLOSE_CLOSE_BUTTON) + else: + need_readd = True + if need_readd: + c = gajim.contacts.create_contact(jid = contact.jid, + name = '', groups = [_('Not in Roster')], + show = 'not in roster', status = '', ask = 'none', + keyID = contact.keyID) + gajim.contacts.add_contact(account, c) + self.add_contact_to_roster(contact.jid, account) + def on_remove_group_item_activated(self, widget, group, account): dlg = dialogs.ConfirmationDialogCheck(_('Remove Group'), _('Do you want to remove group %s from the roster?' % group), @@ -1487,7 +1508,12 @@ self.add_contact_to_roster(contact.jid, account) else: gajim.connections[account].unsubscribe(contact.jid) - + for c in gajim.contacts.get_contact(account, contact.jid): + self.remove_contact(c, account) + gajim.contacts.remove_jid(account, c.jid) + self.readd_if_needed(contact, account) + self.draw_account(account) + def on_assign_pgp_key(self, widget, contact, account): attached_keys = gajim.config.get_per('accounts', account, 'attached_gpg_keys').split() @@ -2583,32 +2609,14 @@ self.draw_group(group, account) # redraw account rows for contact numbers self.draw_account(account) - need_readd = False if not remove_auth and contact.sub == 'both': contact.name = '' contact.groups = [] contact.sub = 'from' gajim.contacts.add_contact(account, contact) self.add_contact_to_roster(contact.jid, account) - elif len(gajim.events.get_events(account, contact.jid)): - need_readd = True - elif gajim.interface.msg_win_mgr.has_window(contact.jid, account): - if _('Not in Roster') in contact.groups: - # Close chat window - msg_win = gajim.interface.msg_win_mgr.get_window(contact.jid, - account) - ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, - account) - msg_win.remove_tab(ctrl, msg_win.CLOSE_CLOSE_BUTTON) - else: - need_readd = True - if need_readd: - c = gajim.contacts.create_contact(jid = contact.jid, - name = '', groups = [_('Not in Roster')], - show = 'not in roster', status = '', ask = 'none', - keyID = contact.keyID) - gajim.contacts.add_contact(account, c) - self.add_contact_to_roster(contact.jid, account) + else: + self.readd_if_needed(contact, account) if len(list_) == 1: contact = list_[0][0] account = list_[0][1]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2006