[Gaim-commits] SF.net SVN: gaim: [16698] trunk/plugins/log_reader.c

[<dat...@us...>]

Revision: 16698
Author:   datallah
Date:     2006-08-10 19:20:18 -0700 (Thu, 10 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16698&view=rev

Log Message:
-----------
CID 218

Also a win32 compile fix.

Modified Paths:
--------------
    trunk/plugins/log_reader.c
Modified: trunk/plugins/log_reader.c
===================================================================
--- trunk/plugins/log_reader.c	2006-08-11 02:02:53 UTC (rev 16697)
+++ trunk/plugins/log_reader.c	2006-08-11 02:20:18 UTC (rev 16698)
@@ -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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.