[telepathy-mission-control/master] mcd-account: don't migrate if the keyring daemon is not available

Jonny Lamb jonny.lamb at collabora.co.uk
Tue Sep 15 03:51:35 PDT 2009


Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 src/mcd-account.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mcd-account.c b/src/mcd-account.c
index 2ad37bd..132ae92 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -368,6 +368,9 @@ _mcd_account_migrate_secrets (McdAccount *account)
     if (priv->manager == NULL || priv->protocol_name == NULL)
         return;
 
+    if (!gnome_keyring_is_available ())
+      return;
+
     params = mcd_manager_get_parameters (priv->manager, priv->protocol_name);
 
     for (p = params; p->name != NULL; p++)
@@ -379,8 +382,6 @@ _mcd_account_migrate_secrets (McdAccount *account)
 
         }
     }
-
-
 }
 #endif
 
-- 
1.5.6.5



More information about the telepathy-commits mailing list