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

Simplify import and move to the top

This commit is contained in:
Philipp Hörist 2017-03-06 02:41:33 +01:00
parent b7cce4e728
commit 3f38ccc3a5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/chat_control.py
View File

@ -39,6 +39,7 @@ import gui_menu_builder
import message_control import message_control
import dialogs import dialogs
from common import logger
from common import gajim from common import gajim
from common import helpers from common import helpers
from common import exceptions from common import exceptions
@ -1626,10 +1627,9 @@ class ChatControl(ChatControlBase):
rows = gajim.logger.get_last_conversation_lines(jid, restore_how_many, rows = gajim.logger.get_last_conversation_lines(jid, restore_how_many,
pending_how_many, timeout, self.account) pending_how_many, timeout, self.account)
except exceptions.DatabaseMalformed: except exceptions.DatabaseMalformed:
import common.logger
dialogs.ErrorDialog(_('Database Error'), dialogs.ErrorDialog(_('Database Error'),
_('The database file (%s) cannot be read. Try to repair it or ' _('The database file (%s) cannot be read. Try to repair it or '
'remove it (all history will be lost).') % common.logger.LOG_DB_PATH) 'remove it (all history will be lost).') % logger.LOG_DB_PATH)
rows = [] rows = []
local_old_kind = None local_old_kind = None
self.conv_textview.just_cleared = True self.conv_textview.just_cleared = True