From 9a7c60a3e2160297c7fceaa5f535ce9e7085f61e Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 30 Jun 2010 09:18:44 -0700
Subject: [PATCH] Added wait on signon failure due to update contacts failing

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 6d7b95b72b..350d7fca9b 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -271,7 +271,7 @@ class MSN {
                         // NS: >>> OUT
                         $this->ns_writeln("OUT");
                         @fclose($this->NSfp);
-                        $this->error = 'Passport authenticated fail!';
+                        $this->error = 'Passport authentication failed!';
                         return false;
                     }
 
@@ -358,7 +358,10 @@ class MSN {
             }
 
             // Update contacts
-            if ($this->UpdateContacts() === false) continue;
+            if ($this->UpdateContacts() === false) {
+                $this->signonFailure('');
+                continue;
+            }
 
             // Get membership lists
             if (($this->aContactList = $this->getMembershipList()) === false) {
@@ -480,7 +483,9 @@ class MSN {
     * @return void
     */
     private function signonFailure($message) {
-        $this->debug_message($message);
+    	if(!empty($message)) {
+            $this->debug_message($message);
+    	}
         $this->callHandler('ConnectFailed');
         $this->NSRetryWait($this->retry_wait);
     }