diff options
| author | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2007-08-11 02:38:23 +0000 |
|---|---|---|
| committer | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2007-08-11 02:38:23 +0000 |
| commit | 3af3d8c9de2154a1798bdd43defc82e968057e24 (patch) | |
| tree | 8def8ef0bffd3768220c339396d1d2f783079213 | |
| parent | 24e6fa513ea900b8cb0345e24cbcf062427ddace (diff) | |
| parent | fbd829891a255840a49b964318b3426b1d96eb18 (diff) | |
| download | pidgin-release-2.1.0.tar.gz | |
merge of 'bcf28ef7e8ff6bb7068d4f7f8f99127f0584b1c8'release-2.1.0
and 'a33e763a2034405abb0ff0aa152b3eaa1e2377f6'
| -rw-r--r-- | libpurple/protocols/oscar/oscar.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c index c85131f5be..816cfa7e2b 100644 --- a/libpurple/protocols/oscar/oscar.c +++ b/libpurple/protocols/oscar/oscar.c @@ -2809,6 +2809,7 @@ static int purple_parse_locerr(OscarData *od, FlapConnection *conn, FlapFrame *f 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 @@ static int purple_parse_locerr(OscarData *od, FlapConnection *conn, FlapFrame *f 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; |