Mercurial > pidgin.yaz
comparison libpurple/protocols/silc/buddy.c @ 21353:8ae227dca885
merge of '00bf7296307f96f5c68d6e5edf219fb4a50bb947'
and '3468b1f73a715bd59ad22726232214da77cf67f7'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 16 Nov 2007 23:27:07 +0000 |
parents | d4f95419be45 73c5f5bfeb39 |
children | fcb848b2d669 |
comparison
equal
deleted
inserted
replaced
21352:ca17c133d6c3 | 21353:8ae227dca885 |
---|---|
312 a->hostname = strdup(hostname); | 312 a->hostname = strdup(hostname); |
313 a->port = port; | 313 a->port = port; |
314 | 314 |
315 purple_request_action_with_hint(client->application, _("Key Agreement Request"), tmp, | 315 purple_request_action_with_hint(client->application, _("Key Agreement Request"), tmp, |
316 hostname ? tmp2 : NULL, 1, gc->account, client_entry->nickname, | 316 hostname ? tmp2 : NULL, 1, gc->account, client_entry->nickname, |
317 NULL, PURPLE_REQUEST_HINT_BLIST, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb), | 317 NULL, "blist", a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb), |
318 _("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb)); | 318 _("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb)); |
319 } | 319 } |
320 | 320 |
321 static void | 321 static void |
322 silcpurple_buddy_keyagr(PurpleBlistNode *node, gpointer data) | 322 silcpurple_buddy_keyagr(PurpleBlistNode *node, gpointer data) |
451 p->client_id = client_entry->id; | 451 p->client_id = client_entry->id; |
452 purple_request_input_with_hint(gc, _("IM With Password"), NULL, | 452 purple_request_input_with_hint(gc, _("IM With Password"), NULL, |
453 _("Set IM Password"), NULL, FALSE, TRUE, NULL, | 453 _("Set IM Password"), NULL, FALSE, TRUE, NULL, |
454 _("OK"), G_CALLBACK(silcpurple_buddy_privkey_cb), | 454 _("OK"), G_CALLBACK(silcpurple_buddy_privkey_cb), |
455 _("Cancel"), G_CALLBACK(silcpurple_buddy_privkey_cb), | 455 _("Cancel"), G_CALLBACK(silcpurple_buddy_privkey_cb), |
456 gc->account, NULL, NULL, PURPLE_REQUEST_HINT_BLIST, p); | 456 gc->account, NULL, NULL, "blist", p); |
457 | 457 |
458 silc_client_list_free(sg->client, sg->conn, clients); | 458 silc_client_list_free(sg->client, sg->conn, clients); |
459 } | 459 } |
460 | 460 |
461 static void | 461 static void |
1057 | 1057 |
1058 /* Open file selector to select the public key. */ | 1058 /* Open file selector to select the public key. */ |
1059 purple_request_file_with_hint(r->client->application, _("Open..."), NULL, FALSE, | 1059 purple_request_file_with_hint(r->client->application, _("Open..."), NULL, FALSE, |
1060 G_CALLBACK(silcpurple_add_buddy_ask_import), | 1060 G_CALLBACK(silcpurple_add_buddy_ask_import), |
1061 G_CALLBACK(silcpurple_add_buddy_ask_pk_cancel), | 1061 G_CALLBACK(silcpurple_add_buddy_ask_pk_cancel), |
1062 purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_HINT_BLIST, r); | 1062 purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, "blist", r); |
1063 | 1063 |
1064 } | 1064 } |
1065 | 1065 |
1066 static void | 1066 static void |
1067 silcpurple_add_buddy_ask_pk(SilcPurpleBuddyRes r) | 1067 silcpurple_add_buddy_ask_pk(SilcPurpleBuddyRes r) |
1070 g_snprintf(tmp, sizeof(tmp), _("The %s buddy is not present in the network"), | 1070 g_snprintf(tmp, sizeof(tmp), _("The %s buddy is not present in the network"), |
1071 r->b->name); | 1071 r->b->name); |
1072 purple_request_action_with_hint(r->client->application, _("Add Buddy"), tmp, | 1072 purple_request_action_with_hint(r->client->application, _("Add Buddy"), tmp, |
1073 _("To add the buddy you must import his/her public key. " | 1073 _("To add the buddy you must import his/her public key. " |
1074 "Press Import to import a public key."), 0, | 1074 "Press Import to import a public key."), 0, |
1075 purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_HINT_BLIST, r, 2, | 1075 purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, "blist", r, 2, |
1076 _("Cancel"), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb), | 1076 _("Cancel"), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb), |
1077 _("_Import..."), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb)); | 1077 _("_Import..."), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb)); |
1078 } | 1078 } |
1079 | 1079 |
1080 static SilcBool | 1080 static SilcBool |
1187 : _("More than one user was found with the same name. Select " | 1187 : _("More than one user was found with the same name. Select " |
1188 "the correct user from the list to add to the buddy list."), | 1188 "the correct user from the list to add to the buddy list."), |
1189 fields, | 1189 fields, |
1190 _("OK"), G_CALLBACK(silcpurple_add_buddy_select_cb), | 1190 _("OK"), G_CALLBACK(silcpurple_add_buddy_select_cb), |
1191 _("Cancel"), G_CALLBACK(silcpurple_add_buddy_select_cancel), | 1191 _("Cancel"), G_CALLBACK(silcpurple_add_buddy_select_cancel), |
1192 purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_HINT_BLIST, r); | 1192 purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, "blist", r); |
1193 } | 1193 } |
1194 | 1194 |
1195 static void | 1195 static void |
1196 silcpurple_add_buddy_resolved(SilcClient client, | 1196 silcpurple_add_buddy_resolved(SilcClient client, |
1197 SilcClientConnection conn, | 1197 SilcClientConnection conn, |