# HG changeset patch # User Mark Doliner # Date 1201831532 0 # Node ID d5b65bead569fbf90ffe5acfc4314a15c66ae474 # Parent 0b11bc87b9a12c8a4286970b2484e72a200ad054 Yahoo! has no permit list, so get rid of the add_permit and rem_permit prpl callbacks. Right now they're basically a no-op. More specifically, purple_privacy_permit_add calls serv_add_permit which calls yahoo_add_permit which calls purple_privacy_permit_add (again) which exits because the buddy is already in the permit list. diff -r 0b11bc87b9a1 -r d5b65bead569 libpurple/protocols/yahoo/yahoo.c --- a/libpurple/protocols/yahoo/yahoo.c Fri Feb 01 01:57:53 2008 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Fri Feb 01 02:05:32 2008 +0000 @@ -61,22 +61,6 @@ #endif static void yahoo_set_status(PurpleAccount *account, PurpleStatus *status); -static void -yahoo_add_permit(PurpleConnection *gc, const char *who) -{ - purple_debug_info("yahoo", - "Permitting ID %s local contact rights for account %s\n", who, gc->account); - purple_privacy_permit_add(gc->account,who,TRUE); -} - -static void -yahoo_rem_permit(PurpleConnection *gc, const char *who) -{ - purple_debug_info("yahoo", - "Denying ID %s local contact rights for account %s\n", who, gc->account); - purple_privacy_permit_remove(gc->account,who,TRUE); -} - static void yahoo_update_status(PurpleConnection *gc, const char *name, YahooFriend *f) { char *status = NULL; @@ -4313,9 +4297,9 @@ NULL, /* add_buddies */ yahoo_remove_buddy, NULL, /*remove_buddies */ - yahoo_add_permit, + NULL, /* add_permit */ yahoo_add_deny, - yahoo_rem_permit, + NULL, /* rem_permit */ yahoo_rem_deny, yahoo_set_permit_deny, yahoo_c_join,