diff options
| author | Emanuele Aina <emanuele.aina@collabora.com> | 2013-04-04 21:20:14 +0800 |
|---|---|---|
| committer | Emanuele Aina <emanuele.aina@collabora.com> | 2013-04-04 21:20:49 +0800 |
| commit | 9419483e04bfe9f6fba0828bdeed7c260c8a22db (patch) | |
| tree | 50f618b54ff9ae2ab5bedb9591b8e6434308d008 | |
| parent | f5d311ec7a8e609dbd94914e15d2bd983f05224c (diff) | |
| download | gsoc2013-empathy-9419483e04bfe9f6fba0828bdeed7c260c8a22db.tar gsoc2013-empathy-9419483e04bfe9f6fba0828bdeed7c260c8a22db.tar.gz gsoc2013-empathy-9419483e04bfe9f6fba0828bdeed7c260c8a22db.tar.bz2 gsoc2013-empathy-9419483e04bfe9f6fba0828bdeed7c260c8a22db.tar.lz gsoc2013-empathy-9419483e04bfe9f6fba0828bdeed7c260c8a22db.tar.xz gsoc2013-empathy-9419483e04bfe9f6fba0828bdeed7c260c8a22db.tar.zst gsoc2013-empathy-9419483e04bfe9f6fba0828bdeed7c260c8a22db.zip | |
keyring: Drop legacy function after the libsecret migration
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 10 | ||||
| -rw-r--r-- | libempathy/empathy-keyring.c | 6 | ||||
| -rw-r--r-- | libempathy/empathy-keyring.h | 2 |
3 files changed, 2 insertions, 16 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index ed0d27cc8..63364b3a2 100644 --- 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 e7872f1b0..40667342f 100644 --- 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 6471099f9..8a426a037 100644 --- 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); |