# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1137046323 0
# Node ID d26e3314c650096f8f1b553bb6e5a0308be72847
# Parent  a95094ac67660847a8f5c66510020de9722494d5
[gaim-migrate @ 15198]
Make the options say what the plugin is supposed to do and then make the plugin do what the options say it does.

committer: Tailor Script <tailor@pidgin.im>

diff -r a95094ac6766 -r d26e3314c650 plugins/timestamp_format.c
--- a/plugins/timestamp_format.c	Thu Jan 12 04:19:40 2006 +0000
+++ b/plugins/timestamp_format.c	Thu Jan 12 06:12:03 2006 +0000
@@ -31,17 +31,17 @@
 			"/plugins/gtk/timestamp_format/use_dates/conversation",
 			_("Co_nversations:"));
         gaim_plugin_pref_set_type(ppref, GAIM_PLUGIN_PREF_CHOICE);
-        gaim_plugin_pref_add_choice(ppref, "For Delayed Messages", "automatic");
-        gaim_plugin_pref_add_choice(ppref, "In Chats", "chats");
+        gaim_plugin_pref_add_choice(ppref, "For delayed messages", "automatic");
+        gaim_plugin_pref_add_choice(ppref, "For delayed messages and in chats", "chats");
         gaim_plugin_pref_add_choice(ppref, "Always", "always");
 	gaim_plugin_pref_frame_add(frame, ppref);
 
 	ppref = gaim_plugin_pref_new_with_name_and_label(
 			"/plugins/gtk/timestamp_format/use_dates/log",
-			_("_Logs:"));
+			_("_Message Logs:"));
         gaim_plugin_pref_set_type(ppref, GAIM_PLUGIN_PREF_CHOICE);
-        gaim_plugin_pref_add_choice(ppref, "For Delayed Messages", "automatic");
-        gaim_plugin_pref_add_choice(ppref, "In Chats", "chats");
+        gaim_plugin_pref_add_choice(ppref, "For delayed messages", "automatic");
+        gaim_plugin_pref_add_choice(ppref, "For delayed messages and in chats", "chats");
         gaim_plugin_pref_add_choice(ppref, "Always", "always");
 	gaim_plugin_pref_frame_add(frame, ppref);
 
@@ -61,7 +61,8 @@
 
 	if (!strcmp(dates, "always") ||
 	    (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT &&
-	     !strcmp(dates, "chats")))
+	     !strcmp(dates, "chats")) ||
+	    (time(NULL) > (mktime(tm) + 20*60)))
 	{
 		if (force)
 			strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", tm);