Mercurial > pidgin.yaz
comparison src/server.c @ 8287:ef881489396e
[gaim-migrate @ 9011]
Another patch from Scott Lamb to change g_source_remove calls to
gaim_timeout_remove. It also implements gaim_timeout_remove.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Wed, 18 Feb 2004 07:43:21 +0000 |
parents | f24172f53650 |
children | f5b0e1a4b0c7 |
comparison
equal
deleted
inserted
replaced
8286:89d9d004e3f3 | 8287:ef881489396e |
---|---|
88 if (on && !gc->keep_alive) { | 88 if (on && !gc->keep_alive) { |
89 gaim_debug(GAIM_DEBUG_INFO, "server", "allowing NOP\n"); | 89 gaim_debug(GAIM_DEBUG_INFO, "server", "allowing NOP\n"); |
90 gc->keep_alive = gaim_timeout_add(60000, send_keepalive, gc); | 90 gc->keep_alive = gaim_timeout_add(60000, send_keepalive, gc); |
91 } else if (!on && gc->keep_alive > 0) { | 91 } else if (!on && gc->keep_alive > 0) { |
92 gaim_debug(GAIM_DEBUG_INFO, "server", "removing NOP\n"); | 92 gaim_debug(GAIM_DEBUG_INFO, "server", "removing NOP\n"); |
93 g_source_remove(gc->keep_alive); | 93 gaim_timeout_remove(gc->keep_alive); |
94 gc->keep_alive = 0; | 94 gc->keep_alive = 0; |
95 } | 95 } |
96 } | 96 } |
97 | 97 |
98 void serv_close(GaimConnection *gc) | 98 void serv_close(GaimConnection *gc) |
106 gc->buddy_chats = g_slist_remove(gc->buddy_chats, b); | 106 gc->buddy_chats = g_slist_remove(gc->buddy_chats, b); |
107 gaim_conv_chat_left(GAIM_CONV_CHAT(b)); | 107 gaim_conv_chat_left(GAIM_CONV_CHAT(b)); |
108 } | 108 } |
109 | 109 |
110 if (gc->idle_timer > 0) | 110 if (gc->idle_timer > 0) |
111 g_source_remove(gc->idle_timer); | 111 gaim_timeout_remove(gc->idle_timer); |
112 gc->idle_timer = 0; | 112 gc->idle_timer = 0; |
113 | 113 |
114 update_keepalive(gc, FALSE); | 114 update_keepalive(gc, FALSE); |
115 | 115 |
116 if (gc->prpl != NULL) { | 116 if (gc->prpl != NULL) { |
150 serv_set_info(gc, gaim_account_get_user_info(account)); | 150 serv_set_info(gc, gaim_account_get_user_info(account)); |
151 /* g_free(buf); */ | 151 /* g_free(buf); */ |
152 } | 152 } |
153 | 153 |
154 if (gc->idle_timer > 0) | 154 if (gc->idle_timer > 0) |
155 g_source_remove(gc->idle_timer); | 155 gaim_timeout_remove(gc->idle_timer); |
156 | 156 |
157 gc->idle_timer = gaim_timeout_add(20000, check_idle, gc); | 157 gc->idle_timer = gaim_timeout_add(20000, check_idle, gc); |
158 serv_touch_idle(gc); | 158 serv_touch_idle(gc); |
159 | 159 |
160 /* Move this hack into toc.c */ | 160 /* Move this hack into toc.c */ |