# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1139335741 0
# Node ID dc0375c4984a95d52600da310b30103209567c98
# Parent  02268b52ced328bb19b9248384d36151346be390
[gaim-migrate @ 15525]
Clean up the log filename escaping to do what I want. Also, work around the fact that win32 gives spaces back for %Z. I'm going to fix that, but let's guard against it for anyone that has logs on win32 from the today...

committer: Tailor Script <tailor@pidgin.im>

diff -r 02268b52ced3 -r dc0375c4984a src/log.c
--- a/src/log.c	Tue Feb 07 16:53:57 2006 +0000
+++ b/src/log.c	Tue Feb 07 18:09:01 2006 +0000
@@ -630,6 +630,8 @@
 	{
 		/* This log is new */
 		char *dir;
+		struct tm *tm;
+		const char *tz;
 		const char *date;
 		char *filename;
 		char *path;
@@ -640,11 +642,13 @@
 
 		gaim_build_dir (dir, S_IRUSR | S_IWUSR | S_IXUSR);
 
-		date = gaim_utf8_strftime("%Y-%m-%d.%H%M%S%z%Z", localtime(&log->time));
+		tm = localtime(&log->time);
+		tz = gaim_escape_filename(gaim_utf8_strftime("%Z", tm));
+		date = gaim_utf8_strftime("%Y-%m-%d.%H%M%S%z", tm);
 
-		filename = g_strdup_printf("%s%s", date, ext ? ext : "");
+		filename = g_strdup_printf("%s%s%s", date, tz, ext ? ext : "");
 
-		path = g_build_filename(dir, gaim_escape_filename(filename), NULL);
+		path = g_build_filename(dir, filename, NULL);
 		g_free(dir);
 		g_free(filename);
 
@@ -706,7 +710,7 @@
 			if (tz_off != GAIM_NO_TZ_OFF)
 				tm.tm_gmtoff = tz_off - tm.tm_gmtoff;
 
-			if (rest == NULL || (end = strchr(rest, '.')) == NULL)
+			if (rest == NULL || (end = strchr(rest, '.')) == NULL || strchr(rest, ' ') != NULL)
 			{
 				log = gaim_log_new(type, name, account, NULL, stamp, NULL);
 			}
@@ -882,19 +886,27 @@
 		 * creating a new file there would result in empty files in the case
 		 * that you open a convo with someone, but don't say anything.
 		 */
+		struct tm *tm;
+		const char *tz;
 		const char *date;
 		char *dir = gaim_log_get_log_dir(log->type, log->name, log->account);
+		char *name;
 		char *filename;
 
 		if (dir == NULL)
 			return;
 
-		date = gaim_utf8_strftime("%Y-%m-%d.%H%M%S%z%Z.xml", localtime(&log->time));
+		tm = localtime(&log->time);
+		tz = gaim_escape_filename(gaim_utf8_strftime("%Z", tm);
+		date = gaim_utf8_strftime("%Y-%m-%d.%H%M%S%z", tm);
+
+		name = g_strdup_printf("%s%s%s", date, tz, ext ? ext : "");
 
 		gaim_build_dir (dir, S_IRUSR | S_IWUSR | S_IXUSR);
 
-		filename = g_build_filename(dir, gaim_escape_filename(date), NULL);
+		filename = g_build_filename(dir, name, NULL);
 		g_free(dir);
+		g_free(name);
 
 		log->logger_data = g_fopen(filename, "a");
 		if (!log->logger_data) {