diff options
author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-07-25 23:24:14 +0800 |
---|---|---|
committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 18:03:05 +0800 |
commit | 2d543808216afa7bd287ec78fa69a16f576652a3 (patch) | |
tree | 5af8d2a84927d1fbcc65bc9b960a42fc0f8f432a /libempathy-gtk | |
parent | 53a376be8d68d95c30cb66495d42d3c18947473f (diff) | |
download | gsoc2013-empathy-2d543808216afa7bd287ec78fa69a16f576652a3.tar gsoc2013-empathy-2d543808216afa7bd287ec78fa69a16f576652a3.tar.gz gsoc2013-empathy-2d543808216afa7bd287ec78fa69a16f576652a3.tar.bz2 gsoc2013-empathy-2d543808216afa7bd287ec78fa69a16f576652a3.tar.lz gsoc2013-empathy-2d543808216afa7bd287ec78fa69a16f576652a3.tar.xz gsoc2013-empathy-2d543808216afa7bd287ec78fa69a16f576652a3.tar.zst gsoc2013-empathy-2d543808216afa7bd287ec78fa69a16f576652a3.zip |
keyring: move from Empathy to tp-account-widgets
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'libempathy-gtk')
-rw-r--r-- | libempathy-gtk/empathy-chat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index e0460e527..5bdc7ba1b 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -33,6 +33,7 @@ #include "empathy-chat.h" #include <glib/gi18n-lib.h> +#include <tp-account-widgets/tpaw-keyring.h> #include "empathy-client-factory.h" #include "empathy-gsettings.h" @@ -40,7 +41,6 @@ #include "empathy-individual-store-channel.h" #include "empathy-individual-view.h" #include "empathy-input-text-view.h" -#include "empathy-keyring.h" #include "empathy-request-util.h" #include "empathy-search-bar.h" #include "empathy-smiley-manager.h" @@ -3735,7 +3735,7 @@ remember_password_infobar_response_cb (GtkWidget *info_bar, if (response_id == GTK_RESPONSE_OK) { DEBUG ("Saving room password"); - empathy_keyring_set_room_password_async (priv->account, + tpaw_keyring_set_room_password_async (priv->account, empathy_tp_chat_get_id (priv->tp_chat), data->password, NULL, NULL); @@ -4071,7 +4071,7 @@ chat_room_got_password_cb (GObject *source, const gchar *password; GError *error = NULL; - password = empathy_keyring_get_room_password_finish (priv->account, + password = tpaw_keyring_get_room_password_finish (priv->account, result, &error); if (error != NULL) { @@ -4093,7 +4093,7 @@ chat_password_needed_changed_cb (EmpathyChat *self) EmpathyChatPriv *priv = GET_PRIV (self); if (tp_channel_password_needed (TP_CHANNEL (priv->tp_chat))) { - empathy_keyring_get_room_password_async (priv->account, + tpaw_keyring_get_room_password_async (priv->account, empathy_tp_chat_get_id (priv->tp_chat), chat_room_got_password_cb, self); } |