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

remove utf8 data in file that does not declare it uses utf8 [make Gajim boot]

This commit is contained in:
Nikos Kouremenos 2006-11-27 11:33:21 +00:00
parent 6b0664fa83
commit f33ff3a74d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/chat_control.py
View File

@ -1143,9 +1143,10 @@ class ChatControl(ChatControlBase):
# because we want it sent with REAL message # because we want it sent with REAL message
# (not standlone) eg. one that has body # (not standlone) eg. one that has body
#FIXME:
# Enable 3 next lines after 0.11 release. # Enable 3 next lines after 0.11 release.
# Having this disabled violate xep85 5.1.2 but then we don't break # Having this disabled violate xep85 5.1.2 but then we don't break
# notifications between 0.10.1 and 0.11  See #2637 # notifications between 0.10.1 and 0.11 See #2637
# if contact.our_chatstate: # if contact.our_chatstate:
# # We already ask for xep 85, don't ask it twice # # We already ask for xep 85, don't ask it twice
# composing_jep = 'asked_once' # composing_jep = 'asked_once'
@ -1631,7 +1632,7 @@ class ChatControl(ChatControlBase):
self.contact.get_full_jid(), ['chat', 'pm'])) self.contact.get_full_jid(), ['chat', 'pm']))
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)
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
if not row[2]: # message is empty, we don't print it if not row[2]: # message is empty, we don't print it