diff libpurple/conversation.c @ 18006:f2d8658b3a86

merge of '62e9d17cd37551991c5040ce6ca48e6d7578dde3' and '87c1ea9b3d60a343bac2a35e1fd8f7fee6bda6f2'
author Richard Laager <rlaager@wiktel.com>
date Sat, 19 May 2007 21:38:47 +0000
parents 7ade887fd3f6
children 7790021b1270
line wrap: on
line diff
--- a/libpurple/conversation.c	Sat May 19 08:12:31 2007 +0000
+++ b/libpurple/conversation.c	Sat May 19 21:38:47 2007 +0000
@@ -1010,7 +1010,7 @@
 	conv = purple_conv_im_get_conversation(im);
 	name = purple_conversation_get_name(conv);
 
-	im->typing_timeout = purple_timeout_add(timeout * 1000, reset_typing_cb, conv);
+	im->typing_timeout = purple_timeout_add_seconds(timeout, reset_typing_cb, conv);
 }
 
 void