From 402e1e241da74eecd84d0f38b1289e82ed1be781 Mon Sep 17 00:00:00 2001 From: Denis Fomin Date: Tue, 8 Jan 2013 13:22:33 +0400 Subject: [PATCH] fix newline in history textview and timestamp in conversation textview --- src/conversation_textview.py | 9 ++++++--- src/history_window.py | 10 +++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/conversation_textview.py b/src/conversation_textview.py index ed46d8f03..9c0c19421 100644 --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -1233,8 +1233,11 @@ class ConversationTextview(GObject.GObject): if current_print_time == 'always' and kind != 'info' and not simple: timestamp_str = self.get_time_to_show(tim) timestamp = time.strftime(timestamp_str, tim) - buffer_.insert_with_tags_by_name(end_iter, timestamp, - *other_tags_for_time) + if other_tags_for_time: + buffer_.insert_with_tags_by_name(end_iter, timestamp, + *other_tags_for_time) + else: + buffer_.insert (end_iter, timestamp) elif current_print_time == 'sometimes' and kind != 'info' and not simple: every_foo_seconds = 60 * gajim.config.get( 'print_ichat_every_foo_minutes') @@ -1248,7 +1251,7 @@ class ConversationTextview(GObject.GObject): else: tim_format = self.get_time_to_show(tim) buffer_.insert_with_tags_by_name(end_iter, tim_format + '\n', - 'time_sometimes') + 'time_sometimes') # If there's a displaymarking, print it here. if displaymarking: self.print_displaymarking(displaymarking) diff --git a/src/history_window.py b/src/history_window.py index 9a31491bd..f589c3706 100644 --- a/src/history_window.py +++ b/src/history_window.py @@ -472,8 +472,10 @@ class HistoryWindow: after_str = gajim.config.get('after_nickname') after_str = helpers.from_one_line(after_str) format = before_str + contact_name + after_str + ' ' - buf.insert_with_tags_by_name(end_iter, format, tag_name) - + if tag_name: + buf.insert_with_tags_by_name(end_iter, format, tag_name) + else: + buf.insert(end_iter, format) if subject: message = _('Subject: %s\n') % subject + message xhtml = None @@ -486,7 +488,9 @@ class HistoryWindow: else: self.history_textview.print_real_text(message, name=contact_name, xhtml=xhtml) - self.history_textview.print_real_text('\n') + buffer_ = self.history_textview.tv.get_buffer() + eob = buffer_.get_end_iter() + buffer_.insert_with_tags_by_name(eob, '\n', 'eol') def on_search_entry_activate(self, widget): text = self.search_entry.get_text()