comparison libpurple/conversation.c @ 25861:7f552614ec8a

applied changes from a336cc1fd3a1ce815f97303b8d5ae8988f8cbd5b through fe4f5d91d1605cf93c53470e59d4bf8da6c5c840 ChangeLog for the above.
author Ethan Blanton <elb@pidgin.im>
date Tue, 28 Apr 2009 20:57:59 +0000
parents abf8ebd4c9e1
children 1cf0b4f71d16
comparison
equal deleted inserted replaced
25860:d51b8647d43c 25861:7f552614ec8a
31 #include "prpl.h" 31 #include "prpl.h"
32 #include "request.h" 32 #include "request.h"
33 #include "signals.h" 33 #include "signals.h"
34 #include "util.h" 34 #include "util.h"
35 35
36 #define SEND_TYPED_TIMEOUT 5000 36 #define SEND_TYPED_TIMEOUT_SECONDS 5
37 37
38 static GList *conversations = NULL; 38 static GList *conversations = NULL;
39 static GList *ims = NULL; 39 static GList *ims = NULL;
40 static GList *chats = NULL; 40 static GList *chats = NULL;
41 static PurpleConversationUiOps *default_ops = NULL; 41 static PurpleConversationUiOps *default_ops = NULL;
1120 void 1120 void
1121 purple_conv_im_start_send_typed_timeout(PurpleConvIm *im) 1121 purple_conv_im_start_send_typed_timeout(PurpleConvIm *im)
1122 { 1122 {
1123 g_return_if_fail(im != NULL); 1123 g_return_if_fail(im != NULL);
1124 1124
1125 im->send_typed_timeout = purple_timeout_add(SEND_TYPED_TIMEOUT, send_typed_cb, 1125 im->send_typed_timeout = purple_timeout_add_seconds(SEND_TYPED_TIMEOUT_SECONDS,
1126 purple_conv_im_get_conversation(im)); 1126 send_typed_cb,
1127 purple_conv_im_get_conversation(im));
1127 } 1128 }
1128 1129
1129 void 1130 void
1130 purple_conv_im_stop_send_typed_timeout(PurpleConvIm *im) 1131 purple_conv_im_stop_send_typed_timeout(PurpleConvIm *im)
1131 { 1132 {