in history search results now name column is filled even if we are in normal chat

This commit is contained in:
Nikos Kouremenos 2005-12-27 20:56:30 +00:00
parent af242e3840
commit 56f535da4f
1 changed files with 20 additions and 7 deletions

View File

@ -321,15 +321,28 @@ class HistoryWindow:
return return
# contact_name, time, kind, show, message, subject # contact_name, time, kind, show, message, subject
results = gajim.logger.get_search_results_for_query(self.jid, text) results = gajim.logger.get_search_results_for_query(self.jid, text)
#FIXME: investigate on kind and put name for normal chatting #FIXME:
#and add "subject: | message: " in message column is kind is # add "subject: | message: " in message column if kind is single
# single* # also do we need show at all? (we do not search on subject)
# also do we need show at all?
for row in results: for row in results:
local_time = time.localtime(row[1]) contact_name = row[0]
tim = time.strftime('%x', local_time) if not contact_name:
kind = row[2]
if kind == constants.KIND_CHAT_MSG_SENT: # it's us! :)
contact_name = gajim.nicks[self.account]
else:
if self.account and gajim.contacts[self.account].has_key(self.jid):
contact = gajim.get_first_contact_instance_from_jid(
self.account, self.jid)
contact_name = contact.name
else:
contact_name = self.jid
tim = row[1]
message = row[4]
local_time = time.localtime(tim)
date = time.strftime('%x', local_time)
# name, date, message, time (full unix time) # name, date, message, time (full unix time)
model.append((row[0], tim, row[4], row[1])) model.append((contact_name, date, message, tim))
def on_results_treeview_row_activated(self, widget, path, column): def on_results_treeview_row_activated(self, widget, path, column):
'''a row was double clicked, get date from row, and select it in calendar '''a row was double clicked, get date from row, and select it in calendar