From: Richard L. <rl...@us...> - 2005-11-29 19:26:14
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2007/src/protocols/oscar Modified Files: oscar.c Log Message: 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. Index: oscar.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v retrieving revision 1.815 retrieving revision 1.816 diff -u -d -p -r1.815 -r1.816 --- oscar.c 29 Nov 2005 10:51:20 -0000 1.815 +++ oscar.c 29 Nov 2005 19:26:03 -0000 1.816 @@ -6156,13 +6156,23 @@ static int gaim_parse_searchreply(aim_se 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); |