Mercurial > pidgin
diff libgaim/protocols/jabber/jabber.c @ 15203:f814b2df9cce
[gaim-migrate @ 17993]
Blocking on Google Talk. Our Privacy API sucks so bad that even with no prior support for blocking in Jabber, this has no interface changes. If someone wanted to implement the deprecated Jabber privacy lists API, though, that would be ok by me.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Thu, 14 Dec 2006 04:56:54 +0000 |
| parents | bbeb1dfcb25b |
| children | 4bf7801a2539 |
line wrap: on
line diff
--- a/libgaim/protocols/jabber/jabber.c Thu Dec 14 04:17:02 2006 +0000 +++ b/libgaim/protocols/jabber/jabber.c Thu Dec 14 04:56:54 2006 +0000 @@ -41,6 +41,7 @@ #include "buddy.h" #include "chat.h" #include "disco.h" +#include "google.h" #include "iq.h" #include "jutil.h" #include "message.h" @@ -1041,7 +1042,6 @@ break; case JABBER_STREAM_CONNECTED: - jabber_roster_request(js); gpresence = gaim_account_get_presence(js->gc->account); status = gaim_presence_get_active_status(gpresence); jabber_presence_send(js->gc->account, status); @@ -1875,9 +1875,9 @@ jabber_roster_remove_buddy, /* remove_buddy */ NULL, /* remove_buddies */ NULL, /* add_permit */ - NULL, /* add_deny */ + jabber_google_roster_add_deny, /* add_deny */ NULL, /* rem_permit */ - NULL, /* rem_deny */ + jabber_google_roster_rem_deny, /* rem_deny */ NULL, /* set_permit_deny */ jabber_chat_join, /* join_chat */ NULL, /* reject_chat */