Mercurial > pidgin
comparison libpurple/protocols/msn/switchboard.c @ 30679:ccae0fa9622f
Don't check the total number of users in an MSN switchboard when converting
to a purple chat, since your alternate selfs count. I have a feeling this
isn't going to work right if you're signed in to >2 places, though.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Tue, 15 Dec 2009 00:55:46 +0000 |
parents | 17ee21b062f9 |
children | 1830fa548302 |
comparison
equal
deleted
inserted
replaced
30678:17ee21b062f9 | 30679:ccae0fa9622f |
---|---|
269 { | 269 { |
270 purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL, | 270 purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL, |
271 PURPLE_CBFLAGS_NONE, TRUE); | 271 PURPLE_CBFLAGS_NONE, TRUE); |
272 msn_servconn_set_idle_timeout(swboard->servconn, 0); | 272 msn_servconn_set_idle_timeout(swboard->servconn, 0); |
273 } | 273 } |
274 else if (swboard->current_users > 1 || swboard->total_users > 1) | 274 else if (swboard->current_users > 1) |
275 { | 275 { |
276 msn_servconn_set_idle_timeout(swboard->servconn, 0); | 276 msn_servconn_set_idle_timeout(swboard->servconn, 0); |
277 if (swboard->conv == NULL || | 277 if (swboard->conv == NULL || |
278 purple_conversation_get_type(swboard->conv) != PURPLE_CONV_TYPE_CHAT) | 278 purple_conversation_get_type(swboard->conv) != PURPLE_CONV_TYPE_CHAT) |
279 { | 279 { |