comparison: libpurple/protocols/silc/ops.c
libpurple/protocols/silc/ops.c
- branch
- sadrul.struct.hiding
- changeset 24398
- 4865c2ee6ea8
- parent 23325
- a374a26fe217
- child 24945
- 6678a8c83797
equal
deleted
inserted
replaced
| 24395:8cab8ad0cba3 | 24398:4865c2ee6ea8 |
|---|---|
| 429 SilcNotifyType type, ...) | 429 SilcNotifyType type, ...) |
| 430 { | 430 { |
| 431 va_list va; | 431 va_list va; |
| 432 PurpleConnection *gc = client->application; | 432 PurpleConnection *gc = client->application; |
| 433 SilcPurple sg = gc->proto_data; | 433 SilcPurple sg = gc->proto_data; |
| 434 PurpleAccount *account = purple_connection_get_account(gc); | |
| 434 PurpleConversation *convo; | 435 PurpleConversation *convo; |
| 435 SilcClientEntry client_entry, client_entry2; | 436 SilcClientEntry client_entry, client_entry2; |
| 436 SilcChannelEntry channel; | 437 SilcChannelEntry channel; |
| 437 SilcServerEntry server_entry; | 438 SilcServerEntry server_entry; |
| 438 SilcIdType idtype; | 439 SilcIdType idtype; |
| 854 silcpurple_silcdir(), fingerprint); | 855 silcpurple_silcdir(), fingerprint); |
| 855 silc_free(fingerprint); | 856 silc_free(fingerprint); |
| 856 silc_free(pk); | 857 silc_free(pk); |
| 857 | 858 |
| 858 /* Find buddy by associated public key */ | 859 /* Find buddy by associated public key */ |
| 859 for (gnode = purple_get_blist()->root; gnode; | 860 for (gnode = purple_blist_get_root(); gnode; |
| 860 gnode = gnode->next) { | 861 gnode = gnode->next) { |
| 861 if (!PURPLE_BLIST_NODE_IS_GROUP(gnode)) | 862 if (!PURPLE_BLIST_NODE_IS_GROUP(gnode)) |
| 862 continue; | 863 continue; |
| 863 for (cnode = gnode->child; cnode; cnode = cnode->next) { | 864 for (cnode = gnode->child; cnode; cnode = cnode->next) { |
| 864 if( !PURPLE_BLIST_NODE_IS_CONTACT(cnode)) | 865 if( !PURPLE_BLIST_NODE_IS_CONTACT(cnode)) |
| 866 for (bnode = cnode->child; bnode; | 867 for (bnode = cnode->child; bnode; |
| 867 bnode = bnode->next) { | 868 bnode = bnode->next) { |
| 868 if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode)) | 869 if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode)) |
| 869 continue; | 870 continue; |
| 870 b = (PurpleBuddy *)bnode; | 871 b = (PurpleBuddy *)bnode; |
| 871 if (b->account != gc->account) | 872 if (purple_buddy_get_account(b) != account) |
| 872 continue; | 873 continue; |
| 873 f = purple_blist_node_get_string(bnode, "public-key"); | 874 f = purple_blist_node_get_string(bnode, "public-key"); |
| 874 if (f && !strcmp(f, buf)) | 875 if (f && !strcmp(f, buf)) |
| 875 goto cont; | 876 goto cont; |
| 876 b = NULL; | 877 b = NULL; |
