Mercurial > pidgin.yaz
comparison libpurple/protocols/silc/buddy.c @ 32827:4a34689eeb33 default tip
merged from im.pidgin.pidgin
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sat, 19 Nov 2011 14:42:54 +0900 |
parents | 2ec94166be43 |
children |
comparison
equal
deleted
inserted
replaced
32692:0f94ec89f0bc | 32827:4a34689eeb33 |
---|---|
312 if (hostname) | 312 if (hostname) |
313 a->hostname = g_strdup(hostname); | 313 a->hostname = g_strdup(hostname); |
314 a->port = port; | 314 a->port = port; |
315 | 315 |
316 purple_request_action(client->application, _("Key Agreement Request"), tmp, | 316 purple_request_action(client->application, _("Key Agreement Request"), tmp, |
317 hostname ? tmp2 : NULL, 1, gc->account, client_entry->nickname, | 317 hostname ? tmp2 : NULL, 1, purple_connection_get_account(gc), client_entry->nickname, |
318 NULL, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb), | 318 NULL, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb), |
319 _("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb)); | 319 _("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb)); |
320 } | 320 } |
321 | 321 |
322 static void | 322 static void |
455 p->client_id = client_entry->id; | 455 p->client_id = client_entry->id; |
456 purple_request_input(gc, _("IM With Password"), NULL, | 456 purple_request_input(gc, _("IM With Password"), NULL, |
457 _("Set IM Password"), NULL, FALSE, TRUE, NULL, | 457 _("Set IM Password"), NULL, FALSE, TRUE, NULL, |
458 _("OK"), G_CALLBACK(silcpurple_buddy_privkey_cb), | 458 _("OK"), G_CALLBACK(silcpurple_buddy_privkey_cb), |
459 _("Cancel"), G_CALLBACK(silcpurple_buddy_privkey_cb), | 459 _("Cancel"), G_CALLBACK(silcpurple_buddy_privkey_cb), |
460 gc->account, NULL, NULL, p); | 460 purple_connection_get_account(gc), NULL, NULL, p); |
461 | 461 |
462 silc_client_list_free(sg->client, sg->conn, clients); | 462 silc_client_list_free(sg->client, sg->conn, clients); |
463 } | 463 } |
464 | 464 |
465 static void | 465 static void |
684 if (strlen(who) > 1 && who[0] == '*') | 684 if (strlen(who) > 1 && who[0] == '*') |
685 nick = who + 1; | 685 nick = who + 1; |
686 if (strlen(who) > 2 && who[0] == '*' && who[1] == '@') | 686 if (strlen(who) > 2 && who[0] == '*' && who[1] == '@') |
687 nick = who + 2; | 687 nick = who + 2; |
688 | 688 |
689 b = purple_find_buddy(gc->account, nick); | 689 b = purple_find_buddy(purple_connection_get_account(gc), nick); |
690 if (b) { | 690 if (b) { |
691 /* See if we have this buddy's public key. If we do use that | 691 /* See if we have this buddy's public key. If we do use that |
692 to search the details. */ | 692 to search the details. */ |
693 gpointer proto_data; | 693 gpointer proto_data; |
694 filename = purple_blist_node_get_string((PurpleBlistNode *)b, "public-key"); | 694 filename = purple_blist_node_get_string((PurpleBlistNode *)b, "public-key"); |