Commits December 2010

commits@gajim.org

2 participants
81 discussions

gajim: fix for demandimport
by Denis Fomin 21 Dec '10

21 Dec '10

changeset 25d17db44ab3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=25d17db44ab3 description: fix for demandimport diffstat: src/common/configpaths.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e97e7d6a4fdc -r 25d17db44ab3 src/common/configpaths.py --- a/src/common/configpaths.py Mon Dec 20 15:29:03 2010 +0300 +++ b/src/common/configpaths.py Tue Dec 21 22:28:03 2010 +0300 @@ -28,7 +28,7 @@ import defs HAVE_XDG = True try: - import xdg.BaseDirectory + __import__(xdg) except: HAVE_XDG = False

1 0

gajim: Fix typo
by Denis Fomin 20 Dec '10

20 Dec '10

changeset e97e7d6a4fdc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e97e7d6a4fdc description: Fix typo diffstat: src/gajim-remote.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8bb9055c07aa -r e97e7d6a4fdc src/gajim-remote.py --- a/src/gajim-remote.py Mon Dec 20 13:26:27 2010 +0300 +++ b/src/gajim-remote.py Mon Dec 20 15:29:03 2010 +0300 @@ -58,7 +58,7 @@ OBJ_PATH = '/org/gajim/dbus/RemoteObject' INTERFACE = 'org.gajim.dbus.RemoteInterface' SERVICE = 'org.gajim.dbus' -BASENAME = 'gajim-remote-plugin' +BASENAME = 'gajim-remote' class GajimRemote:

1 0

gajim: prevent traceback
by Denis Fomin 20 Dec '10

20 Dec '10

changeset 8bb9055c07aa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8bb9055c07aa description: prevent traceback diffstat: src/remote_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r e6f9144b28eb -r 8bb9055c07aa src/remote_control.py --- a/src/remote_control.py Mon Dec 20 12:54:58 2010 +0300 +++ b/src/remote_control.py Mon Dec 20 13:26:27 2010 +0300 @@ -459,6 +459,7 @@ # Jid is not conform, ignore it return DBUS_BOOLEAN(False) + minimized_control = None if account: accounts = [account] else:

1 0

gajim: preparation for the removal of gajim-remote-plugin.py (fi...
by Denis Fomin 20 Dec '10

20 Dec '10

changeset e6f9144b28eb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e6f9144b28eb description: preparation for the removal of gajim-remote-plugin.py (fix lost command and arguments to commands) diffstat: src/gajim-remote-plugin.py | 160 ++++++++++++++++++++++++++++++++------------ 1 files changed, 116 insertions(+), 44 deletions(-) diffs (truncated from 336 to 300 lines): diff -r ba577905cf65 -r e6f9144b28eb src/gajim-remote-plugin.py --- a/src/gajim-remote-plugin.py Sun Dec 19 21:22:29 2010 +0100 +++ b/src/gajim-remote-plugin.py Mon Dec 20 12:54:58 2010 +0300 @@ -1,8 +1,12 @@ #!/usr/bin/env python ## -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> +## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2010 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006 Junglecow <junglecow AT gmail.com> +## Travis Shirk <travis AT pobox.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> ## ## This file is part of Gajim. ## @@ -12,11 +16,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## # gajim-remote help will show you the D-BUS API of Gajim @@ -24,15 +28,16 @@ import sys import os import locale +import urllib import signal signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application from common import exceptions -from common import i18n +from common import i18n # This installs _() function try: PREFERRED_ENCODING = locale.getpreferredencoding() -except: +except Exception: PREFERRED_ENCODING = 'UTF-8' def send_error(error_message): @@ -103,20 +108,33 @@ _('Changes the status of account or accounts'), [ #offline, online, chat, away, xa, dnd, invisible should not be translated - (_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible '), True), + (_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account\'s previous status'), False), (_('message'), _('status message'), False), (_('account'), _('change status of account "account". ' 'If not specified, try to change status of all accounts that have ' '"sync with global status" option set'), False) ] ], + 'set_priority': [ + _('Changes the priority of account or accounts'), + [ + (_('priority'), _('priority you want to give to the account'), + True), + (_('account'), _('change the priority of the given account. ' + 'If not specified, change status of all accounts that have' + ' "sync with global status" option set'), False) + ] + ], 'open_chat': [ _('Shows the chat dialog so that you can send messages to a contact'), [ ('jid', _('JID of the contact that you want to chat with'), True), (_('account'), _('if specified, contact is taken from the ' - 'contact list of this account'), False) + 'contact list of this account'), False), + (_('message'), + _('message content. The account must be specified or ""'), + False) ] ], 'send_chat_message': [ @@ -218,14 +236,14 @@ 'get_status': [ _('Returns current status (the global one unless account is specified)'), [ - (_('account'), _(''), False) + (_('account'), '', False) ] ], 'get_status_message': [ - _('Returns current status message(the global one unless account is specified)'), + _('Returns current status message (the global one unless account is specified)'), [ - (_('account'), _(''), False) + (_('account'), '', False) ] ], @@ -248,20 +266,32 @@ False) ] ], + 'change_avatar': [ + _('Change the avatar'), + [ + ('picture', _('Picture to use'), True), + ('account', _('Account in which the avatar will be set; ' + 'if not specified, the avatar will be set for all accounts'), + False) + ] + ], 'handle_uri': [ _('Handle a xmpp:/ uri'), [ - (_('uri'), _(''), True), - (_('account'), _(''), False) + (_('uri'), _('URI to handle'), True), + (_('account'), _('Account in which you want to handle it'), + False), + (_('message'), _('Message content'), False) ] ], 'join_room': [ _('Join a MUC room'), [ - (_('room'), _(''), True), - (_('nick'), _(''), False), - (_('password'), _(''), False), - (_('account'), _(''), False) + (_('room'), _('Room JID'), True), + (_('nick'), _('Nickname to use'), False), + (_('password'), _('Password to enter the room'), False), + (_('account'), _('Account from which you want to enter the ' + 'room'), False) ] ], 'check_gajim_running': [ @@ -283,7 +313,7 @@ [] ] self.sbus = None - if self.argv_len < 2 or sys.argv[1] not in self.commands.keys(): + if self.argv_len < 2 or sys.argv[1] not in self.commands.keys(): # no args or bad args send_error(self.compose_help()) self.command = sys.argv[1] @@ -314,9 +344,12 @@ self.print_result(res) def print_result(self, res): - ''' Print retrieved result to the output ''' + """ + Print retrieved result to the output + """ if res is not None: - if self.command in ('open_chat', 'send_chat_message', 'send_single_message', 'start_chat'): + if self.command in ('open_chat', 'send_chat_message', + 'send_single_message', 'start_chat'): if self.command in ('send_message', 'send_single_message'): self.argv_len -= 2 @@ -340,8 +373,7 @@ for account_dict in res: print self.print_info(0, account_dict, True) elif self.command == 'prefs_list': - pref_keys = res.keys() - pref_keys.sort() + pref_keys = sorted(res.keys()) for pref_key in pref_keys: result = '%s = %s' % (pref_key, res[pref_key]) if isinstance(result, unicode): @@ -357,7 +389,7 @@ if not self.sbus: try: self.sbus = dbus.SessionBus() - except: + except Exception: raise exceptions.SessionBusNotPresent test = False @@ -370,11 +402,12 @@ return test def init_connection(self): - ''' create the onnection to the session dbus, - or exit if it is not possible ''' + """ + Create the onnection to the session dbus, or exit if it is not possible + """ try: self.sbus = dbus.SessionBus() - except: + except Exception: raise exceptions.SessionBusNotPresent from pprint import pprint @@ -405,17 +438,20 @@ return str def help_on_command(self, command): - ''' return help message for a given command ''' + """ + Return help message for a given command + """ if command in self.commands: command_props = self.commands[command] arguments_str = self.make_arguments_row(command_props[1]) - str = _('Usage: %s %s %s \n\t %s') % (BASENAME, command, - arguments_str, command_props[0]) + str_ = _('Usage: %(basename)s %(command)s %(arguments)s \n\t %(help)s')\ + % {'basename': BASENAME, 'command': command, + 'arguments': arguments_str, 'help': command_props[0]} if len(command_props[1]) > 0: - str += '\n\n' + _('Arguments:') + '\n' + str_ += '\n\n' + _('Arguments:') + '\n' for argument in command_props[1]: - str += ' ' + argument[0] + ' - ' + argument[1] + '\n' - return str + str_ += ' ' + argument[0] + ' - ' + argument[1] + '\n' + return str_ send_error(_('%s not found') % command) def compose_help(self): @@ -440,7 +476,9 @@ return str def print_info(self, level, prop_dict, encode_return = False): - ''' return formated string from data structure ''' + """ + Return formated string from data structure + """ if prop_dict is None or not isinstance(prop_dict, (dict, list, tuple)): return '' ret_str = '' @@ -484,22 +522,26 @@ if (encode_return): try: ret_str = ret_str.encode(PREFERRED_ENCODING) - except: + except Exception: pass return ret_str def check_arguments(self): - ''' Make check if all necessary arguments are given ''' + """ + Make check if all necessary arguments are given + """ argv_len = self.argv_len - 2 args = self.commands[self.command][1] if len(args) < argv_len: send_error(_('Too many arguments. \n' - 'Type "%s help %s" for more info') % (BASENAME, self.command)) + 'Type "%(basename)s help %(command)s" for more info') % { + 'basename': BASENAME, 'command': self.command}) if len(args) > argv_len: if args[argv_len][2]: - send_error(_('Argument "%s" is not specified. \n' - 'Type "%s help %s" for more info') % - (args[argv_len][0], BASENAME, self.command)) + send_error(_('Argument "%(arg)s" is not specified. \n' + 'Type "%(basename)s help %(command)s" for more info') % + {'arg': args[argv_len][0], 'basename': BASENAME, + 'command': self.command}) self.arguments = [] i = 0 for arg in sys.argv[2:]: @@ -514,14 +556,39 @@ self.arguments += ['']*(len(args)-i) def handle_uri(self): - if not sys.argv[2:][0].startswith('xmpp:'): + if len(sys.argv) < 3: + send_error(_('No uri given')) + if not sys.argv[2].startswith('xmpp:'): send_error(_('Wrong uri')) sys.argv[2] = sys.argv[2][5:] - uri = sys.argv[2:][0] + uri = sys.argv[2] if not '?' in uri: self.command = sys.argv[1] = 'open_chat' return + if 'body=' in uri: + # Open chat window and paste the text in the input message dialog + self.command = sys.argv[1] = 'open_chat' + message = uri.split('body=') + message = message[1].split(';')[0] + try: + message = urllib.unquote(message) + except UnicodeDecodeError: + pass + sys.argv[2] = uri.split('?')[0]

1 0

gajim: restore messages with Zeroconf
by Yann Leboulanger 19 Dec '10

19 Dec '10

changeset ba577905cf65 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ba577905cf65 description: restore messages with Zeroconf diffstat: src/common/connection_handlers.py | 204 ++++++++++---------- src/common/connection_handlers_events.py | 6 + src/common/zeroconf/connection_handlers_zeroconf.py | 80 +------- src/common/zeroconf/connection_zeroconf.py | 8 +- 4 files changed, 116 insertions(+), 182 deletions(-) diffs (truncated from 394 to 300 lines): diff -r 714e6a08b109 -r ba577905cf65 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Dec 19 10:59:00 2010 +0100 +++ b/src/common/connection_handlers.py Sun Dec 19 21:22:29 2010 +0100 @@ -761,6 +761,10 @@ self._nec_iq_error_received) gajim.ged.register_event_handler('presence-received', ged.CORE, self._nec_presence_received) + gajim.ged.register_event_handler('message-received', ged.CORE, + self._nec_message_received) + gajim.ged.register_event_handler('decrypted-message-received', ged.CORE, + self._nec_decrypted_message_received) def _nec_iq_error_received(self, obj): if obj.conn.name != self.name: @@ -935,6 +939,104 @@ self.dispatch('DB_ERROR', (pritext, sectext)) our_jid = gajim.get_jid_from_account(self.name) + def _nec_message_received(self, obj): + if obj.conn.name != self.name: + return + if obj.encrypted == 'xep200': + try: + obj.stanza = obj.session.decrypt_stanza(obj.stanza) + obj.msgtxt = obj.stanza.getBody() + except Exception: + gajim.nec.push_incoming_event(FailedDecryptEvent(None, + conn=self, msg_obj=obj)) + return + + if obj.enc_tag and self.USE_GPG: + encmsg = obj.enc_tag.getData() + + keyID = gajim.config.get_per('accounts', self.name, 'keyid') + if keyID: + def decrypt_thread(encmsg, keyID, obj): + decmsg = self.gpg.decrypt(encmsg, keyID) + # \x00 chars are not allowed in C (so in GTK) + obj.msgtxt = helpers.decode_string(decmsg.replace('\x00', + '')) + obj.encrypted = 'xep27' + gajim.thread_interface(decrypt_thread, [encmsg, keyID, obj], + self._on_message_decrypted, [obj]) + return + self._on_message_decrypted(None, obj) + + def _on_message_decrypted(self, output, obj): + gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, + conn=self, msg_obj=obj)) + + def _nec_decrypted_message_received(self, obj): + if obj.conn.name != self.name: + return + + # Receipt requested + # TODO: We shouldn't answer if we're invisible! + contact = gajim.contacts.get_contact(self.name, obj.jid) + nick = obj.resource + gc_contact = gajim.contacts.get_gc_contact(self.name, obj.jid, nick) + if obj.receipt_request_tag and gajim.config.get_per('accounts', + self.name, 'answer_receipts') and ((contact and contact.sub \ + not in (u'to', u'none')) or gc_contact) and obj.mtype != 'error': + receipt = common.xmpp.Message(to=obj.fjid, typ='chat') + receipt.setID(obj.id_) + receipt.setTag('received', namespace='urn:xmpp:receipts', + attrs={'id': obj.id_}) + + if obj.thread_id: + receipt.setThread(obj.thread_id) + self.connection.send(receipt) + + # We got our message's receipt + if obj.receipt_received_tag and obj.session.control and \ + gajim.config.get_per('accounts', self.name, 'request_receipt'): + obj.session.control.conv_textview.hide_xep0184_warning(obj.id_) + + if obj.mtype == 'error': + self.dispatch_error_message(obj.stanza, obj.msgtxt, + obj.session, obj.fjid, obj.timestamp) + return True + elif obj.mtype == 'groupchat': + gajim.nec.push_incoming_event(GcMessageReceivedEvent(None, + conn=self, msg_obj=obj)) + return True + elif obj.invite_tag is not None: + gajim.nec.push_incoming_event(GcInvitationReceivedEvent(None, + conn=self, msg_obj=obj)) + return True + + # process and dispatch an error message + def dispatch_error_message(self, msg, msgtxt, session, frm, tim): + error_msg = msg.getErrorMsg() + + if not error_msg: + error_msg = msgtxt + msgtxt = None + + subject = msg.getSubject() + + if session.is_loggable(): + try: + gajim.logger.write('error', frm, error_msg, tim=tim, + subject=subject) + except exceptions.PysqliteOperationalError, e: + self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) + except exceptions.DatabaseMalformed: + pritext = _('Database Error') + sectext = _('The database file (%s) cannot be read. Try to ' + 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup) ' + 'or remove it (all history will be lost).') % \ + common.logger.LOG_DB_PATH + self.dispatch('DB_ERROR', (pritext, sectext)) + gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, + fjid=frm, error_code=msg.getErrorCode(), error_msg=error_msg, + msg=msgtxt, time_=tim, session=session)) + def _LastResultCB(self, con, iq_obj): log.debug('LastResultCB') gajim.nec.push_incoming_event(LastResultReceivedEvent(None, conn=self, @@ -1160,10 +1262,6 @@ ged.CORE, self._nec_unsubscribed_presence_received) gajim.ged.register_event_handler('unsubscribed-presence-received', ged.POSTGUI, self._nec_unsubscribed_presence_received_end) - gajim.ged.register_event_handler('message-received', ged.CORE, - self._nec_message_received) - gajim.ged.register_event_handler('decrypted-message-received', ged.CORE, - self._nec_decrypted_message_received) gajim.ged.register_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) @@ -1435,104 +1533,6 @@ gajim.nec.push_incoming_event(NetworkEvent('raw-message-received', conn=self, stanza=msg, account=self.name)) - def _nec_message_received(self, obj): - if obj.conn.name != self.name: - return - if obj.encrypted == 'xep200': - try: - obj.stanza = obj.session.decrypt_stanza(obj.stanza) - obj.msgtxt = obj.stanza.getBody() - except Exception: - gajim.nec.push_incoming_event(FailedDecryptEvent(None, - conn=self, msg_obj=obj)) - return - - if obj.enc_tag and self.USE_GPG: - encmsg = obj.enc_tag.getData() - - keyID = gajim.config.get_per('accounts', self.name, 'keyid') - if keyID: - def decrypt_thread(encmsg, keyID, obj): - decmsg = self.gpg.decrypt(encmsg, keyID) - # \x00 chars are not allowed in C (so in GTK) - obj.msgtxt = helpers.decode_string(decmsg.replace('\x00', - '')) - obj.encrypted = 'xep27' - gajim.thread_interface(decrypt_thread, [encmsg, keyID, obj], - self._on_message_decrypted, [obj]) - return - self._on_message_decrypted(None, obj) - - def _on_message_decrypted(self, output, obj): - gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, - conn=self, msg_obj=obj)) - - def _nec_decrypted_message_received(self, obj): - if obj.conn.name != self.name: - return - - # Receipt requested - # TODO: We shouldn't answer if we're invisible! - contact = gajim.contacts.get_contact(self.name, obj.jid) - nick = obj.resource - gc_contact = gajim.contacts.get_gc_contact(self.name, obj.jid, nick) - if obj.receipt_request_tag and gajim.config.get_per('accounts', - self.name, 'answer_receipts') and ((contact and contact.sub \ - not in (u'to', u'none')) or gc_contact) and obj.mtype != 'error': - receipt = common.xmpp.Message(to=obj.fjid, typ='chat') - receipt.setID(obj.id_) - receipt.setTag('received', namespace='urn:xmpp:receipts', - attrs={'id': obj.id_}) - - if obj.thread_id: - receipt.setThread(obj.thread_id) - self.connection.send(receipt) - - # We got our message's receipt - if obj.receipt_received_tag and obj.session.control and \ - gajim.config.get_per('accounts', self.name, 'request_receipt'): - obj.session.control.conv_textview.hide_xep0184_warning(obj.id_) - - if obj.mtype == 'error': - self.dispatch_error_message(obj.stanza, obj.msgtxt, - obj.session, obj.fjid, obj.timestamp) - return True - elif obj.mtype == 'groupchat': - gajim.nec.push_incoming_event(GcMessageReceivedEvent(None, - conn=self, msg_obj=obj)) - return True - elif obj.invite_tag is not None: - gajim.nec.push_incoming_event(GcInvitationReceivedEvent(None, - conn=self, msg_obj=obj)) - return True - - # process and dispatch an error message - def dispatch_error_message(self, msg, msgtxt, session, frm, tim): - error_msg = msg.getErrorMsg() - - if not error_msg: - error_msg = msgtxt - msgtxt = None - - subject = msg.getSubject() - - if session.is_loggable(): - try: - gajim.logger.write('error', frm, error_msg, tim=tim, - subject=subject) - except exceptions.PysqliteOperationalError, e: - self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) - except exceptions.DatabaseMalformed: - pritext = _('Database Error') - sectext = _('The database file (%s) cannot be read. Try to ' - 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup) ' - 'or remove it (all history will be lost).') % \ - common.logger.LOG_DB_PATH - self.dispatch('DB_ERROR', (pritext, sectext)) - gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, - fjid=frm, error_code=msg.getErrorCode(), error_msg=error_msg, - msg=msgtxt, time_=tim, session=session)) - def _dispatch_gc_msg_with_captcha(self, stanza, msg_obj): msg_obj.stanza = stanza gajim.nec.push_incoming_event(GcMessageReceivedEvent(None, diff -r 714e6a08b109 -r ba577905cf65 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Dec 19 10:59:00 2010 +0100 +++ b/src/common/connection_handlers_events.py Sun Dec 19 21:22:29 2010 +0100 @@ -799,6 +799,7 @@ base_network_events = [] def generate(self): + self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) self.resource = 'local' self.prio = 0 self.keyID = None @@ -1064,6 +1065,11 @@ self.fjid = unicode(self.fjid) self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) + def generate(self): + self.base_event = nec.NetworkIncomingEvent(None, conn=self.conn, + stanza=self.stanza) + return super(ZeroconfMessageReceivedEvent, self).generate() + class GcInvitationReceivedEvent(nec.NetworkIncomingEvent): name = 'gc-invitation-received' base_network_events = [] diff -r 714e6a08b109 -r ba577905cf65 src/common/zeroconf/connection_handlers_zeroconf.py --- a/src/common/zeroconf/connection_handlers_zeroconf.py Sun Dec 19 10:59:00 2010 +0100 +++ b/src/common/zeroconf/connection_handlers_zeroconf.py Sun Dec 19 21:22:29 2010 +0100 @@ -36,6 +36,7 @@ from common.commands import ConnectionCommands from common.pep import ConnectionPEP from common.protocol.bytestream import ConnectionSocks5BytestreamZeroconf +from common.connection_handlers_events import ZeroconfMessageReceivedEvent import logging log = logging.getLogger('gajim.c.z.connection_handlers_zeroconf') @@ -91,82 +92,9 @@ Called when we receive a message """ log.debug('Zeroconf MessageCB') - - frm = msg.getFrom() - mtype = msg.getType() - thread_id = msg.getThread() - - if not mtype: - mtype = 'normal' - - if frm is None: - for key in self.connection.zeroconf.contacts: - if ip == self.connection.zeroconf.contacts[key][zeroconf.C_ADDRESS]: - frm = key - - frm = unicode(frm) - - session = self.get_or_create_session(frm, thread_id) - - if thread_id and not session.received_thread_id: - session.received_thread_id = True - - if msg.getTag('feature') and msg.getTag('feature').namespace == \ - common.xmpp.NS_FEATURE: - if gajim.HAVE_PYCRYPTO: - self._FeatureNegCB(con, msg, session) - return - - if msg.getTag('init') and msg.getTag('init').namespace == \

1 0

gajim: don't try to reconnect in a MUC when we get an error. Fix...
by Yann Leboulanger 19 Dec '10

19 Dec '10

changeset 714e6a08b109 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=714e6a08b109 description: don't try to reconnect in a MUC when we get an error. Fixes #6097 diffstat: src/gui_interface.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r a2c2835ace4a -r 714e6a08b109 src/gui_interface.py --- a/src/gui_interface.py Sun Dec 19 10:52:56 2010 +0100 +++ b/src/gui_interface.py Sun Dec 19 10:59:00 2010 +0100 @@ -306,6 +306,8 @@ elif gc_control: gc_control.print_conversation('Error %s: %s' % (obj.errcode, obj.errmsg)) + if gc_control and gc_control.autorejoin: + gc_control.autorejoin = False def handle_event_presence(self, obj): # 'NOTIFY' (account, (jid, status, status message, resource,

1 0

gajim: revert unwanted commits from in 63c35c953516
by Yann Leboulanger 19 Dec '10

19 Dec '10

changeset a2c2835ace4a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a2c2835ace4a description: revert unwanted commits from in 63c35c953516 diffstat: src/common/connection_handlers_events.py | 115 +++---------------- src/common/zeroconf/connection_handlers_zeroconf.py | 2 - src/gui_interface.py | 2 - src/session.py | 25 +-- 4 files changed, 29 insertions(+), 115 deletions(-) diffs (229 lines): diff -r a6e5b6f1fd00 -r a2c2835ace4a src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Dec 19 10:39:15 2010 +0100 +++ b/src/common/connection_handlers_events.py Sun Dec 19 10:52:56 2010 +0100 @@ -31,6 +31,7 @@ from common import xmpp from common import dataforms from common import exceptions +from common.zeroconf import zeroconf from common.logger import LOG_DB_PATH from common.pep import SUPPORTED_PERSONAL_USER_EVENTS @@ -1046,6 +1047,23 @@ return True +class ZeroconfMessageReceivedEvent(MessageReceivedEvent): + name = 'message-received' + base_network_events = [] + + def get_jid_resource(self): + self.fjid =self.stanza.getFrom() + + if self.fjid is None: + for key in self.conn.connection.zeroconf.contacts: + if self.ip == self.conn.connection.zeroconf.contacts[key][ + zeroconf.C_ADDRESS]: + self.fjid = key + break + + self.fjid = unicode(self.fjid) + self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) + class GcInvitationReceivedEvent(nec.NetworkIncomingEvent): name = 'gc-invitation-received' base_network_events = [] @@ -1853,100 +1871,3 @@ self.prompt = None self.prompt_jid = None return True - -class NotificationEvent(nec.NetworkIncomingEvent): - name = 'notification' - base_network_events = ['decrypted-message-received'] - - def detect_type(self): - if self.base_event.name == 'decrypted-message-received': - self.notif_type='msg' - - def get_focused(self): - self.control_focused = False - if self.control: - parent_win = self.control.parent_win - if parent_win and self.control == parent_win.get_active_control() \ - and parent_win.window.has_focus: - self.control_focused = True - - def handle_incoming_msg_event(self, msg_obj): - self.control = msg_obj.session.control - self.get_focused() - if not self.control and not gajim.events.get_events(self.conn.name, \ - self.control.jid, [msg_obj.mtype]): - self.first_unread = True - - if msg_obj.mtype == 'pm': - nick = msg_obj.resource - else: - nick = gajim.get_name_from_jid(self.conn.name, msg_obj.jid) - - if self.first_unread: - self.sound_event = 'first_message_received' - elif self.control_focused: - self.sound_event = 'next_message_received_focused' - else: - self.sound_event = 'next_message_received_unfocused' - - if gajim.config.get('notification_preview_message'): - self.popup_text = msg_obj.msgtxt - if self.popup_text.startswith('/me ') or self.popup_text.startswith( - '/me\n'): - self.popup_text = '* ' + nick + self.popup_text[3:] - else: - # We don't want message preview, do_preview = False - self.popup_text = '' - if msg_obj.mtype == 'normal': # single message - self.popup_event_type = _('New Single Message') - self.popup_image = 'gajim-single_msg_recv' - self.popup_title = _('New Single Message from %(nickname)s') % \ - {'nickname': nick} - elif msg_obj.mtype == 'pm': - self.popup_event_type = _('New Private Message') - self.popup_image = 'gajim-priv_msg_recv' - self.popup_title = _('New Private Message from group chat %s') % \ - msg_obj.jid - if self.popup_text: - self.popup_text = _('%(nickname)s: %(message)s') % \ - {'nickname': nick, 'message': self.popup_text} - else: - self.popup_text = _('Messaged by %(nickname)s') % \ - {'nickname': nick} - else: # chat message - self.popup_event_type = _('New Message') - self.popup_image = 'gajim-chat_msg_recv' - self.popup_title = _('New Message from %(nickname)s') % \ - {'nickname': nick} - - self.popup_image = gtkgui_helpers.get_icon_path(self.popup_image, 48) - - def handle_incoming_msg_event(self, msg_obj): - pass - - def generate(self): - # what's needed to compute output - self.control = None - self.control_focused = False - self.first_unread = False - - # For output - self.sound_event = '' - self.show_popup = False - self.popup_title = '' - self.popup_text = '' - self.popup_event_type = '' - self.popup_image = '' - self.open_chat = False - self.activate_urgency_hint = False - self.command_to_run = '' - self.show_in_notification_area = False - self.show_in_roster = False - - self.detect_type() - - if self.notif_type == 'msg': - self.handle_incoming_msg_event(self.base_event) - elif self.notif_type == 'pres': - self.handle_incoming_pres_event(self.base_event) - return True diff -r a6e5b6f1fd00 -r a2c2835ace4a src/common/zeroconf/connection_handlers_zeroconf.py --- a/src/common/zeroconf/connection_handlers_zeroconf.py Sun Dec 19 10:39:15 2010 +0100 +++ b/src/common/zeroconf/connection_handlers_zeroconf.py Sun Dec 19 10:52:56 2010 +0100 @@ -133,8 +133,6 @@ msg = session.decrypt_stanza(msg) except Exception: self.dispatch('FAILED_DECRYPT', (frm, tim, session)) - gajim.nec.push_incoming_event(FailedDecryptEvent(None, - conn=self, msg_obj=obj)) msgtxt = msg.getBody() diff -r a6e5b6f1fd00 -r a2c2835ace4a src/gui_interface.py --- a/src/gui_interface.py Sun Dec 19 10:39:15 2010 +0100 +++ b/src/gui_interface.py Sun Dec 19 10:52:56 2010 +0100 @@ -306,8 +306,6 @@ elif gc_control: gc_control.print_conversation('Error %s: %s' % (obj.errcode, obj.errmsg)) - if gc_control and gc_control.autorejoin: - gc_control.autorejoin = False def handle_event_presence(self, obj): # 'NOTIFY' (account, (jid, status, status message, resource, diff -r a6e5b6f1fd00 -r a2c2835ace4a src/session.py --- a/src/session.py Sun Dec 19 10:39:15 2010 +0100 +++ b/src/session.py Sun Dec 19 10:52:56 2010 +0100 @@ -106,6 +106,14 @@ pm = True obj.mtype = 'pm' + highest_contact = gajim.contacts.get_contact_with_highest_priority( + self.conn.name, obj.jid) + + # does this resource have the highest priority of any available? + is_highest = not highest_contact or not highest_contact.resource or \ + obj.resource == highest_contact.resource or highest_contact.show ==\ + 'offline' + # Handle chat states contact = gajim.contacts.get_contact(self.conn.name, obj.jid, obj.resource) @@ -134,14 +142,13 @@ # THIS MUST BE AFTER chatstates handling # AND BEFORE playsound (else we ear sounding on chatstates!) if not obj.msgtxt: # empty message text - return True + return if gajim.config.get_per('accounts', self.conn.name, 'ignore_unknown_contacts') and not gajim.contacts.get_contacts( self.conn.name, obj.jid) and not pm: - return True + return - #FIXME Remove after advanced_notif will be removed if not contact: # contact is not in the roster, create a fake one to display # notification @@ -151,14 +158,6 @@ advanced_notif_num = notify.get_advanced_notification( 'message_received', self.conn.name, contact) - highest_contact = gajim.contacts.get_contact_with_highest_priority( - self.conn.name, obj.jid) - - # does this resource have the highest priority of any available? - is_highest = not highest_contact or not highest_contact.resource or \ - obj.resource == highest_contact.resource or highest_contact.show ==\ - 'offline' - if not pm and is_highest: jid_of_control = obj.jid else: @@ -171,7 +170,6 @@ self.control = ctrl self.control.set_session(self) - #TODO handled # Is it a first or next message received ? first = False if not self.control and not gajim.events.get_events(self.conn.name, \ @@ -203,9 +201,8 @@ msg = obj.msgtxt if obj.subject: msg = _('Subject: %s') % obj.subject + '\n' + msg + focused = False - #TODO handled - focused = False if self.control: parent_win = self.control.parent_win if parent_win and self.control == parent_win.get_active_control() \

1 0

gajim: restore Zeroconf presence notifications by using NEC
by Yann Leboulanger 19 Dec '10

19 Dec '10

changeset a6e5b6f1fd00 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a6e5b6f1fd00 description: restore Zeroconf presence notifications by using NEC diffstat: src/common/connection_handlers.py | 334 ++++++++++++++-------------- src/common/connection_handlers_events.py | 24 ++ src/common/zeroconf/connection_zeroconf.py | 22 +- 3 files changed, 204 insertions(+), 176 deletions(-) diffs (truncated from 459 to 300 lines): diff -r eb4ec5a06bab -r a6e5b6f1fd00 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Dec 18 14:21:09 2010 +0100 +++ b/src/common/connection_handlers.py Sun Dec 19 10:39:15 2010 +0100 @@ -759,6 +759,8 @@ gajim.ged.register_event_handler('iq-error-received', ged.CORE, self._nec_iq_error_received) + gajim.ged.register_event_handler('presence-received', ged.CORE, + self._nec_presence_received) def _nec_iq_error_received(self, obj): if obj.conn.name != self.name: @@ -768,6 +770,171 @@ conn=self, stanza=obj.stanza)) return True + def _nec_presence_received(self, obj): + account = obj.conn.name + if account != self.name: + return + jid = obj.jid + resource = obj.resource or '' + + statuss = ['offline', 'error', 'online', 'chat', 'away', 'xa', 'dnd', + 'invisible'] + obj.old_show = 0 + obj.new_show = statuss.index(obj.show) + + obj.contact_list = [] + + highest = gajim.contacts.get_contact_with_highest_priority(account, jid) + obj.was_highest = (highest and highest.resource == resource) + + # Update contact + obj.contact_list = gajim.contacts.get_contacts(account, jid) + obj.contact = None + resources = [] + for c in obj.contact_list: + resources.append(c.resource) + if c.resource == resource: + obj.contact = c + break + + if obj.avatar_sha is not None and obj.ptype != 'error': + if obj.jid not in self.vcard_shas: + cached_vcard = self.get_cached_vcard(obj.jid) + if cached_vcard and 'PHOTO' in cached_vcard and \ + 'SHA' in cached_vcard['PHOTO']: + self.vcard_shas[obj.jid] = cached_vcard['PHOTO']['SHA'] + else: + self.vcard_shas[obj.jid] = '' + if obj.avatar_sha != self.vcard_shas[obj.jid]: + # avatar has been updated + self.request_vcard(obj.jid) + + if obj.contact: + if obj.contact.show in statuss: + obj.old_show = statuss.index(obj.contact.show) + # nick changed + if obj.contact_nickname is not None and \ + obj.contact.contact_name != obj.contact_nickname: + obj.contact.contact_name = obj.contact_nickname + obj.need_redraw = True + + if obj.old_show == obj.new_show and obj.contact.status == \ + obj.status and obj.contact.priority == obj.prio: # no change + return + else: + obj.contact = gajim.contacts.get_first_contact_from_jid(account, + jid) + if not obj.contact: + # Presence of another resource of our jid + # Create self contact and add to roster + if resource == obj.conn.server_resource: + return + # Ignore offline presence of unknown self resource + if obj.new_show < 2: + return + obj.contact = gajim.contacts.create_self_contact(jid=jid, + account=account, show=obj.show, status=obj.status, + priority=obj.prio, keyID=obj.keyID, + resource=obj.resource) + gajim.contacts.add_contact(account, obj.contact) + obj.contact_list.append(obj.contact) + elif obj.contact.show in statuss: + obj.old_show = statuss.index(obj.contact.show) + if (resources != [''] and (len(obj.contact_list) != 1 or \ + obj.contact_list[0].show != 'offline')) and \ + not gajim.jid_is_transport(jid): + # Another resource of an existing contact connected + obj.old_show = 0 + obj.contact = gajim.contacts.copy_contact(obj.contact) + obj.contact_list.append(obj.contact) + obj.contact.resource = resource + + obj.need_add_in_roster = True + + if not gajim.jid_is_transport(jid) and len(obj.contact_list) == 1: + # It's not an agent + if obj.old_show == 0 and obj.new_show > 1: + if not jid in gajim.newly_added[account]: + gajim.newly_added[account].append(jid) + if jid in gajim.to_be_removed[account]: + gajim.to_be_removed[account].remove(jid) + elif obj.old_show > 1 and obj.new_show == 0 and \ + obj.conn.connected > 1: + if not jid in gajim.to_be_removed[account]: + gajim.to_be_removed[account].append(jid) + if jid in gajim.newly_added[account]: + gajim.newly_added[account].remove(jid) + obj.need_redraw = True + + obj.contact.show = obj.show + obj.contact.status = obj.status + obj.contact.priority = obj.prio + obj.contact.keyID = obj.keyID + if obj.timestamp: + obj.contact.last_status_time = obj.timestamp + elif not gajim.block_signed_in_notifications[account]: + # We're connected since more that 30 seconds + obj.contact.last_status_time = localtime() + obj.contact.contact_nickname = obj.contact_nickname + + if gajim.jid_is_transport(jid): + return + + # It isn't an agent + # reset chatstate if needed: + # (when contact signs out or has errors) + if obj.show in ('offline', 'error'): + obj.contact.our_chatstate = obj.contact.chatstate = \ + obj.contact.composing_xep = None + + # TODO: This causes problems when another + # resource signs off! + self.stop_all_active_file_transfers(obj.contact) + + # disable encryption, since if any messages are + # lost they'll be not decryptable (note that + # this contradicts XEP-0201 - trying to get that + # in the XEP, though) + + # there won't be any sessions here if the contact terminated + # their sessions before going offline (which we do) + for sess in self.get_sessions(jid): + if obj.fjid != str(sess.jid): + 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): + try: + gajim.logger.write('status', obj.jid, obj.status, obj.show) + except exceptions.PysqliteOperationalError, e: + self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) + except exceptions.DatabaseMalformed: + pritext = _('Database Error') + sectext = _('The database file (%s) cannot be read. Try to ' + 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup) ' + 'or remove it (all history will be lost).') % LOG_DB_PATH + self.dispatch('DB_ERROR', (pritext, sectext)) + our_jid = gajim.get_jid_from_account(self.name) + def _LastResultCB(self, con, iq_obj): log.debug('LastResultCB') gajim.nec.push_incoming_event(LastResultReceivedEvent(None, conn=self, @@ -983,8 +1150,6 @@ self._nec_gmail_new_mail_received) gajim.ged.register_event_handler('ping-received', ged.CORE, self._nec_ping_received) - gajim.ged.register_event_handler('presence-received', ged.CORE, - self._nec_presence_received) gajim.ged.register_event_handler('subscribe-presence-received', ged.CORE, self._nec_subscribe_presence_received) gajim.ged.register_event_handler('subscribed-presence-received', @@ -1479,171 +1644,6 @@ gajim.nec.push_incoming_event(NetworkEvent('raw-pres-received', conn=self, stanza=prs)) - def _nec_presence_received(self, obj): - account = obj.conn.name - if account != self.name: - return - jid = obj.jid - resource = obj.resource or '' - - statuss = ['offline', 'error', 'online', 'chat', 'away', 'xa', 'dnd', - 'invisible'] - obj.old_show = 0 - obj.new_show = statuss.index(obj.show) - - obj.contact_list = [] - - highest = gajim.contacts.get_contact_with_highest_priority(account, jid) - obj.was_highest = (highest and highest.resource == resource) - - # Update contact - obj.contact_list = gajim.contacts.get_contacts(account, jid) - obj.contact = None - resources = [] - for c in obj.contact_list: - resources.append(c.resource) - if c.resource == resource: - obj.contact = c - break - - if obj.avatar_sha is not None and obj.ptype != 'error': - if obj.jid not in self.vcard_shas: - cached_vcard = self.get_cached_vcard(obj.jid) - if cached_vcard and 'PHOTO' in cached_vcard and \ - 'SHA' in cached_vcard['PHOTO']: - self.vcard_shas[obj.jid] = cached_vcard['PHOTO']['SHA'] - else: - self.vcard_shas[obj.jid] = '' - if obj.avatar_sha != self.vcard_shas[obj.jid]: - # avatar has been updated - self.request_vcard(obj.jid) - - if obj.contact: - if obj.contact.show in statuss: - obj.old_show = statuss.index(obj.contact.show) - # nick changed - if obj.contact_nickname is not None and \ - obj.contact.contact_name != obj.contact_nickname: - obj.contact.contact_name = obj.contact_nickname - obj.need_redraw = True - - if obj.old_show == obj.new_show and obj.contact.status == \ - obj.status and obj.contact.priority == obj.prio: # no change - return - else: - obj.contact = gajim.contacts.get_first_contact_from_jid(account, - jid) - if not obj.contact: - # Presence of another resource of our jid - # Create self contact and add to roster - if resource == obj.conn.server_resource: - return - # Ignore offline presence of unknown self resource - if obj.new_show < 2: - return - obj.contact = gajim.contacts.create_self_contact(jid=jid, - account=account, show=obj.show, status=obj.status, - priority=obj.prio, keyID=obj.keyID, - resource=obj.resource) - gajim.contacts.add_contact(account, obj.contact) - obj.contact_list.append(obj.contact) - elif obj.contact.show in statuss: - obj.old_show = statuss.index(obj.contact.show) - if (resources != [''] and (len(obj.contact_list) != 1 or \ - obj.contact_list[0].show != 'offline')) and \ - not gajim.jid_is_transport(jid): - # Another resource of an existing contact connected - obj.old_show = 0 - obj.contact = gajim.contacts.copy_contact(obj.contact) - obj.contact_list.append(obj.contact) - obj.contact.resource = resource - - obj.need_add_in_roster = True - - if not gajim.jid_is_transport(jid) and len(obj.contact_list) == 1: - # It's not an agent - if obj.old_show == 0 and obj.new_show > 1: - if not jid in gajim.newly_added[account]: - gajim.newly_added[account].append(jid) - if jid in gajim.to_be_removed[account]: - gajim.to_be_removed[account].remove(jid) - elif obj.old_show > 1 and obj.new_show == 0 and \ - obj.conn.connected > 1: - if not jid in gajim.to_be_removed[account]: - gajim.to_be_removed[account].append(jid) - if jid in gajim.newly_added[account]: - gajim.newly_added[account].remove(jid) - obj.need_redraw = True - - obj.contact.show = obj.show - obj.contact.status = obj.status - obj.contact.priority = obj.prio - obj.contact.keyID = obj.keyID - if obj.timestamp: - obj.contact.last_status_time = obj.timestamp - elif not gajim.block_signed_in_notifications[account]:

1 0

gajim: use NEC for roster-info in zeroconf connection
by Yann Leboulanger 19 Dec '10

19 Dec '10

changeset eb4ec5a06bab in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=eb4ec5a06bab description: use NEC for roster-info in zeroconf connection diffstat: src/common/zeroconf/connection_zeroconf.py | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diffs (39 lines): diff -r 0b793c150bd4 -r eb4ec5a06bab src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Sat Dec 18 12:42:15 2010 +0300 +++ b/src/common/zeroconf/connection_zeroconf.py Sat Dec 18 14:21:09 2010 +0100 @@ -136,8 +136,9 @@ diffs = self.roster.getDiffs() for key in diffs: self.roster.setItem(key) - self.dispatch('ROSTER_INFO', (key, self.roster.getName(key), - 'both', 'no', self.roster.getGroups(key))) + gajim.nec.push_incoming_event(RosterInfoEvent(None, conn=self, + jid=key, nickname=self.roster.getName(key), sub='both', + ask='no', groups=self.roster.getGroups(key))) self.dispatch('NOTIFY', (key, self.roster.getStatus(key), self.roster.getMessage(key), 'local', 0, None, 0, None)) #XXX open chat windows don't get refreshed (full name), add that @@ -146,8 +147,9 @@ # callbacks called from zeroconf def _on_new_service(self, jid): self.roster.setItem(jid) - self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both', 'no', - self.roster.getGroups(jid))) + gajim.nec.push_incoming_event(RosterInfoEvent(None, conn=self, + jid=jid, nickname=self.roster.getName(jid), sub='both', + ask='no', groups=self.roster.getGroups(jid))) self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0, None)) @@ -220,8 +222,9 @@ # display contacts already detected and resolved for jid in self.roster.keys(): - self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both', - 'no', self.roster.getGroups(jid))) + gajim.nec.push_incoming_event(RosterInfoEvent(None, conn=self, + jid=jid, nickname=self.roster.getName(jid), sub='both', + ask='no', groups=self.roster.getGroups(jid))) self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0, None))

1 0

gajim: fix for demandimport
by Denis Fomin 18 Dec '10

18 Dec '10

changeset 0b793c150bd4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0b793c150bd4 description: fix for demandimport diffstat: src/common/sleepy.py | 1 + src/gajim.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 46ec25131f88 -r 0b793c150bd4 src/common/sleepy.py --- a/src/common/sleepy.py Sat Dec 18 11:11:58 2010 +0300 +++ b/src/common/sleepy.py Sat Dec 18 12:42:15 2010 +0300 @@ -50,6 +50,7 @@ SystemParametersInfo = ctypes.windll.user32.SystemParametersInfoW else: # unix from common import idle + idle.xss_available except Exception: gajim.log.debug('Unable to load idle module') SUPPORTED = False diff -r 46ec25131f88 -r 0b793c150bd4 src/gajim.py --- a/src/gajim.py Sat Dec 18 11:11:58 2010 +0300 +++ b/src/gajim.py Sat Dec 18 12:42:15 2010 +0300 @@ -39,7 +39,8 @@ demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.glib', 'dbus.service', - 'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto'] + 'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto', + 'common.sleepy'] import os import sys

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2010