Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/msn.c @ 20453:69febfa6d307
propagate from branch 'im.pidgin.pidgin' (head d3e5a5add3f39caa08b46c83177328e51c2d961a)
to branch 'im.pidgin.cpw.khc.msnp14' (head a8f6c999b039b4097aa70cd8d2597f3127615435)
author | Carlos Silva <typ0@pidgin.im> |
---|---|
date | Sat, 16 Jun 2007 04:00:32 +0000 |
parents | 4403cecc7cd6 4ca97b26a8fb |
children | db286cc82bd1 |
comparison
equal
deleted
inserted
replaced
20452:5c34a0a3c362 | 20453:69febfa6d307 |
---|---|
1596 #endif | 1596 #endif |
1597 | 1597 |
1598 purple_debug_info("msn", "In msn_got_info,url_text:{%s}\n",url_text); | 1598 purple_debug_info("msn", "In msn_got_info,url_text:{%s}\n",url_text); |
1599 | 1599 |
1600 /* Make sure the connection is still valid */ | 1600 /* Make sure the connection is still valid */ |
1601 if (g_list_find(purple_connections_get_all(), info_data->gc) == NULL) | 1601 if (g_list_find((GList *)purple_connections_get_all(), info_data->gc) == NULL) |
1602 { | 1602 { |
1603 purple_debug_warning("msn", "invalid connection. ignoring buddy info.\n"); | 1603 purple_debug_warning("msn", "invalid connection. ignoring buddy info.\n"); |
1604 g_free(info_data->name); | 1604 g_free(info_data->name); |
1605 g_free(info_data); | 1605 g_free(info_data); |
1606 return; | 1606 return; |
2017 PurpleNotifyUserInfo *user_info = info2_data->user_info; | 2017 PurpleNotifyUserInfo *user_info = info2_data->user_info; |
2018 char *photo_url_text = info2_data->photo_url_text; | 2018 char *photo_url_text = info2_data->photo_url_text; |
2019 | 2019 |
2020 /* Make sure the connection is still valid if we got here by fetching a photo url */ | 2020 /* Make sure the connection is still valid if we got here by fetching a photo url */ |
2021 if (url_text && (error_message != NULL || | 2021 if (url_text && (error_message != NULL || |
2022 g_list_find(purple_connections_get_all(), info_data->gc) == NULL)) | 2022 g_list_find((GList *)purple_connections_get_all(), info_data->gc) == NULL)) |
2023 { | 2023 { |
2024 purple_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n"); | 2024 purple_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n"); |
2025 g_free(stripped); | 2025 g_free(stripped); |
2026 g_free(url_buffer); | 2026 g_free(url_buffer); |
2027 g_free(user_info); | 2027 g_free(user_info); |
2116 if (acct_id) { | 2116 if (acct_id) { |
2117 acct = purple_accounts_find(acct_id, prpl); | 2117 acct = purple_accounts_find(acct_id, prpl); |
2118 if (acct && !purple_account_is_connected(acct)) | 2118 if (acct && !purple_account_is_connected(acct)) |
2119 acct = NULL; | 2119 acct = NULL; |
2120 } else { /* Otherwise find an active account for the protocol */ | 2120 } else { /* Otherwise find an active account for the protocol */ |
2121 GList *l = purple_accounts_get_all(); | 2121 const GList *l = purple_accounts_get_all(); |
2122 while (l) { | 2122 while (l) { |
2123 if (!strcmp(prpl, purple_account_get_protocol_id(l->data)) | 2123 if (!strcmp(prpl, purple_account_get_protocol_id(l->data)) |
2124 && purple_account_is_connected(l->data)) { | 2124 && purple_account_is_connected(l->data)) { |
2125 acct = l->data; | 2125 acct = l->data; |
2126 break; | 2126 break; |