[Gaim-commits] SF.net SVN: gaim: [16843] branches/v2_0_0beta3_1/gaim/src/log.c

[<rl...@us...>]

Revision: 16843
Author:   rlaager
Date:     2006-08-18 12:15:05 -0700 (Fri, 18 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16843&view=rev

Log Message:
-----------
Revision #15963:

"Display the log's original timestamp on Windows. This is less confusing than my crazy crackpot idea before... AND, the logs still sort by 'real' time relative to the user."

Revision #15965:

"Argument order matters. Fix that last commit."

ViewCVS Links:
-------------
    http://svn.sourceforge.net/gaim/?rev=15963&view=rev
    http://svn.sourceforge.net/gaim/?rev=15965&view=rev

Modified Paths:
--------------
    branches/v2_0_0beta3_1/gaim/src/log.c
Modified: branches/v2_0_0beta3_1/gaim/src/log.c
===================================================================
--- branches/v2_0_0beta3_1/gaim/src/log.c	2006-08-18 19:13:46 UTC (rev 16842)
+++ branches/v2_0_0beta3_1/gaim/src/log.c	2006-08-18 19:15:05 UTC (rev 16843)
@@ -698,8 +698,8 @@
 		{
 			GaimLog *log;
 			GaimLogCommonLoggerData *data;
+			struct tm tm;
 #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(gaim_unescape_filename(filename), FALSE, &tm, &tz_off, &rest);
@@ -722,9 +722,9 @@
 				g_free(tmp);
 			}
 #else
-			time_t stamp = gaim_str_to_time(filename, FALSE, NULL, NULL, NULL);
+			time_t stamp = gaim_str_to_time(filename, FALSE, &tm, NULL, NULL);
 
-			log = gaim_log_new(type, name, account, NULL, stamp, NULL);
+			log = gaim_log_new(type, name, account, NULL, stamp, &tm);
 #endif
 
 			log->logger = logger;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.