Mercurial > pidgin.yaz
diff libpurple/protocols/novell/novell.c @ 21360:e747ac0c42d6
propagate from branch 'im.pidgin.pidgin.next.minor' (head bd8f1d754a1b94e5ade30c3b135178b236f7b49a)
to branch 'im.pidgin.cpw.resiak.disconnectreason' (head 5d84bcfaddc07cab4419ab9f04b31626421b97ff)
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Mon, 15 Oct 2007 10:45:46 +0000 |
| parents | ba41f2a60253 a20ef7180680 |
| children | 38cc722159ff |
line wrap: on
line diff
--- a/libpurple/protocols/novell/novell.c Sun Oct 14 21:20:50 2007 +0000 +++ b/libpurple/protocols/novell/novell.c Mon Oct 15 10:45:46 2007 +0000 @@ -1921,10 +1921,10 @@ /* Prompt the user */ gc = purple_account_get_connection(user->client_data); - purple_request_action(gc, title, primary, secondary, + purple_request_action_with_hint(gc, title, primary, secondary, PURPLE_DEFAULT_ACTION_NONE, purple_connection_get_account(gc), name, NULL, - parms, 2, + PURPLE_REQUEST_UI_HINT_CONV, parms, 2, _("Yes"), G_CALLBACK(_join_conference_cb), _("No"), G_CALLBACK(_reject_conference_cb)); @@ -2175,7 +2175,7 @@ if (server == NULL || *server == '\0') { /* TODO: Would be nice to prompt if not set! - * purple_request_fields(gc, _("Server Address"),...); + * purple_request_fields_with_hint(gc, _("Server Address"),...); */ /* ...but for now just error out with a nice message. */