Mercurial > pidgin
diff libpurple/protocols/novell/novell.c @ 21300:abbf74f4732b
propagate from branch 'im.pidgin.pidgin' (head e3fd21e6dabb99e5604e8337380353fcbe1a7279)
to branch 'im.pidgin.elb.make' (head 7422b9a549f752c05cc75f0c8e56fdd2bced034a)
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sat, 10 Nov 2007 16:17:54 +0000 |
| parents | 6de09629f091 |
| children | 38cc722159ff |
line wrap: on
line diff
--- a/libpurple/protocols/novell/novell.c Tue Nov 06 17:13:21 2007 +0000 +++ b/libpurple/protocols/novell/novell.c Sat Nov 10 16:17:54 2007 +0000 @@ -1912,10 +1912,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)); @@ -2165,7 +2165,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. */