Changeset 7841 for branches/gajim_0.11/src/conversation_textview.py

Timestamp:

01/15/07 19:51:27 (23 months ago)

Author:

asterix

Message:

merge usefull diff from trunk

Files:

• branches/gajim_0.11/src/conversation_textview.py (modified) (2 diffs)

branches/gajim_0.11/src/conversation_textview.py

@@ -689 +689 @@
                 current_print_time = gajim.config.get('print_time')
                 if current_print_time == 'always' and kind != 'info':
-                        timestamp_str = gajim.config.get('time_stamp')
-                        timestamp_str = helpers.from_one_line(timestamp_str)
+                        timestamp_str = self.get_time_to_show(tim)
                         timestamp = time.strftime(timestamp_str, tim)
                         buffer.insert_with_tags_by_name(end_iter, timestamp,
@@ -758 +757 @@
                 if day_str:
                         format += day_str + ' '
-                format += '%X'
+                timestamp_str = gajim.config.get('time_stamp')
+                timestamp_str = helpers.from_one_line(timestamp_str)
+                format += timestamp_str
                 tim_format = time.strftime(format, tim)
                 if locale.getpreferredencoding() != 'KOI8-R':