Mercurial > pidgin.yaz
diff libpurple/protocols/silc10/buddy.c @ 21560:665e04562de0
This merge has the effect of reverting the hinting code from trunk.
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 17 Nov 2007 00:12:30 +0000 |
parents | eb624956319a fcb848b2d669 |
children | d74ff4f23171 |
line wrap: on
line diff
--- a/libpurple/protocols/silc10/buddy.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc10/buddy.c Sat Nov 17 00:12:30 2007 +0000 @@ -309,9 +309,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, PURPLE_REQUEST_UI_HINT_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)); } @@ -462,11 +462,11 @@ p->client = sg->client; p->conn = sg->conn; p->client_id = *clients[0]->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, PURPLE_REQUEST_UI_HINT_BLIST, p); + gc->account, NULL, NULL, p); silc_free(clients); silc_free(nickname); @@ -1067,10 +1067,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, PURPLE_REQUEST_UI_HINT_BLIST, r); + purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r); } @@ -1080,10 +1080,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, PURPLE_REQUEST_UI_HINT_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)); } @@ -1180,7 +1180,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 " @@ -1190,7 +1190,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, PURPLE_REQUEST_UI_HINT_BLIST, r); + purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r); } static void