comparison: libpurple/protocols/msn/switchboard.c
libpurple/protocols/msn/switchboard.c
- branch
- soc.2013.gobjectification
- changeset 34622
- 753f46dd000f
- parent 33661
- 2ebcb105e606
- child 34636
- cfbdf3297c99
equal
deleted
inserted
replaced
| 34621:66308be62d23 | 34622:753f46dd000f |
|---|---|
| 289 } | 289 } |
| 290 | 290 |
| 291 if ((swboard->conv != NULL) && | 291 if ((swboard->conv != NULL) && |
| 292 (purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) | 292 (purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) |
| 293 { | 293 { |
| 294 purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), msnuser->passport, NULL, | 294 purple_chat_conversation_add_user(PURPLE_CONV_CHAT(swboard->conv), msnuser->passport, NULL, |
| 295 PURPLE_CBFLAGS_NONE, TRUE); | 295 PURPLE_CHAT_CONVERSATION_BUDDY_NONE, TRUE); |
| 296 msn_servconn_set_idle_timeout(swboard->servconn, 0); | 296 msn_servconn_set_idle_timeout(swboard->servconn, 0); |
| 297 } | 297 } |
| 298 else if (swboard->current_users > 1) | 298 else if (swboard->current_users > 1) |
| 299 { | 299 { |
| 300 msn_servconn_set_idle_timeout(swboard->servconn, 0); | 300 msn_servconn_set_idle_timeout(swboard->servconn, 0); |
| 320 { | 320 { |
| 321 const char *tmp_user; | 321 const char *tmp_user; |
| 322 | 322 |
| 323 tmp_user = ((MsnUser*)l->data)->passport; | 323 tmp_user = ((MsnUser*)l->data)->passport; |
| 324 | 324 |
| 325 purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), | 325 purple_chat_conversation_add_user(PURPLE_CONV_CHAT(swboard->conv), |
| 326 tmp_user, NULL, PURPLE_CBFLAGS_NONE, TRUE); | 326 tmp_user, NULL, PURPLE_CHAT_CONVERSATION_BUDDY_NONE, TRUE); |
| 327 } | 327 } |
| 328 | 328 |
| 329 purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), | 329 purple_chat_conversation_add_user(PURPLE_CONV_CHAT(swboard->conv), |
| 330 purple_account_get_username(account), | 330 purple_account_get_username(account), |
| 331 NULL, PURPLE_CBFLAGS_NONE, TRUE); | 331 NULL, PURPLE_CHAT_CONVERSATION_BUDDY_NONE, TRUE); |
| 332 | 332 |
| 333 g_free(swboard->im_user); | 333 g_free(swboard->im_user); |
| 334 swboard->im_user = NULL; | 334 swboard->im_user = NULL; |
| 335 } | 335 } |
| 336 } | 336 } |
| 337 else if (swboard->conv == NULL) | 337 else if (swboard->conv == NULL) |
| 338 { | 338 { |
| 339 swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, | 339 swboard->conv = purple_conversations_find_with_account(PURPLE_CONV_TYPE_IM, |
| 340 msnuser->passport, account); | 340 msnuser->passport, account); |
| 341 } | 341 } |
| 342 else | 342 else |
| 343 { | 343 { |
| 344 purple_debug_warning("msn", "switchboard_add_user: This should not happen!\n"); | 344 purple_debug_warning("msn", "switchboard_add_user: This should not happen!\n"); |
| 620 else if ((swboard->current_users > 1) || | 620 else if ((swboard->current_users > 1) || |
| 621 (purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) | 621 (purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) |
| 622 { | 622 { |
| 623 GList *passport; | 623 GList *passport; |
| 624 /* This is a switchboard used for a chat */ | 624 /* This is a switchboard used for a chat */ |
| 625 purple_conv_chat_remove_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL); | 625 purple_chat_conversation_remove_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL); |
| 626 | 626 |
| 627 passport = g_list_find_custom(swboard->users, user, (GCompareFunc)strcmp); | 627 passport = g_list_find_custom(swboard->users, user, (GCompareFunc)strcmp); |
| 628 if (passport) | 628 if (passport) |
| 629 g_free(passport->data); | 629 g_free(passport->data); |
| 630 else | 630 else |
