Index: src/debug.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/debug.c,v
retrieving revision 1.11
diff -u -d -p -r1.11 debug.c
--- src/debug.c	13 Aug 2005 22:09:32 -0000	1.11
+++ src/debug.c	1 Sep 2005 04:26:12 -0000
@@ -62,7 +62,8 @@ gaim_debug_vargs(GaimDebugLevel level, c
 			gchar mdate[64];
 
 			time_t mtime = time(NULL);
-			strftime(mdate, sizeof(mdate), "%H:%M:%S", localtime(&mtime));
+			strftime(mdate, sizeof(mdate), "%Y-%m-%d %H:%M:%S",
+				localtime(&mtime));
 			ts_s = g_strdup_printf("(%s) ", mdate);
 		} else {
 			ts_s = g_strdup("");
Index: src/gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.585
diff -u -d -p -r1.585 gtkconv.c
--- src/gtkconv.c	25 Aug 2005 02:33:44 -0000	1.585
+++ src/gtkconv.c	1 Sep 2005 04:26:20 -0000
@@ -4975,10 +4975,7 @@ gaim_gtkconv_write_conv(GaimConversation
 	if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml))))
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", 0);
 
-	if(time(NULL) > mtime + 20*60) /* show date if older than 20 minutes */
-		strftime(mdate, sizeof(mdate), "%Y-%m-%d %H:%M:%S", localtime(&mtime));
-	else
-		strftime(mdate, sizeof(mdate), "%H:%M:%S", localtime(&mtime));
+	strftime(mdate, sizeof(mdate), "%Y-%m-%d %H:%M:%S", localtime(&mtime));
 
 	if(gc)
 		sml_attrib = g_strdup_printf("sml=\"%s\"",
Index: src/gtkdebug.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkdebug.c,v
retrieving revision 1.62
diff -u -d -p -r1.62 gtkdebug.c
--- src/gtkdebug.c	19 Aug 2005 06:45:30 -0000	1.62
+++ src/gtkdebug.c	1 Sep 2005 04:26:20 -0000
@@ -938,7 +938,7 @@ gaim_gtk_debug_print(GaimDebugLevel leve
 		gchar mdate[64];
 
 		time_t mtime = time(NULL);
-		strftime(mdate, sizeof(mdate), "%H:%M:%S", localtime(&mtime));
+		strftime(mdate, sizeof(mdate), "%Y-%m-%d %H:%M:%S", localtime(&mtime));
 		ts_s = g_strdup_printf("(%s) ", mdate);
 	} else {
 		ts_s = g_strdup("");
Index: src/log.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/log.c,v
retrieving revision 1.121
diff -u -d -p -r1.121 log.c
--- src/log.c	18 Aug 2005 04:14:07 -0000	1.121
+++ src/log.c	1 Sep 2005 04:26:20 -0000
@@ -719,7 +719,7 @@ static void xml_logger_write(GaimLog *lo
 	if(!data->file)
 		return;
 
-	strftime(date, sizeof(date), "%H:%M:%S", localtime(&time));
+	strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&time));
 	gaim_markup_html_to_xhtml(message, &xhtml, NULL);
 	if (from)
 		fprintf(log->logger_data, "<message %s %s from='%s' time='%s'>%s</message>\n",
@@ -809,7 +809,7 @@ static void html_logger_write(GaimLog *l
 		strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&time));
 		fprintf(data->file, "---- %s @ %s ----<br/>\n", msg_fixed, date);
 	} else {
-		strftime(date, sizeof(date), "%H:%M:%S", localtime(&time));
+		strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&time));
 		if (type & GAIM_MESSAGE_SYSTEM)
 			fprintf(data->file, "<font size=\"2\">(%s)</font><b> %s</b><br/>\n", date, msg_fixed);
 		else if (type & GAIM_MESSAGE_WHISPER)
@@ -942,7 +942,7 @@ static void txt_logger_write(GaimLog *lo
  		strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&time));
  		fprintf(data->file, "---- %s @ %s ----\n", stripped, date);
  	} else {
- 		strftime(date, sizeof(date), "%H:%M:%S", localtime(&time));
+ 		strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&time));
  		if (type & GAIM_MESSAGE_SEND ||
  			type & GAIM_MESSAGE_RECV) {
  			if (type & GAIM_MESSAGE_AUTO_RESP) {
Index: src/util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.362
diff -u -d -p -r1.362 util.c
--- src/util.c	29 Aug 2005 04:53:17 -0000	1.362
+++ src/util.c	1 Sep 2005 04:26:20 -0000
@@ -469,7 +469,7 @@ gaim_date(void)
 	time_t tme;
 
 	time(&tme);
-	strftime(date, sizeof(date), "%H:%M:%S", localtime(&tme));
+	strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&tme));
 
 	return date;
 }
Index: src/util.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.h,v
retrieving revision 1.80
diff -u -d -p -r1.80 util.h
--- src/util.h	24 Jul 2005 19:36:18 -0000	1.80
+++ src/util.h	1 Sep 2005 04:26:20 -0000
@@ -173,7 +173,7 @@ char *gaim_mime_decode_field(const char 
 /*@{*/
 
 /**
- * Returns the current local time in hour:minute:second form.
+ * Returns the current local time in year-month-day hour:minute:second form.
  *
  * The returned string is stored in a static buffer, so the result
  * should be g_strdup()'d if it's intended to be used for long.