[Gaim-commits] CVS: gaim/src conversation.c,1.384,1.385

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv9183/src

Modified Files:
	conversation.c 
Log Message:
I wrote two plugins tonight, emulating features of other clients.
history.c - this puts the last 4kb of your message log in new conversations
This was first done by EB, copied by Trillian Pro and gets requested of us
once in a while.

timestamp.c - adds iChat-style timestamps to conversations.  Never use iChat?
it puts an inconspicuous timestamp at the top of new conversations and then
keeps adding them every 5 minutes.  It's hard to explain really--try it out.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -d -r1.384 -r1.385
--- conversation.c	6 Oct 2002 05:01:49 -0000	1.384
+++ conversation.c	6 Oct 2002 07:56:14 -0000	1.385
@@ -2038,8 +2038,8 @@
 		}
 	}
 
-	if ((c->is_chat && (chat_options & OPT_CHAT_POPUP)) ||
-	    (!c->is_chat && (im_options & OPT_IM_POPUP)))
+	if (!flags & WFLAG_NOLOG && ((c->is_chat && (chat_options & OPT_CHAT_POPUP)) ||
+				     (!c->is_chat && (im_options & OPT_IM_POPUP))))
 		gdk_window_show(c->window->window);
 	if (flags & WFLAG_RECV)
 		reset_typing(g_strdup(c->name));