Mercurial > pidgin.yaz
diff libpurple/protocols/qq/group_opt.c @ 21570:dccfd999ffe7
merge of '76c07fcb434a2a7aa289734bb221c171a376d73b'
and 'bad7c4c4e108d186fa8527e487d174e67ae7c0c1'
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Sat, 17 Nov 2007 17:27:48 +0000 |
parents | a20ef7180680 |
children | 5bf38e411fda |
line wrap: on
line diff
--- a/libpurple/protocols/qq/group_opt.c Sun Nov 11 16:45:19 2007 +0000 +++ b/libpurple/protocols/qq/group_opt.c Sat Nov 17 17:27:48 2007 +0000 @@ -121,9 +121,9 @@ g_return_if_fail(g != NULL && g->gc != NULL && g->member > 0); qq_send_packet_get_info(g->gc, g->member, TRUE); /* we want to see window */ - purple_request_action_with_hint(g->gc, NULL, _("Do you want to approve the request?"), "", 2, + purple_request_action(g->gc, NULL, _("Do you want to approve the request?"), "", 2, purple_connection_get_account(g->gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_CONV, g, 2, + g, 2, _("Reject"), G_CALLBACK(qq_group_reject_application_with_struct), _("Approve"), G_CALLBACK(qq_group_approve_application_with_struct)); } @@ -137,13 +137,13 @@ msg2 = g_strdup(_("Enter your reason:")); nombre = uid_to_purple_name(g->member); - purple_request_input_with_hint(g->gc, /* title */ NULL, msg1, msg2, + purple_request_input(g->gc, /* title */ NULL, msg1, msg2, _("Sorry, you are not my type..."), /* multiline */ TRUE, /* masked */ FALSE, /* hint */ NULL, _("Send"), G_CALLBACK(_qq_group_reject_application_real), _("Cancel"), G_CALLBACK(_qq_group_do_nothing_with_struct), purple_connection_get_account(g->gc), nombre, NULL, - PURPLE_REQUEST_UI_HINT_CONV, g); + g); g_free(msg1); g_free(msg2); @@ -388,13 +388,13 @@ g->gc = gc; g->uid = internal_group_id; - purple_request_action_with_hint(gc, _("QQ Qun Operation"), + purple_request_action(gc, _("QQ Qun Operation"), _("You have successfully created a Qun"), _ ("Would you like to set up the Qun details now?"), 1, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_CONV, g, 2, + g, 2, _("Setup"), G_CALLBACK(qq_group_setup_with_gc_and_uid), _("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid)); }