soc.2007.remotelogging: 6dd87fb4: Make remotelogging compile.

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 6dd87fb41c92026976b87159273158cb93833e18
Ancestor: 379bae00562672d798768bbf2f0222ad23e484b5
Author: rlaager at pidgin.im
Date: 2008-11-13T07:55:09
Branch: im.pidgin.soc.2007.remotelogging
URL: http://d.pidgin.im/viewmtn/revision/info/6dd87fb41c92026976b87159273158cb93833e18

Modified files:
        configure.ac pidgin/plugins/history.c

ChangeLog: 

Make remotelogging compile.

-------------- next part --------------
============================================================
--- configure.ac	ba063a5412c7f534f5b0a52121543fd975e3cba2
+++ configure.ac	74691a3cf9086b3d24fd2e7b10fcc8bc2db075da
@@ -833,9 +833,8 @@ AC_SUBST(DBI_LDFLAGS)
 AC_SUBST(DBI_LIBS)
 AC_SUBST(DBI_CFLAGS)
 AC_SUBST(DBI_LDFLAGS)
-AM_CONDITIONAL(USE_DATABASE_LOGGER,  test -n "$DBI_CFLAGS")
-
 fi
+AM_CONDITIONAL(USE_DATABASE_LOGGER, test -n "$DBI_CFLAGS")
 
 
 dnl #######################################################################
============================================================
--- pidgin/plugins/history.c	bceb67a79d44f2d3002f6eaee412303f8d260f21
+++ pidgin/plugins/history.c	065cd80d43c1aef45c21d92eef4799e447c26ffd
@@ -50,6 +50,7 @@ static void historize_log_read_cb(char *
 	GtkIMHtmlOptions options = GTK_IMHTML_NO_COLOURS;
 	PidginConversation *gtkconv;
 	const char *header_date;
+	char *escaped_alias;
 	char *header;
 	char *protocol;
 	char *text_backup = NULL;
@@ -77,15 +78,18 @@ static void historize_log_read_cb(char *
 	if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml))))
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", options);
 
-	if (((PurpleLog *)logs->data)->tm)
-		header_date = purple_date_format_full(((PurpleLog *)logs->data)->tm);
+	if (log->tm)
+		header_date = purple_date_format_full(log->tm);
 	else
-		header_date = purple_date_format_full(localtime(&((PurpleLog *)logs->data)->time));
+		header_date = purple_date_format_full(localtime(&log->time));
 
+	escaped_alias = g_markup_escape_text(callback_data->alias, -1);
+
 	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);
 
 	g_strchomp(text);
 	gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), text, options);