Mercurial > pidgin.yaz
changeset 27600:b0ae684202a8
merge of '36948cfc8a90e3d81db3b233f7af33bf653ae4d3'
and '80c512a73e4585cbb038dbf493be0183ad2547bf'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Mon, 13 Jul 2009 02:17:47 +0000 |
| parents | 37741237d146 (diff) 35cb9aa9eb2f (current diff) |
| children | b32e7be9b3bf |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntconv.c Mon Jul 13 02:13:51 2009 +0000 +++ b/finch/gntconv.c Mon Jul 13 02:17:47 2009 +0000 @@ -881,9 +881,12 @@ gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), "\n", GNT_TEXT_FLAG_NORMAL); /* Unnecessary to print the timestamp for delayed message */ - if (purple_prefs_get_bool("/finch/conversations/timestamps")) + if (purple_prefs_get_bool("/finch/conversations/timestamps")) { + if (!mtime) + time(&mtime); gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), purple_utf8_strftime("(%H:%M:%S)", localtime(&mtime)), gnt_color_pair(color_timestamp)); + } gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), " ", GNT_TEXT_FLAG_NORMAL);