# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1177805382 0
# Node ID 60aae7ef3b7ede4a37009f7fc508e66edff9347a
# Parent  598b66923c818f87f559ac7bda72c4962d0dc81a# Parent  2ddffaf3613aa3e04ba50b05b09d9583c66dd327
merge of '480a88680eddc079fa124c4db25edc86e2a3fc03'
     and 'ced1da5fdb05f0972dc4d31a4c77f4fc7b844d1d'

diff -r 598b66923c81 -r 60aae7ef3b7e libpurple/core.c
--- a/libpurple/core.c	Sat Apr 28 23:40:08 2007 +0000
+++ b/libpurple/core.c	Sun Apr 29 00:09:42 2007 +0000
@@ -401,8 +401,9 @@
 			if (!strcmp(entry, "logs"))
 			{
 				char buf[MAXPATHLEN];
+				size_t linklen;
 
-				if (readlink(name, buf, sizeof(buf) - 1) == -1)
+				if ((linklen = readlink(name, buf, sizeof(buf) - 1) == -1))
 				{
 					purple_debug_error("core", "Error reading symlink %s: %s\n",
 					                   name, strerror(errno));
@@ -412,7 +413,7 @@
 					g_free(old_user_dir);
 					return FALSE;
 				}
-				buf[sizeof(buf) - 1] = '\0';
+				buf[linklen] = '\0';
 
 				logs_dir = g_strconcat(user_dir, G_DIR_SEPARATOR_S "logs", NULL);
 
diff -r 598b66923c81 -r 60aae7ef3b7e libpurple/notify.c
--- a/libpurple/notify.c	Sat Apr 28 23:40:08 2007 +0000
+++ b/libpurple/notify.c	Sun Apr 29 00:09:42 2007 +0000
@@ -521,6 +521,7 @@
 	}
 	
 	g_list_free(user_info->user_info_entries);
+	g_free(user_info);
 }
 
 GList *