keyring: Drop legacy function after the libsecret migration

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index ed0d27cc877dbbf6bcb706e1cc878822add7fc02..63364b3a2dc0912a30d2c8933ca0268d0a917621 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -3855,14 +3855,8 @@ provide_password_cb (GObject *tp_chat,
                return;
        }
 
-       if (empathy_keyring_is_available ()) {
-               /* ask whether they want to save the password */
-               chat_prompt_to_save_password (self, data);
-       } else {
-               /* Get rid of the password info bar finally */
-               gtk_widget_destroy (data->info_bar);
-               g_slice_free (PasswordData, data);
-       }
+    /* ask whether they want to save the password */
+    chat_prompt_to_save_password (self, data);
 
        /* Room joined */
        gtk_widget_set_sensitive (priv->hpaned, TRUE);

diff --git a/libempathy/empathy-keyring.c b/libempathy/empathy-keyring.c
index e7872f1b0d10476d86467ebdee25604812d3effa..40667342faaa8c1708fbe4751a73e857f71a13df 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

diff --git a/libempathy/empathy-keyring.h b/libempathy/empathy-keyring.h
index 6471099f9292cae7fb298468ff845472ea7a64ab..8a426a037bba225f0492de2c1e2f0cc314fa9188 100644 (file)
--- a/libempathy/empathy-keyring.h
+++ b/libempathy/empathy-keyring.h
@@ -24,8 +24,6 @@
 
 G_BEGIN_DECLS
 
-gboolean empathy_keyring_is_available (void);
-
 void empathy_keyring_get_account_password_async (TpAccount *account,
     GAsyncReadyCallback callback, gpointer user_data);