Mercurial > pidgin.yaz
comparison src/protocols/msn/switchboard.c @ 9454:b6feee45f33d
[gaim-migrate @ 10278]
This should fix a harmless failed g_return_if_fail type debug warning
type thing on opening a switchboard connection to someone.
committer: Tailor Script <tailor@pidgin.im>
| author | Tim Ringenbach <marv@pidgin.im> |
|---|---|
| date | Mon, 05 Jul 2004 19:33:48 +0000 |
| parents | 7b56b8ba3dff |
| children | 8b2451878e26 |
comparison
equal
deleted
inserted
replaced
| 9453:28280c108cc4 | 9454:b6feee45f33d |
|---|---|
| 64 swboard->current_users++; | 64 swboard->current_users++; |
| 65 | 65 |
| 66 /* gaim_debug_info("msn", "user=[%s], total=%d\n", user, | 66 /* gaim_debug_info("msn", "user=[%s], total=%d\n", user, |
| 67 * swboard->current_users); */ | 67 * swboard->current_users); */ |
| 68 | 68 |
| 69 if (gaim_conversation_get_type(swboard->conv) == GAIM_CONV_CHAT) | 69 if ((swboard->conv != NULL) && (gaim_conversation_get_type(swboard->conv) == GAIM_CONV_CHAT)) |
| 70 { | 70 { |
| 71 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->conv), user, NULL); | 71 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->conv), user, NULL); |
| 72 } | 72 } |
| 73 else if (swboard->current_users > 1 || swboard->total_users > 1) | 73 else if (swboard->current_users > 1 || swboard->total_users > 1) |
| 74 { | 74 { |