Mercurial > pidgin.yaz
diff src/protocols/oscar/oscar.c @ 12257:ca27de274225
[gaim-migrate @ 14559]
Patches from Bartosz Oler with some changes by me.
The summary of changes is:
1. Fix a silly bug I introduced when editing previous patches.
2. Add some error handling.
3. Unify some types.
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Tue, 29 Nov 2005 19:26:03 +0000 |
parents | 95fd673021f6 |
children | 0a9574ed62cd |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Tue Nov 29 18:25:12 2005 +0000 +++ b/src/protocols/oscar/oscar.c Tue Nov 29 19:26:03 2005 +0000 @@ -6156,13 +6156,23 @@ SNs = va_arg(ap, char *); va_end(ap); + results = gaim_notify_searchresults_new(); + + if (results == NULL) { + gaim_debug_error("oscar", "gaim_parse_searchreply: " + "Unable to display the search results.\n"); + gaim_notify_error(gc, NULL, + _("Unable to display the search results."), + NULL); + return 0; + } + secondary = g_strdup_printf( ngettext("The following screen name is associated with %s", "The following screen names are associated with %s", num), email); - results = gaim_notify_searchresults_new(); column = gaim_notify_searchresults_column_new("Screen name"); gaim_notify_searchresults_column_add(results, column);