[Amsn-commits] SF.net SVN: amsn:[12104] trunk/amsn/addressbook.tcl

[<vi...@us...>]

Revision: 12104
          http://amsn.svn.sourceforge.net/amsn/?rev=12104&view=rev
Author:   vivia
Date:     2010-07-30 18:37:44 +0000 (Fri, 30 Jul 2010)

Log Message:
-----------
baka... we should delete all contacts BEFORE reloading the real CL with ABFindAll, not AFTER we do, otherwise the contact list is empty. also, hopefully SynchronizeDone does not get called too early, when just one of the two SOAPs fails, causing an empty CL again, but I cannot test since problems seem fixed.

Modified Paths:
--------------
    trunk/amsn/addressbook.tcl

Modified: trunk/amsn/addressbook.tcl
===================================================================
--- trunk/amsn/addressbook.tcl	2010-07-30 13:52:27 UTC (rev 12103)
+++ trunk/amsn/addressbook.tcl	2010-07-30 18:37:44 UTC (rev 12104)
@@ -148,15 +148,6 @@
 				$self SynchronizeDone $callback $error
 			} 
 		} else {
-                        ::MSN::clearList FL
-                        ::MSN::clearList EL
-                        foreach username [::abook::getAllContacts] {
-                                ::abook::removeContactFromList $username "FL"
-                                ::abook::removeContactFromList $username "EL"
-                        }
-                        ::groups::Reset
-                        ::groups::Set 0 [trans nogroup]
-
 			set ab_done 1
 			if {$fm_done == 1 } {
 				$self SynchronizeDone $callback $error
@@ -303,6 +294,15 @@
 		if { [$soap GetStatus] == "success" } {
 			set xml  [$soap GetResponse]
 
+                        ::MSN::clearList FL
+                        ::MSN::clearList EL
+                        foreach username [::abook::getAllContacts] {
+                                ::abook::removeContactFromList $username "FL"
+                                ::abook::removeContactFromList $username "EL"
+                        }
+                        ::groups::Reset
+                        ::groups::Set 0 [trans nogroup]
+
 			set ownercid [GetXmlEntry $xml "soap:Envelope:soap:Body:ABFindAllResponse:ABFindAllResult:ab:abInfo:OwnerCID"]
 			if {$ownercid != "" } {
 				::abook::setPersonal cid $ownercid


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.