Mercurial > pidgin.yaz
changeset 22869:cf2ac6f0758a
A patch from poizon. This was intended to fix a bug, but I just fixed that
at the source. This patch is still useful, though, as preferring tm over
time provides the timezone abbreviation. (This is why it exists at all.)
Refs #3550
committer: Richard Laager <rlaager@wiktel.com>
| author | Mihály Mészáros <poizon@sth.sze.hu> |
|---|---|
| date | Sun, 11 May 2008 05:04:07 +0000 |
| parents | 8dadddab10ed |
| children | 3d7e9eff04d0 |
| files | COPYRIGHT pidgin/plugins/history.c |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Sun May 11 04:50:36 2008 +0000 +++ b/COPYRIGHT Sun May 11 05:04:07 2008 +0000 @@ -249,6 +249,7 @@ Kurt McKee Torrey McMahon Robert McQueen +Mihály Mészáros Robert Mibus Lars T. Mikkelsen Benjamin Miller
--- a/pidgin/plugins/history.c Sun May 11 04:50:36 2008 +0000 +++ b/pidgin/plugins/history.c Sun May 11 05:04:07 2008 +0000 @@ -43,6 +43,7 @@ char *header; char *protocol; char *escaped_alias; + char *header_date; convtype = purple_conversation_get_type(c); gtkconv = PIDGIN_CONVERSATION(c); @@ -122,8 +123,13 @@ gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", options); escaped_alias = g_markup_escape_text(alias, -1); - header = g_strdup_printf(_("<b>Conversation with %s on %s:</b><br>"), escaped_alias, - purple_date_format_full(localtime(&((PurpleLog *)logs->data)->time))); + + if (((PurpleLog *)logs->data)->tm) + header_date = purple_date_format_full(((PurpleLog *)logs->data)->tm); + else + header_date = purple_date_format_full(localtime(&((PurpleLog *)logs->data)->time)); + + header = g_strdup_printf(_("<b>Conversation with %s on %s:</b><br>"), escaped_alias, header_date); gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), header, options); g_free(header); g_free(escaped_alias);