online-desktop r7272 - trunk/weblogindriver

[marinaz svn gnome org]

Author: marinaz
Date: Tue Oct 21 21:14:55 2008
New Revision: 7272
URL: http://svn.gnome.org/viewvc/online-desktop?rev=7272&view=rev

Log:
Reload accounts from gconf only after we've received a response from the data model and obtained the supported account types from the server.


Modified:
   trunk/weblogindriver/web-login-driver

Modified: trunk/weblogindriver/web-login-driver
==============================================================================
--- trunk/weblogindriver/web-login-driver	(original)
+++ trunk/weblogindriver/web-login-driver	Tue Oct 21 21:14:55 2008
@@ -449,8 +449,6 @@
     ## a dict of the gconf values underneath that account directory
     self.__gconf_info = {}
 
-    self.__reload_from_gconf()
-
     if self.__model.ready:
         self.__on_ready()
 
@@ -676,6 +674,9 @@
 
   def __on_ready(self):
     self.__download_online_account_types()
+    # we can only reload stuff from gconf after we know the account types and we use the data model 
+    # in self.__download_online_account_types() to determine the base site link
+    self.__reload_from_gconf()
     if self.__model.self_resource != None:
       _logger.debug("will get online desktop accounts")
       query = self.__model.query_resource(self.__model.self_resource, "googleEnabledEmails; lovedAccounts +")