merge of 'bcf28ef7e8ff6bb7068d4f7f8f99127f0584b1c8' release-2.1.0

Sat, 11 Aug 2007 02:38:23 +0000

author
Sadrul Habib Chowdhury <sadrul@pidgin.im>
date
Sat, 11 Aug 2007 02:38:23 +0000
branch
release-2.1.0
changeset 19311
0b6c4677e52b
parent 18190
bcf28ef7e8ff (current diff)
parent 19310
a33e763a2034 (diff)
child 19312
005f215dcdd8

merge of 'bcf28ef7e8ff6bb7068d4f7f8f99127f0584b1c8'
and 'a33e763a2034405abb0ff0aa152b3eaa1e2377f6'

libpurple/protocols/oscar/oscar.c file | annotate | diff | comparison | revisions
--- 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;

mercurial