comparison: pidgin/gtkutils.c
pidgin/gtkutils.c
- changeset 32678
- 01f6312a4a7b
- parent 32620
- a5c32f843d18
- child 32709
- 0edad3ff7243
equal
deleted
inserted
replaced
| 32677:52d651b3b98f | 32678:01f6312a4a7b |
|---|---|
| 1067 if (chat < 0) { | 1067 if (chat < 0) { |
| 1068 pidgin_retrieve_user_info(conn, name); | 1068 pidgin_retrieve_user_info(conn, name); |
| 1069 return; | 1069 return; |
| 1070 } | 1070 } |
| 1071 | 1071 |
| 1072 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(conn->prpl); | 1072 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(conn)); |
| 1073 if (prpl_info != NULL && prpl_info->get_cb_real_name) | 1073 if (prpl_info != NULL && prpl_info->get_cb_real_name) |
| 1074 who = prpl_info->get_cb_real_name(conn, chat, name); | 1074 who = prpl_info->get_cb_real_name(conn, chat, name); |
| 1075 if (prpl_info == NULL || prpl_info->get_cb_info == NULL) { | 1075 if (prpl_info == NULL || prpl_info->get_cb_info == NULL) { |
| 1076 pidgin_retrieve_user_info(conn, who ? who : name); | 1076 pidgin_retrieve_user_info(conn, who ? who : name); |
| 1077 g_free(who); | 1077 g_free(who); |
| 1193 else | 1193 else |
| 1194 { | 1194 { |
| 1195 gc = (PurpleConnection *)l->data; | 1195 gc = (PurpleConnection *)l->data; |
| 1196 account = purple_connection_get_account(gc); | 1196 account = purple_connection_get_account(gc); |
| 1197 | 1197 |
| 1198 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); | 1198 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)); |
| 1199 } | 1199 } |
| 1200 | 1200 |
| 1201 protoname = prpl_info->list_icon(account, NULL); | 1201 protoname = prpl_info->list_icon(account, NULL); |
| 1202 | 1202 |
| 1203 if (!strcmp(protoname, protocol)) | 1203 if (!strcmp(protoname, protocol)) |
| 1235 else | 1235 else |
| 1236 { | 1236 { |
| 1237 gc = (PurpleConnection *)l->data; | 1237 gc = (PurpleConnection *)l->data; |
| 1238 account = purple_connection_get_account(gc); | 1238 account = purple_connection_get_account(gc); |
| 1239 | 1239 |
| 1240 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); | 1240 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)); |
| 1241 } | 1241 } |
| 1242 | 1242 |
| 1243 protoname = prpl_info->list_icon(account, NULL); | 1243 protoname = prpl_info->list_icon(account, NULL); |
| 1244 | 1244 |
| 1245 if (!strcmp(protoname, "aim") || !strcmp(protoname, "icq")) | 1245 if (!strcmp(protoname, "aim") || !strcmp(protoname, "icq")) |
| 1647 data->who = g_strdup(who); | 1647 data->who = g_strdup(who); |
| 1648 data->filename = g_strdup(filename); | 1648 data->filename = g_strdup(filename); |
| 1649 data->account = account; | 1649 data->account = account; |
| 1650 | 1650 |
| 1651 if (gc) | 1651 if (gc) |
| 1652 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); | 1652 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)); |
| 1653 | 1653 |
| 1654 if (prpl_info && prpl_info->options & OPT_PROTO_IM_IMAGE) | 1654 if (prpl_info && prpl_info->options & OPT_PROTO_IM_IMAGE) |
| 1655 im = TRUE; | 1655 im = TRUE; |
| 1656 | 1656 |
| 1657 if (prpl_info && prpl_info->can_receive_file) | 1657 if (prpl_info && prpl_info->can_receive_file) |
