Mercurial > pidgin.yaz
changeset 19972:c4ac3aa20ea2
Fixing usernick.c and, for some strange reason, request.h
| author | Gabriel Schulhof <nix@go-nix.ca> |
|---|---|
| date | Wed, 12 Sep 2007 19:57:45 +0000 |
| parents | e10ed6060df3 |
| children | 64df2ef5a7b6 |
| files | libpurple/protocols/jabber/usernick.c libpurple/request.h |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/usernick.c Wed Sep 12 19:49:14 2007 +0000 +++ b/libpurple/protocols/jabber/usernick.c Wed Sep 12 19:57:45 2007 +0000 @@ -77,7 +77,7 @@ purple_request_input(js->gc, _("Set User Nickname"), _("Please specify a new nickname for you."), _("This information is visible to all contacts on your contact list, so choose something appropriate."), oldnickname, FALSE, FALSE, NULL, _("Set"), PURPLE_CALLBACK(do_nick_set), _("Cancel"), NULL, - purple_connection_get_account(js->gc), NULL, NULL, js); + purple_connection_get_account(js->gc), NULL, NULL, "blist", js); } static void do_nick_set_nick(PurplePluginAction *action) {
--- a/libpurple/request.h Wed Sep 12 19:49:14 2007 +0000 +++ b/libpurple/request.h Wed Sep 12 19:57:45 2007 +0000 @@ -1186,6 +1186,7 @@ * @param account The PurpleAccount associated with this request, or NULL if none is * @param who The username of the buddy assocaited with this request, or NULL if none is * @param conv The PurpleConversation associated with this request, or NULL if none is + * @param ui_hint UI hint * @param user_data The data to pass to the callback. * * @return A UI-specific handle. @@ -1197,7 +1198,7 @@ const char *ok_text, GCallback ok_cb, const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - void *user_data); + const char *ui_hint, void *user_data); /** * Prompts the user for multiple-choice input.