Mercurial > pidgin.yaz
diff libpurple/protocols/novell/novell.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 | 38cc722159ff fcb848b2d669 |
| children | c38d72677c8a 60f5abc6cf0c |
line wrap: on
line diff
--- a/libpurple/protocols/novell/novell.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/novell/novell.c Sat Nov 17 00:12:30 2007 +0000 @@ -1921,10 +1921,10 @@ /* Prompt the user */ gc = purple_account_get_connection(user->client_data); - purple_request_action_with_hint(gc, title, primary, secondary, + purple_request_action(gc, title, primary, secondary, PURPLE_DEFAULT_ACTION_NONE, purple_connection_get_account(gc), name, NULL, - PURPLE_REQUEST_UI_HINT_CONV, parms, 2, + 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_with_hint(gc, _("Server Address"),...); + * purple_request_fields(gc, _("Server Address"),...); */ /* ...but for now just error out with a nice message. */