Mercurial > pidgin3 / changeset

--- 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);