changeset
propagate from branch 'im.pidgin.pidgin' (head e57706b32d2afc8079bc09609277b3c3da68e759)
Tue, 05 Aug 2008 16:54:24 +0000
- author
- Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
- date
- Tue, 05 Aug 2008 16:54:24 +0000
- branch
- soc.2008.masterpassword
- changeset 33980
- b09e03f63c8b
- parent 33979
- 1beb705b5bac (current diff)
- parent 23960
- e57706b32d2a (diff)
- child 33981
- 8c8fe2e5bbcd
propagate from branch 'im.pidgin.pidgin' (head e57706b32d2afc8079bc09609277b3c3da68e759)
to branch 'im.pidgin.soc.2008.masterpassword' (head 1beb705b5baca20960afd52e8082626d07571816)
--- a/libpurple/protocols/yahoo/yahoo_picture.c Mon Aug 04 22:49:44 2008 +0000 +++ b/libpurple/protocols/yahoo/yahoo_picture.c Tue Aug 05 16:54:24 2008 +0000 @@ -27,6 +27,7 @@ #include "accountopt.h" #include "blist.h" #include "debug.h" +#include "privacy.h" #include "prpl.h" #include "proxy.h" #include "util.h" @@ -109,6 +110,11 @@ l = l->next; } + if (!purple_privacy_check(purple_connection_get_account(gc), who)) { + purple_debug_info("yahoo", "Picture packet from %s dropped.\n", who); + return; + } + /* Yahoo IM 6 spits out 0.png as the URL if the buddy icon is not set */ if (who && got_icon_info && url && !g_ascii_strncasecmp(url, "http://", 7)) { /* TODO: make this work p2p, try p2p before the url */
