diff options
| author | Denis Fomin <fominde@gmail.com> | 2013-01-08 13:22:33 +0400 |
|---|---|---|
| committer | Denis Fomin <fominde@gmail.com> | 2013-01-08 13:22:33 +0400 |
| commit | 402e1e241da74eecd84d0f38b1289e82ed1be781 (patch) | |
| tree | fb24e131e941d424705779321ac123685c179179 /src/conversation_textview.py | |
| parent | a9464b4cf69a6da22d3e6790d394a512336ccdd7 (diff) | |
fix newline in history textview and timestamp in conversation textview
Diffstat (limited to 'src/conversation_textview.py')
| -rw-r--r-- | src/conversation_textview.py | 9 |
1 files changed, 6 insertions, 3 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) |