# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1186799903 0
# Node ID 7ee44399f2eacdb6cd1e3326cc552fa97d1b730c
# Parent  ab6d2763b8d8966035c2d40f8288ea43d6002604# Parent  d346544e9c301cebc31a9c6ac4548018c2bfcbdf
merge of '86fd5e0d8b80a9da3103e850c97f1e04a2333961'
     and 'de036ba6c410a050410bd2536265355cd0dd600e'

diff -r ab6d2763b8d8 -r 7ee44399f2ea libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sat Aug 11 02:38:23 2007 +0000
@@ -2809,6 +2809,7 @@
 	va_list ap;
 	guint16 reason;
 	char *destn;
+	PurpleNotifyUserInfo *user_info;
 
 	va_start(ap, fr);
 	reason = (guint16) va_arg(ap, unsigned int);
@@ -2818,12 +2819,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;