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

Merge branch 'history-manager' into 'master' 

History manager fixes

See merge request !57
This commit is contained in:
Philipp Hörist 2017-02-12 16:50:28 +01:00
parent 7814f07bd3 2a599d1e89
commit eec1a69efd
1 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/history_manager.py
View File

@ -29,24 +29,6 @@
## the same can be said for history_window.py ## the same can be said for history_window.py
import os import os
if os.name == 'nt':
import warnings
warnings.filterwarnings(action='ignore')
if os.path.isdir('gtk'):
# Used to create windows installer with GTK included
paths = os.environ['PATH']
list_ = paths.split(';')
new_list = []
for p in list_:
if p.find('gtk') < 0 and p.find('GTK') < 0:
new_list.append(p)
new_list.insert(0, 'gtk/lib')
new_list.insert(0, 'gtk/bin')
os.environ['PATH'] = ';'.join(new_list)
os.environ['GTK_BASEPATH'] = 'gtk'
import sys import sys
import signal import signal
import gi import gi
@ -91,11 +73,7 @@ common.configpaths.gajimpaths.init(config_path)
del config_path del config_path
from common import gajim from common import gajim
import gtkgui_helpers import gtkgui_helpers
from common.logger import LOG_DB_PATH, constants from common.logger import LOG_DB_PATH, JIDConstant, KindConstant
#FIXME: constants should implement 2 way mappings
status = dict((constants.__dict__[i], i[5:].lower()) for i in \
constants.__dict__.keys() if i.startswith('SHOW_'))
from common import helpers from common import helpers
import dialogs import dialogs
@ -342,7 +320,7 @@ class HistoryManager:
possible_room_jid = jid.split('/', 1)[0] possible_room_jid = jid.split('/', 1)[0]
self.cur.execute('SELECT jid_id FROM jids WHERE jid = ? AND type = ?', self.cur.execute('SELECT jid_id FROM jids WHERE jid = ? AND type = ?',
(possible_room_jid, constants.JID_ROOM_TYPE)) (possible_room_jid, JIDConstant.ROOM_TYPE))
row = self.cur.fetchone() row = self.cur.fetchone()
if row is None: if row is None:
return False return False
@ -357,7 +335,7 @@ class HistoryManager:
row = self.cur.fetchone() row = self.cur.fetchone()
if row is None: if row is None:
raise raise
elif row[0] == constants.JID_ROOM_TYPE: elif row[0] == JIDConstant.ROOM_TYPE:
return True return True
else: # normal type else: # normal type
return False return False
@ -399,15 +377,15 @@ class HistoryManager:
pass pass
else: else:
color = None color = None
if kind in (constants.KIND_SINGLE_MSG_RECV, if kind in (KindConstant.SINGLE_MSG_RECV,
constants.KIND_CHAT_MSG_RECV, constants.KIND_GC_MSG): KindConstant.CHAT_MSG_RECV, KindConstant.GC_MSG):
# it is the other side # it is the other side
color = gajim.config.get('inmsgcolor') # so incoming color color = gajim.config.get('inmsgcolor') # so incoming color
elif kind in (constants.KIND_SINGLE_MSG_SENT, elif kind in (KindConstant.SINGLE_MSG_SENT,
constants.KIND_CHAT_MSG_SENT): # it is us KindConstant.CHAT_MSG_SENT): # it is us
color = gajim.config.get('outmsgcolor') # so outgoing color color = gajim.config.get('outmsgcolor') # so outgoing color
elif kind in (constants.KIND_STATUS, elif kind in (KindConstant.STATUS,
constants.KIND_GCSTATUS): # is is statuses KindConstant.GCSTATUS): # is is statuses
# so status color # so status color
color = gajim.config.get('statusmsgcolor') color = gajim.config.get('statusmsgcolor')
# include status into (status) message # include status into (status) message
@ -540,13 +518,13 @@ class HistoryManager:
# in store: time, kind, message, contact_name FROM logs # in store: time, kind, message, contact_name FROM logs
# in text: JID or You or nickname (if it's gc_msg), time, message # in text: JID or You or nickname (if it's gc_msg), time, message
time_, kind, message, nickname = row time_, kind, message, nickname = row
if kind in (constants.KIND_SINGLE_MSG_RECV, if kind in (KindConstant.SINGLE_MSG_RECV,
constants.KIND_CHAT_MSG_RECV): KindConstant.CHAT_MSG_RECV):
who = self._get_jid_from_jid_id(jid_id) who = self._get_jid_from_jid_id(jid_id)
elif kind in (constants.KIND_SINGLE_MSG_SENT, elif kind in (KindConstant.SINGLE_MSG_SENT,
constants.KIND_CHAT_MSG_SENT): KindConstant.CHAT_MSG_SENT):
who = _('You') who = _('You')
elif kind == constants.KIND_GC_MSG: elif kind == KindConstant.GC_MSG:
who = nickname who = nickname
else: # status or gc_status. do not save else: # status or gc_status. do not save
#print kind #print kind