copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

remove command_system modules from demandimport.ignore

Browse source
This commit is contained in:
Denis Fomin 2012-08-12 11:24:22 +04:00
parent 24bcc25348
commit 9016441fcf
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/chat_control.py
View file

@ -64,8 +64,8 @@ from command_system.implementation.hosts import ChatCommands
# Here we load the module with the standard commands, so they are being detected # Here we load the module with the standard commands, so they are being detected
# and dispatched. # and dispatched.
import command_system.implementation.standard from command_system.implementation.standard import StandardChatCommands
import command_system.implementation.execute from command_system.implementation.execute import Execute, Show
try: try:
import gtkspell import gtkspell
@ -83,7 +83,15 @@ if dbus_support.supported:
##!/bin/sh ##!/bin/sh
#LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done) #LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#echo "{_('en'):'en'",$LANG"}" #echo "{_('en'):'en'",$LANG"}"
langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg', _('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de', _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo', _('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr', _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb', _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk', _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'} langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg',
_('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de',
_('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo',
_('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr',
_('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb',
_('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl',
_('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR',
_('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk',
_('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'}
if gajim.config.get('use_speller') and HAS_GTK_SPELL: if gajim.config.get('use_speller') and HAS_GTK_SPELL:
# loop removing non-existent dictionaries # loop removing non-existent dictionaries
@ -2293,7 +2301,7 @@ class ChatControl(ChatControlBase):
else: else:
displaymarking = None displaymarking = None
self.print_conversation(message, self.contact.jid, encrypted=encrypted, self.print_conversation(message, self.contact.jid, encrypted=encrypted,
xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking) xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking)
ChatControlBase.send_message(self, message, keyID, type_='chat', ChatControlBase.send_message(self, message, keyID, type_='chat',
chatstate=chatstate_to_send, xhtml=xhtml, callback=_on_sent, chatstate=chatstate_to_send, xhtml=xhtml, callback=_on_sent,
@ -2886,7 +2894,8 @@ class ChatControl(ChatControlBase):
except exceptions.DatabaseMalformed: except exceptions.DatabaseMalformed:
import common.logger import common.logger
dialogs.ErrorDialog(_('Database Error'), dialogs.ErrorDialog(_('Database Error'),
_('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH) _('The database file (%s) cannot be read. Try to repair it or \
remove it (all history will be lost).') % common.logger.LOG_DB_PATH)
rows = [] rows = []
local_old_kind = None local_old_kind = None
for row in rows: # row[0] time, row[1] has kind, row[2] the message for row in rows: # row[0] time, row[1] has kind, row[2] the message

4
src/gajim.py
View file

@ -65,9 +65,7 @@ if os.name == 'nt':
from common import demandimport from common import demandimport
demandimport.enable() demandimport.enable()
demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n',
'logging.NullHandler', 'dbus.service', 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto',
'command_system.implementation.standard',
'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto',
'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic',
'Crypto.PublicKey'] 'Crypto.PublicKey']