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

[marinaz svn gnome org]

Author: marinaz
Date: Mon Oct 27 04:20:34 2008
New Revision: 7279
URL: http://svn.gnome.org/viewvc/online-desktop?rev=7279&view=rev

Log:
Use the default (session) keyring for storing passwords.

Remove account information from the keyring when the account is removed.


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

Modified: trunk/weblogindriver/web-login-driver
==============================================================================
--- trunk/weblogindriver/web-login-driver	(original)
+++ trunk/weblogindriver/web-login-driver	Mon Oct 27 04:20:34 2008
@@ -556,7 +556,8 @@
       if was_enabled:
           self.__enabled_accounts.remove(account)
           self.AccountDisabled(account.GetObjectPath())
-      del self.__all_accounts[account.GetObjectPath()] 
+      del self.__all_accounts[account.GetObjectPath()]
+      keyring.get_keyring().remove_logins(account.GetType(), account.GetUsername())
       _logger.debug("signalling AccountRemoved")    
       self.AccountRemoved(account.GetObjectPath())
       return

Modified: trunk/weblogindriver/weblogindriver/keyring.py
==============================================================================
--- trunk/weblogindriver/weblogindriver/keyring.py	(original)
+++ trunk/weblogindriver/weblogindriver/keyring.py	Mon Oct 27 04:20:34 2008
@@ -100,7 +100,7 @@
                 found = set()
                 
             for f in found:
-                gnomekeyring.item_delete_sync('session', f.item_id)
+                gnomekeyring.item_delete_sync('default', f.item_id)
   
     def store_login(self, account_type, username, password):
 
@@ -125,7 +125,7 @@
                 self.__fallback_items.add(ki)
 
         else:  
-            keyring_item_id = gnomekeyring.item_create_sync('session',
+            keyring_item_id = gnomekeyring.item_create_sync('default',
                                                             gnomekeyring.ITEM_GENERIC_SECRET,
                                                             "WebLoginDriver",
                                                             dict(appname="WebLoginDriver",