# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 954245719 0
# Node ID dead1eb6d65493505a0c7e49d441a2f244059ba5
# Parent  3b479e2700c9dcb3b25c856f1c2cca19245ef73e
[gaim-migrate @ 80]
Full Dates On Conversation Logging
BuddyList Name Fix

committer: Tailor Script <tailor@pidgin.im>

diff -r 3b479e2700c9 -r dead1eb6d654 ChangeLog
--- a/ChangeLog	Tue Mar 28 11:37:06 2000 +0000
+++ b/ChangeLog	Tue Mar 28 12:15:19 2000 +0000
@@ -6,7 +6,9 @@
 	* GNOME compile error fixed
 	* Away Message Problem Fixed
 	* Fixed URL Right Click Menus
-
+	* Conversation Loggin now shows Full Date and Time
+	* Internal Change to Buddy List
+ 
 version 0.9.12 (03/25/2000):
 	* Segfault fix for PPC/Alpha/etc machines with log(0)
 	  Thanks to Todd Cohen for this one.
diff -r 3b479e2700c9 -r dead1eb6d654 src/buddy.c
--- a/src/buddy.c	Tue Mar 28 11:37:06 2000 +0000
+++ b/src/buddy.c	Tue Mar 28 12:15:19 2000 +0000
@@ -1303,6 +1303,7 @@
 	char infotip[256];
         char idlet[16];
         char warn[256];
+	char *who;
         int i;
         int ihrs, imin;
         time_t t;
@@ -1358,6 +1359,11 @@
 			
 			play_sound(BUDDY_ARRIVE);
 
+			who = g_malloc(sizeof(b->name) + 10);
+			strcpy(who, b->name);
+			gtk_label_set(GTK_LABEL(b->label), who);
+			g_free(who);
+
 			pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
 				NULL, (gchar **)login_icon_xpm);
 			gtk_widget_hide(b->pix);
diff -r 3b479e2700c9 -r dead1eb6d654 src/conversation.c
--- a/src/conversation.c	Tue Mar 28 11:37:06 2000 +0000
+++ b/src/conversation.c	Tue Mar 28 12:15:19 2000 +0000
@@ -71,7 +71,6 @@
         state_lock = i;
 }
 
-
 struct conversation *new_conversation(char *name)
 {
         struct conversation *c;
@@ -86,11 +85,13 @@
 
 	if ((general_options & OPT_GEN_LOG_ALL) || find_log_info(c->name)) {
 		FILE *fd;
+
 		fd = open_log_file(c);
 		if (!(general_options & OPT_GEN_STRIP_HTML))
-			fprintf(fd, "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n", date());
+			fprintf(fd, "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n", full_date()); 
 		else
-			fprintf(fd, " ---- New Conversation @ %s ----\n", date());
+			fprintf(fd, " ---- New Conversation @ %s ----\n", full_date()); 
+
 		fclose(fd);
 	}
 
diff -r 3b479e2700c9 -r dead1eb6d654 src/gaim.h
--- a/src/gaim.h	Tue Mar 28 11:37:06 2000 +0000
+++ b/src/gaim.h	Tue Mar 28 12:15:19 2000 +0000
@@ -269,7 +269,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 35 $"
+#define REVISION "gaim:$Revision: 80 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
@@ -411,7 +411,7 @@
 extern FILE *open_log_file (struct conversation *c);
 extern char *sec_to_text(int);
 extern struct aim_user *find_user(const char *);
-
+extern char *full_date();
 
 /* Functions in server.c */
 /* input to serv */
diff -r 3b479e2700c9 -r dead1eb6d654 src/util.c
--- a/src/util.c	Tue Mar 28 11:37:06 2000 +0000
+++ b/src/util.c	Tue Mar 28 12:15:19 2000 +0000
@@ -36,6 +36,16 @@
 static GdkBitmap *icon_bm = NULL;
 static int state;
 
+char *full_date() {
+	char * date;
+	time_t tme;
+
+	time(&tme);
+	date = ctime(&tme);
+	date[strlen(date)-1] = '\0';
+	return date;
+}
+
 gint badchar(char c)
 {
         if (c == ' ')