# HG changeset patch
# User andrew.victor@mxit.com
# Date 1263847271 0
# Node ID 72b059116c82c706173e50566b831193a7976ea7
# Parent  de1aec9b9368e161e36808ad912e91763817408a# Parent  76b32e235e7c3ed53bdd0c4f2c9819219bd807ea
merge of 'b88c4f72aa3d87a41d0ae232164801f4e1aeca1a'
     and 'bbcf4976b4db49082dcd52239fe155eb95c4ee1a'

diff -r 76b32e235e7c -r 72b059116c82 libpurple/protocols/mxit/mxit.c
--- 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 :
diff -r 76b32e235e7c -r 72b059116c82 libpurple/protocols/oscar/oscar.c