From f33ff3a74d3497fbbcb6e6a95c1f3a4fe5513cff Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Mon, 27 Nov 2006 11:33:21 +0000 Subject: [PATCH] remove utf8 data in file that does not declare it uses utf8 [make Gajim boot] --- src/chat_control.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/chat_control.py b/src/chat_control.py index 68bff1f1d..756722a17 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -1143,9 +1143,10 @@ class ChatControl(ChatControlBase): # because we want it sent with REAL message # (not standlone) eg. one that has body + #FIXME: # Enable 3 next lines after 0.11 release. - # Having this disabled violate xep85 5.1.2 but then we don't break - # notifications between 0.10.1 and 0.11  See #2637 + # Having this disabled violate xep85 5.1.2 but then we don't break + # notifications between 0.10.1 and 0.11 See #2637 # if contact.our_chatstate: # # We already ask for xep 85, don't ask it twice # composing_jep = 'asked_once' @@ -1631,7 +1632,7 @@ class ChatControl(ChatControlBase): self.contact.get_full_jid(), ['chat', 'pm'])) 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 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