changeset 3e4063cb8527 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=3e4063cb8527 description: fix newline in history textview and timestamp in conversation textview
diffstat:
src/conversation_textview.py | 9 ++++++--- src/history_window.py | 10 +++++++--- 2 files changed, 13 insertions(+), 6 deletions(-)
diffs (53 lines):
diff -r 9c1550a3da4c -r 3e4063cb8527 src/conversation_textview.py --- a/src/conversation_textview.py Tue Jan 08 13:20:24 2013 +0400 +++ b/src/conversation_textview.py Tue Jan 08 13:22:33 2013 +0400 @@ -1233,8 +1233,11 @@ 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 @@ 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 -r 9c1550a3da4c -r 3e4063cb8527 src/history_window.py --- a/src/history_window.py Tue Jan 08 13:20:24 2013 +0400 +++ b/src/history_window.py Tue Jan 08 13:22:33 2013 +0400 @@ -472,8 +472,10 @@ 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 @@ 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()