[gaim-migrate @ 15522]

Tue, 07 Feb 2006 16:02:25 +0000

author
Richard Laager <rlaager@pidgin.im>
date
Tue, 07 Feb 2006 16:02:25 +0000
changeset 13160
8177a80d9e27
parent 13159
0578ba9cb43d
child 13161
8f84bea3949f

[gaim-migrate @ 15522]
Fix the filename unescaping.

src/log.c file | annotate | diff | comparison | revisions
--- a/src/log.c	Tue Feb 07 14:51:28 2006 +0000
+++ b/src/log.c	Tue Feb 07 16:02:25 2006 +0000
@@ -664,7 +664,7 @@
 {
 	GDir *dir;
 	GList *list = NULL;
-	const char *fname;
+	const char *filename;
 	char *path;
 
 	if(!account)
@@ -680,10 +680,8 @@
 		return NULL;
 	}
 
-	while ((fname = g_dir_read_name(dir)))
+	while ((filename = g_dir_read_name(dir)))
 	{
-		const char *filename = gaim_unescape_filename(fname);
-
 		if (gaim_str_has_suffix(filename, ext) &&
 		    strlen(filename) >= (17 + strlen(ext)))
 		{
@@ -693,7 +691,7 @@
 			struct tm tm;
 			long tz_off;
 			const char *rest;
-			time_t stamp = gaim_str_to_time(filename, FALSE, &tm, &tz_off, &rest);
+			time_t stamp = gaim_str_to_time(gaim_unescape_filename(filename), FALSE, &tm, &tz_off, &rest);
 			char *end;
 
 			/* As zero is a valid offset, GAIM_NO_TZ_OFF means no offset was

mercurial