Mercurial > pidgin.yaz

diff src/log.c @ 13119:fcde3faa1f57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 15481] This adds support for displaying log timestamps in their original timezone. If your OS's definition of struct tm sucks, then the log timestamps will show up in your local timezone, but converted, so the time is accurate. Yay! Anyway, this all works, as I've renamed lots of my log files locally, but currently, there's no code to save new logs in this name format. That's held up on a portability issue and backwards compatibility issue. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Sat, 04 Feb 2006 20:55:52 +0000
parents a0a4b44239e8
children 0d755026832c
line wrap: on
line diff
--- a/src/log.c	Sat Feb 04 05:17:46 2006 +0000
+++ b/src/log.c	Sat Feb 04 20:55:52 2006 +0000
@@ -72,7 +72,7 @@
  **************************************************************************/
 
 GaimLog *gaim_log_new(GaimLogType type, const char *name, GaimAccount *account,
-					  GaimConversation *conv, time_t time)
+                      GaimConversation *conv, time_t time, const struct tm *tm)
 {
 	GaimLog *log = g_new0(GaimLog, 1);
 	log->name = g_strdup(gaim_normalize(account, name));
@@ -81,6 +81,17 @@
 	log->time = time;
 	log->type = type;
 	log->logger_data = NULL;
+	if (tm != NULL)
+	{
+		log->tm = g_new0(struct tm, 1);
+		*(log->tm) = *tm;
+
+#ifdef HAVE_STRUCT_TM_TM_ZONE
+		/* XXX: This is so wrong... */
+		if (log->tm->tm_zone != NULL)
+			log->tm->tm_zone = (const char *)g_strdup(log->tm->tm_zone);
+#endif
+	}
 	log->logger = gaim_log_logger_get();
 	if (log->logger && log->logger->create)
 		log->logger->create(log);
@@ -93,6 +104,16 @@
 	if (log->logger && log->logger->finalize)
 		log->logger->finalize(log);
 	g_free(log->name);
+
+	if (log->tm != NULL)
+	{
+#ifdef HAVE_STRUCT_TM_TM_ZONE
+		/* XXX: This is so wrong... */
+		g_free((char *)log->tm->tm_zone);
+#endif
+		g_free(log->tm);
+	}
+
 	g_free(log);
 }
 
@@ -666,9 +687,35 @@
 		{
 			GaimLog *log;
 			GaimLogCommonLoggerData *data;
-			time_t stamp = gaim_str_to_time(filename, FALSE);
+#if defined (HAVE_TM_GMTOFF) && defined (HAVE_STRUCT_TM_TM_ZONE)
+			struct tm tm;
+			long tz_off;
+			const char *rest;
+			time_t stamp = gaim_str_to_time(filename, FALSE, &tm, &tz_off, &rest);
+			char *end;
+
+			/* As zero is a valid offset, GAIM_NO_TZ_OFF means no offset was
+			 * provided. See util.h. Yes, it's kinda ugly. */
+			if (tz_off != GAIM_NO_TZ_OFF)
+				tm.tm_gmtoff = tz_off - tm.tm_gmtoff;
 
-			log = gaim_log_new(type, name, account, NULL, stamp);
+			if (rest == NULL || (end = strchr(rest, '.')) == NULL)
+			{
+				log = gaim_log_new(type, name, account, NULL, stamp, NULL);
+			}
+			else
+			{
+				char *tmp = g_strndup(rest, end - rest);
+				tm.tm_zone = tmp;
+				log = gaim_log_new(type, name, account, NULL, stamp, &tm);
+				g_free(tmp);
+			}
+#else
+			time_t stamp = gaim_str_to_time(filename, FALSE, NULL, NULL, NULL);
+
+			log = gaim_log_new(type, name, account, NULL, stamp, NULL);
+#endif
+
 			log->logger = logger;
 			log->logger_data = data = g_new0(GaimLogCommonLoggerData, 1);
 			data->path = g_build_filename(path, filename, NULL);
@@ -932,7 +979,7 @@
 		if(!data->file)
 			return 0;
 
-		date = gaim_date_format_full(log->time);
+		date = gaim_date_format_full(localtime(&log->time));
 
 		written += fprintf(data->file, "<html><head>");
 		written += fprintf(data->file, "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">");
@@ -1071,7 +1118,7 @@
 			return 0;
 
 		written += fprintf(data->file, "Conversation with %s at %s on %s (%s)\n",
-			log->name, gaim_date_format_full(log->time),
+			log->name, gaim_date_format_full(localtime(&log->time)),
 			gaim_account_get_username(log->account), prpl);
 	}
 
@@ -1234,7 +1281,7 @@
 					newlen--;
 
 				if (newlen != 0) {
-					log = gaim_log_new(GAIM_LOG_IM, sn, account, NULL, -1);
+					log = gaim_log_new(GAIM_LOG_IM, sn, account, NULL, -1, NULL);
 					log->logger = old_logger;
 					log->time = lasttime;
 					data = g_new0(struct old_logger_data, 1);
@@ -1285,7 +1332,7 @@
 
 	if (logfound) {
 		if ((newlen = ftell(file) - lastoff) != 0) {
-			log = gaim_log_new(GAIM_LOG_IM, sn, account, NULL, -1);
+			log = gaim_log_new(GAIM_LOG_IM, sn, account, NULL, -1, NULL);
 			log->logger = old_logger;
 			log->time = lasttime;
 			data = g_new0(struct old_logger_data, 1);