online-desktop r7283 - in trunk/weblogindriver: . weblogindriver

[marinaz svn gnome org]

Author: marinaz
Date: Tue Oct 28 05:37:02 2008
New Revision: 7283
URL: http://svn.gnome.org/viewvc/online-desktop?rev=7283&view=rev

Log:
Only try to add accounts for known types in the accounts dialog.


Modified:
   trunk/weblogindriver/web-login-driver
   trunk/weblogindriver/weblogindriver/accounts_dialog.py

Modified: trunk/weblogindriver/web-login-driver
==============================================================================
--- trunk/weblogindriver/web-login-driver	(original)
+++ trunk/weblogindriver/web-login-driver	Tue Oct 28 05:37:02 2008
@@ -690,13 +690,13 @@
   def __on_ready(self):
     _logger.debug("__on_ready got called")
     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
+    # we should only reload stuff from gconf after we possibly 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()
     self.__get_online_accounts()
 
   def __get_online_accounts(self):
-    _logger.debug("values %s %s" % (self.__model.global_resource.online, self.__model.self_resource != None))
     if self.__model.global_resource.online and self.__model.self_resource != None and self.__save_online_flag:
       _logger.debug("will get online desktop accounts")
       query = self.__model.query_resource(self.__model.self_resource, "googleEnabledEmails; lovedAccounts +")

Modified: trunk/weblogindriver/weblogindriver/accounts_dialog.py
==============================================================================
--- trunk/weblogindriver/weblogindriver/accounts_dialog.py	(original)
+++ trunk/weblogindriver/weblogindriver/accounts_dialog.py	Tue Oct 28 05:37:02 2008
@@ -321,7 +321,7 @@
                 _logger.error("onlineaccount for path %s was not found" % a_path)
                 return
 
-            if self.__account_types and a.GetType() not in self.__account_types:
+            if (self.__account_types and a.GetType() not in self.__account_types) or a.GetType() not in self.__all_account_types:
                 return 
 
             _logger.debug("account added %s" % a)