# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1155262818 0
# Node ID 034a3ffa09de9b96ced0cd212fb59a0eb0dd1872
# Parent  7f0e6b3f483238d65f45fb0c4451014a40bc4373
[gaim-migrate @ 16698]
CID 218

Also a win32 compile fix.

committer: Tailor Script <tailor@pidgin.im>

diff -r 7f0e6b3f4832 -r 034a3ffa09de plugins/log_reader.c
--- a/plugins/log_reader.c	Fri Aug 11 02:02:53 2006 +0000
+++ b/plugins/log_reader.c	Fri Aug 11 02:20:18 2006 +0000
@@ -900,7 +900,7 @@
 								!isalnum(*(from_name +
 								alias_length)));
 
-						to_name_matches = (gaim_str_has_prefix(
+						to_name_matches = to_name && (gaim_str_has_prefix(
 								to_name, alias) &&
 								!isalnum(*(to_name +
 								alias_length)));
@@ -1682,6 +1682,7 @@
 	char buffer[1024] = "";
 	DWORD size = (sizeof(buffer) - 1);
 	DWORD type;
+	gboolean found = FALSE;
 
 	path = NULL;
 	/* TODO: Test this after removing the trailing "\\". */
@@ -1720,20 +1721,18 @@
 
 	if (!path) {
 		char *folder = wgaim_get_special_folder(CSIDL_PROGRAM_FILES);
-		if (folder)
+		if (folder) {
 			path = g_build_filename(folder, "Trillian",
 					"users", "default", "talk.ini", NULL);
 			g_free(folder);
 		}
 	}
 
-	gboolean found = FALSE;
-
 	if (path) {
 		/* Read talk.ini file to find the log directory. */
 		GError *error = NULL;
 
-#if 0 && GTK_CHECK_VERSION(2,6,0) /* FIXME: Not tested yet. */
+#if 0 && GLIB_CHECK_VERSION(2,6,0) /* FIXME: Not tested yet. */
 		GKeyFile *key_file;
 
 		gaim_debug(GAIM_DEBUG_INFO, "Trillian talk.ini read",
@@ -1760,9 +1759,9 @@
 
 			g_key_file_free(key_file);
 		}
-#else /* !GTK_CHECK_VERSION(2,6,0) */
-		GError *error = NULL;
+#else /* !GLIB_CHECK_VERSION(2,6,0) */
 		gsize length;
+		gchar *contents = NULL;
 
 		gaim_debug(GAIM_DEBUG_INFO, "Trillian talk.ini read",
 					"Reading %s\n", path);