Mercurial > pidgin

diff libpurple/protocols/oscar/family_locate.c @ 30363:b7b399914d21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved an error handler from oscar.c to family_locate.c.
author ivan.komarov@soc.pidgin.im
date Sun, 30 May 2010 19:08:35 +0000
parents 9881f18b95b1
children 420907755a2f
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_locate.c	Sun May 30 19:01:30 2010 +0000
+++ b/libpurple/protocols/oscar/family_locate.c	Sun May 30 19:08:35 2010 +0000
@@ -1225,8 +1225,6 @@
 static int
 error(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
-	int ret = 0;
-	aim_rxcallback_t userfunc;
 	aim_snac_t *snac2;
 	guint16 reason;
 	char *bn;
@@ -1253,14 +1251,12 @@
 
 	reason = byte_stream_get16(bs);
 
-	/* Notify the user that we do not have info for this buddy */
-	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-		ret = userfunc(od, conn, frame, reason, bn);
+	oscar_user_info_display_error(od, reason, bn);
 
 	g_free(snac2->data);
 	g_free(snac2);
 
-	return ret;
+	return 1;
 }
 
 /*