From 5dac0723f7e1b71782e1861424d4c1edbfcfd8f3 Mon Sep 17 00:00:00 2001 From: Denis Fomin Date: Tue, 8 Jan 2013 14:13:52 +0400 Subject: [PATCH] fix not xhtml message in conversation textview --- src/conversation_textview.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/conversation_textview.py b/src/conversation_textview.py index 9c0c19421..cd2dc4970 100644 --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -998,8 +998,10 @@ class ConversationTextview(GObject.GObject): print_conversation_line() """ buffer_ = self.tv.get_buffer() - - insert_tags_func = buffer_.insert_with_tags_by_name + if other_tags: + insert_tags_func = buffer_.insert_with_tags_by_name + else: + insert_tags_func = buffer_.insert # detect_and_print_special_text() is also used by # HtmlHandler.handle_specials() and there tags is Gtk.TextTag objects, # not strings @@ -1026,7 +1028,10 @@ class ConversationTextview(GObject.GObject): text_before_special_text = otext[index:start] end_iter = buffer_.get_end_iter() # we insert normal text - insert_tags_func(end_iter, text_before_special_text, *other_tags) + if other_tags: + insert_tags_func(end_iter, text_before_special_text, *other_tags) + else: + buffer_.insert(end_iter, text_before_special_text) index = end # update index # now print it @@ -1158,8 +1163,10 @@ class ConversationTextview(GObject.GObject): insert_tags_func = buffer_.insert_with_tags_by_name if other_tags and isinstance(other_tags[0], Gtk.TextTag): insert_tags_func = buffer_.insert_with_tags - - insert_tags_func(end_iter, special_text, *other_tags) + if other_tags: + insert_tags_func(end_iter, special_text, *other_tags) + else: + buffer_.insert(end_iter, special_text) if tags: end_iter = buffer_.get_end_iter()