diff src/account.c @ 6040:80e3641ee9eb

[gaim-migrate @ 6490] Various minor memleak fixes, and a rephrasing of an oscar error message. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 06 Jul 2003 06:57:42 +0000
parents 547ba881bc7e
children 6a3b676eb36a
line wrap: on
line diff
--- a/src/account.c	Sun Jul 06 05:07:11 2003 +0000
+++ b/src/account.c	Sun Jul 06 06:57:42 2003 +0000
@@ -991,10 +991,10 @@
 	if (!g_file_get_contents(filename, &contents, &length, &error)) {
 		gaim_debug(GAIM_DEBUG_ERROR, "accounts",
 				   "Error reading accounts: %s\n", error->message);
-		
 		g_error_free(error);
+		g_free(filename);
+		accounts_loaded = TRUE;
 
-		accounts_loaded = TRUE;
 		return FALSE;
 	}
 
@@ -1006,7 +1006,7 @@
 	if (!g_markup_parse_context_parse(context, contents, length, NULL)) {
 		g_markup_parse_context_free(context);
 		g_free(contents);
-
+		g_free(filename);
 		accounts_loaded = TRUE;
 
 		return FALSE;
@@ -1015,9 +1015,9 @@
 	if (!g_markup_parse_context_end_parse(context, NULL)) {
 		gaim_debug(GAIM_DEBUG_ERROR, "accounts", "Error parsing %s\n",
 				   filename);
-
 		g_markup_parse_context_free(context);
 		g_free(contents);
+		g_free(filename);
 		accounts_loaded = TRUE;
 
 		return FALSE;
@@ -1025,9 +1025,7 @@
 
 	g_markup_parse_context_free(context);
 	g_free(contents);
-
 	g_free(filename);
-
 	accounts_loaded = TRUE;
 
 	return TRUE;