# HG changeset patch # User Sadrul Habib Chowdhury # Date 1182028677 0 # Node ID 3a1f328cc6a85f9cc3bcfa43dbdd636aa7e0b3fa # Parent 9b9e202eb4493480cc4cdeea746ec4351e7e04e3 Use _notify_userinfo instead of _notify_error when there's an error retrieving user information. Fixes #1692. References #387. diff -r 9b9e202eb449 -r 3a1f328cc6a8 libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Sat Jun 16 20:34:35 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sat Jun 16 21:17:57 2007 +0000 @@ -2827,6 +2827,7 @@ va_list ap; guint16 reason; char *destn; + PurpleNotifyUserInfo *user_info; va_start(ap, fr); reason = (guint16) va_arg(ap, unsigned int); @@ -2836,12 +2837,12 @@ if (destn == NULL) return 1; + user_info = purple_notify_user_info_new(); buf = g_strdup_printf(_("User information not available: %s"), (reason < msgerrreasonlen) ? _(msgerrreason[reason]) : _("Unknown reason.")); - if (!purple_conv_present_error(destn, purple_connection_get_account((PurpleConnection*)od->gc), buf)) { - g_free(buf); - buf = g_strdup_printf(_("User information for %s unavailable:"), destn); - purple_notify_error(od->gc, NULL, buf, (reason < msgerrreasonlen) ? _(msgerrreason[reason]) : _("Unknown reason.")); - } + purple_notify_user_info_add_pair(user_info, NULL, buf); + purple_notify_userinfo(od->gc, destn, user_info, NULL, NULL); + purple_notify_user_info_destroy(user_info); + purple_conv_present_error(destn, purple_connection_get_account(od->gc), buf); g_free(buf); return 1;