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

Timestamp:

01/13/07 23:35:41 (23 months ago)

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Files:

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

branches/gajim_0.11/src/conversation_textview.py

@@ -246 +246 @@
                         before_img_iter.backward_char() # one char back (an image also takes one char)
                         buffer.apply_tag_by_name('focus-out-line', before_img_iter, end_iter)
-
-                        self.allow_focus_out_line = False
 
                         # update the iter we hold to make comparison the next time
@@ -691 +689 @@
                 current_print_time = gajim.config.get('print_time')
                 if current_print_time == 'always' and kind != 'info':
-                        before_str = gajim.config.get('before_time')
-                        before_str = helpers.from_one_line(before_str)
-                        after_str = gajim.config.get('after_time')
-                        after_str = helpers.from_one_line(after_str)
-                        tim_format = before_str + self.get_time_to_show(tim) + after_str
-                        buffer.insert_with_tags_by_name(end_iter, tim_format + ' ',
+                        timestamp_str = gajim.config.get('time_stamp')
+                        timestamp_str = helpers.from_one_line(timestamp_str)
+                        timestamp = time.strftime(timestamp_str, tim)
+                        buffer.insert_with_tags_by_name(end_iter, timestamp,
                                 *other_tags_for_time)
                 elif current_print_time == 'sometimes' and kind != 'info':