connection-managers: move from Empathy to tp-account-widgets

[empathy.git] / libempathy / empathy-keyring.c

diff --git a/libempathy/empathy-keyring.c b/libempathy/empathy-keyring.c
index e7872f1b0d10476d86467ebdee25604812d3effa..367346b0a6f0f0d10f4b1300877107e7b7efff06 100644 (file)
--- a/libempathy/empathy-keyring.c
+++ b/libempathy/empathy-keyring.c
@@ -49,12 +49,6 @@ static const SecretSchema room_keyring_schema =
       { "room-id", SECRET_SCHEMA_ATTRIBUTE_STRING },
       { NULL } } };
 
-gboolean
-empathy_keyring_is_available (void)
-{
-  return TRUE;
-}
-
 /* get */
 
 static void
@@ -662,7 +656,8 @@ items_delete_cb (GObject *source,
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
   GError *error = NULL;
 
-  if (!secret_password_clear_finish (result, &error))
+  secret_password_clear_finish (result, &error);
+  if (error != NULL)
     {
       g_simple_async_result_set_error (simple, TP_ERROR,
               TP_ERROR_DOES_NOT_EXIST, "%s", error->message);