Mercurial > pidgin.yaz
changeset 29780:72b059116c82
merge of 'b88c4f72aa3d87a41d0ae232164801f4e1aeca1a'
and 'bbcf4976b4db49082dcd52239fe155eb95c4ee1a'
| author | andrew.victor@mxit.com |
|---|---|
| date | Mon, 18 Jan 2010 20:41:11 +0000 |
| parents | de1aec9b9368 (diff) 76b32e235e7c (current diff) |
| children | 232fcf1755d6 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/mxit/mxit.c Sat Jan 16 23:47:26 2010 +0000 +++ b/libpurple/protocols/mxit/mxit.c Mon Jan 18 20:41:11 2010 +0000 @@ -263,6 +263,10 @@ if ( !contact ) return NULL; + /* subscription state is Pending, Rejected or Deleted */ + if ( contact->subtype != MXIT_SUBTYPE_BOTH ) + return "not-authorized"; + switch ( contact-> type ) { case MXIT_TYPE_JABBER : /* external contacts via MXit */ case MXIT_TYPE_MSN :