Mercurial > pidgin.yaz
diff libpurple/protocols/silc/buddy.c @ 21099:51cf02dbdb0e
disapproval of revision 'c484d979c4fda4433a9633ff8b69bd8a395c9479'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 16 Nov 2007 23:30:03 +0000 |
parents | cab348e39751 |
children | fcb848b2d669 |
line wrap: on
line diff
--- a/libpurple/protocols/silc/buddy.c Sun Oct 14 00:26:00 2007 +0000 +++ b/libpurple/protocols/silc/buddy.c Fri Nov 16 23:30:03 2007 +0000 @@ -312,9 +312,9 @@ a->hostname = strdup(hostname); a->port = port; - purple_request_action_with_hint(client->application, _("Key Agreement Request"), tmp, + purple_request_action(client->application, _("Key Agreement Request"), tmp, hostname ? tmp2 : NULL, 1, gc->account, client_entry->nickname, - NULL, "blist", a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb), + NULL, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb), _("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb)); } @@ -449,11 +449,11 @@ p->client = sg->client; p->conn = sg->conn; p->client_id = client_entry->id; - purple_request_input_with_hint(gc, _("IM With Password"), NULL, + purple_request_input(gc, _("IM With Password"), NULL, _("Set IM Password"), NULL, FALSE, TRUE, NULL, _("OK"), G_CALLBACK(silcpurple_buddy_privkey_cb), _("Cancel"), G_CALLBACK(silcpurple_buddy_privkey_cb), - gc->account, NULL, NULL, "blist", p); + gc->account, NULL, NULL, p); silc_client_list_free(sg->client, sg->conn, clients); } @@ -1056,10 +1056,10 @@ } /* Open file selector to select the public key. */ - purple_request_file_with_hint(r->client->application, _("Open..."), NULL, FALSE, + purple_request_file(r->client->application, _("Open..."), NULL, FALSE, G_CALLBACK(silcpurple_add_buddy_ask_import), G_CALLBACK(silcpurple_add_buddy_ask_pk_cancel), - purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, "blist", r); + purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r); } @@ -1069,10 +1069,10 @@ char tmp[512]; g_snprintf(tmp, sizeof(tmp), _("The %s buddy is not present in the network"), r->b->name); - purple_request_action_with_hint(r->client->application, _("Add Buddy"), tmp, + purple_request_action(r->client->application, _("Add Buddy"), tmp, _("To add the buddy you must import his/her public key. " "Press Import to import a public key."), 0, - purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, "blist", r, 2, + purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r, 2, _("Cancel"), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb), _("_Import..."), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb)); } @@ -1179,7 +1179,7 @@ silc_free(fingerprint); } - purple_request_fields_with_hint(r->client->application, _("Add Buddy"), + purple_request_fields(r->client->application, _("Add Buddy"), _("Select correct user"), r->pubkey_search ? _("More than one user was found with the same public key. Select " @@ -1189,7 +1189,7 @@ fields, _("OK"), G_CALLBACK(silcpurple_add_buddy_select_cb), _("Cancel"), G_CALLBACK(silcpurple_add_buddy_select_cancel), - purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, "blist", r); + purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r); } static void