keyring: move from Empathy to tp-account-widgets

https://bugzilla.gnome.org/show_bug.cgi?id=699492

11 files changed, 69 insertions, 66 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);
 	}
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 13678a252..faf647a4c 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -41,7 +41,6 @@ libempathy_headers =				\
 	empathy-gsettings.h			\
 	empathy-presence-manager.h				\
 	empathy-individual-manager.h		\
-	empathy-keyring.h 			\
 	empathy-location.h			\
 	empathy-message.h			\
 	empathy-pkg-kit.h		\
@@ -72,7 +71,6 @@ libempathy_handwritten_source =				\
 	empathy-ft-handler.c				\
 	empathy-presence-manager.c					\
 	empathy-individual-manager.c			\
-	empathy-keyring.c				\
 	empathy-message.c				\
 	empathy-pkg-kit.c		\
 	empathy-request-util.c				\
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index cba4607a3..cbf7020ba 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -21,7 +21,8 @@
 #include "config.h"
 #include "empathy-auth-factory.h"
 
-#include "empathy-keyring.h"
+#include <tp-account-widgets/tpaw-keyring.h>
+
 #include "empathy-sasl-mechanisms.h"
 #include "empathy-server-sasl-handler.h"
 #include "empathy-server-tls-handler.h"
@@ -431,7 +432,7 @@ get_password_cb (GObject *source,
 {
   ObserveChannelsData *data = user_data;
 
-  if (empathy_keyring_get_account_password_finish (TP_ACCOUNT (source), result, NULL) == NULL)
+  if (tpaw_keyring_get_account_password_finish (TP_ACCOUNT (source), result, NULL) == NULL)
     {
       /* We don't actually mind if this fails, just let the approver
        * go ahead and take the channel. */
@@ -584,7 +585,7 @@ observe_channels (TpBaseClient *client,
           return;
         }
 
-      empathy_keyring_get_account_password_async (data->account,
+      tpaw_keyring_get_account_password_async (data->account,
           get_password_cb, data);
       tp_observe_channels_context_delay (context);
       return;
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index b18d1a735..e98134ebb 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -20,7 +20,8 @@
 #include "config.h"
 #include "empathy-server-sasl-handler.h"
 
-#include "empathy-keyring.h"
+#include <tp-account-widgets/tpaw-keyring.h>
+
 #include "empathy-sasl-mechanisms.h"
 #include "extensions.h"
 
@@ -67,7 +68,7 @@ empathy_server_sasl_handler_set_password_cb (GObject *source,
 {
   GError *error = NULL;
 
-  if (!empathy_keyring_set_account_password_finish (TP_ACCOUNT (source), result,
+  if (!tpaw_keyring_set_account_password_finish (TP_ACCOUNT (source), result,
           &error))
     {
       DEBUG ("Failed to set password: %s", error->message);
@@ -102,7 +103,7 @@ empathy_server_sasl_handler_get_password_async_cb (GObject *source,
 
   priv = EMPATHY_SERVER_SASL_HANDLER (user_data)->priv;
 
-  password = empathy_keyring_get_account_password_finish (TP_ACCOUNT (source),
+  password = tpaw_keyring_get_account_password_finish (TP_ACCOUNT (source),
       result, &error);
 
   if (password != NULL)
@@ -133,7 +134,7 @@ empathy_server_sasl_handler_init_async (GAsyncInitable *initable,
   priv->async_init_res = g_simple_async_result_new (G_OBJECT (self),
       callback, user_data, empathy_server_sasl_handler_new_async);
 
-  empathy_keyring_get_account_password_async (priv->account,
+  tpaw_keyring_get_account_password_async (priv->account,
       empathy_server_sasl_handler_get_password_async_cb, self);
 }
 
@@ -354,7 +355,7 @@ auth_cb (GObject *source,
   else
     {
       DEBUG ("Saving password in keyring");
-      empathy_keyring_set_account_password_async (priv->account,
+      tpaw_keyring_set_account_password_async (priv->account,
           priv->password, priv->save_password,
           empathy_server_sasl_handler_set_password_cb,
           NULL);
@@ -429,7 +430,7 @@ empathy_server_sasl_handler_provide_password (
   if (!may_save_response)
     {
       /* delete any password present, it shouldn't be there */
-      empathy_keyring_delete_account_password_async (priv->account, NULL, NULL);
+      tpaw_keyring_delete_account_password_async (priv->account, NULL, NULL);
     }
 
   /* Additionally, if we implement Ch.I.CredentialsStorage, inform that
diff --git a/libempathy/empathy-uoa-auth-handler.c b/libempathy/empathy-uoa-auth-handler.c
index 7e17b7089..eff3dd6d4 100644
--- a/libempathy/empathy-uoa-auth-handler.c
+++ b/libempathy/empathy-uoa-auth-handler.c
@@ -30,7 +30,8 @@
 #include <libsignon-glib/signon-identity.h>
 #include <libsignon-glib/signon-auth-session.h>
 
-#include "empathy-keyring.h"
+#include <tp-account-widgets/tpaw-keyring.h>
+
 #include "empathy-utils.h"
 #include "empathy-uoa-utils.h"
 #include "empathy-sasl-mechanisms.h"
@@ -293,7 +294,7 @@ set_account_password_cb (GObject *source,
   AuthContext *new_ctx;
   GError *error = NULL;
 
-  if (!empathy_keyring_set_account_password_finish (tp_account, result, &error))
+  if (!tpaw_keyring_set_account_password_finish (tp_account, result, &error))
     {
       DEBUG ("Failed to set empty password on UOA account: %s", error->message);
       auth_context_done (ctx);
@@ -360,7 +361,7 @@ empathy_uoa_auth_handler_start (EmpathyUoaAuthHandler *self,
        * To ask user to type his password SSO needs a SignonIdentity bound to
        * our account. Let's store an empty password. */
       DEBUG ("Couldn't create a signon session");
-      empathy_keyring_set_account_password_async (tp_account, "", FALSE,
+      tpaw_keyring_set_account_password_async (tp_account, "", FALSE,
           set_account_password_cb, ctx);
     }
   else
diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c
index 827a34eba..6ad0990aa 100644
--- a/src/empathy-sanity-cleaning.c
+++ b/src/empathy-sanity-cleaning.c
@@ -28,8 +28,8 @@
 #include <libaccounts-glib/ag-account-service.h>
 #include <libaccounts-glib/ag-manager.h>
 #include <libaccounts-glib/ag-service.h>
+#include <tp-account-widgets/tpaw-keyring.h>
 
-#include "empathy-keyring.h"
 #include "empathy-pkg-kit.h"
 #include "empathy-uoa-utils.h"
 #endif
@@ -318,7 +318,7 @@ uoa_set_account_password_cb (GObject *source,
   UoaMigrationData *data = user_data;
   GError *error = NULL;
 
-  if (!empathy_keyring_set_account_password_finish (data->new_account, result,
+  if (!tpaw_keyring_set_account_password_finish (data->new_account, result,
           &error))
     {
       DEBUG ("Error setting old account's password on the new one: %s\n",
@@ -338,7 +338,7 @@ uoa_get_account_password_cb (GObject *source,
   const gchar *password;
   GError *error = NULL;
 
-  password = empathy_keyring_get_account_password_finish (data->old_account,
+  password = tpaw_keyring_get_account_password_finish (data->old_account,
       result, &error);
   if (password == NULL)
     {
@@ -349,7 +349,7 @@ uoa_get_account_password_cb (GObject *source,
     }
   else
     {
-      empathy_keyring_set_account_password_async (data->new_account, password,
+      tpaw_keyring_set_account_password_async (data->new_account, password,
           TRUE, uoa_set_account_password_cb, data);
     }
 }
@@ -380,7 +380,7 @@ uoa_account_created_cb (GObject *source,
           tp_account_get_path_suffix (data->old_account));
 
       /* Migrate password as well */
-      empathy_keyring_get_account_password_async (data->old_account,
+      tpaw_keyring_get_account_password_async (data->old_account,
           uoa_get_account_password_cb, data);
     }
 }
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 4ca1989ee..397536b3a 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -1,5 +1,6 @@
 AM_CPPFLAGS =						\
 	$(ERROR_CFLAGS)					\
+	-I$(top_srcdir)/tp-account-widgets		\
 	-I$(top_srcdir)/libempathy                     	\
 	-I$(top_srcdir)/libempathy-gtk                 	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
diff --git a/tp-account-widgets/Makefile.am b/tp-account-widgets/Makefile.am
index 7c615e4b0..dbfffeeb5 100644
--- a/tp-account-widgets/Makefile.am
+++ b/tp-account-widgets/Makefile.am
@@ -22,6 +22,7 @@ libtp_account_widgets_sources =            	\
 	tpaw-account-widget-private.h		\
 	tpaw-account-widget-sip.c		\
 	tpaw-connection-managers.c		\
+	tpaw-keyring.c				\
 	tpaw-irc-network-chooser.c		\
 	tpaw-irc-network-chooser-dialog.c	\
 	tpaw-irc-network-dialog.c		\
@@ -37,6 +38,7 @@ libtp_account_widgets_headers =			\
 	tpaw-account-widget-irc.h		\
 	tpaw-account-widget-sip.h		\
 	tpaw-connection-managers.h		\
+	tpaw-keyring.h				\
 	tpaw-irc-network-chooser-dialog.h	\
 	tpaw-irc-network-chooser.h		\
 	tpaw-irc-network-dialog.h		\
diff --git a/tp-account-widgets/tpaw-account-settings.c b/tp-account-widgets/tpaw-account-settings.c
index a837a251e..5359cb7bd 100644
--- a/tp-account-widgets/tpaw-account-settings.c
+++ b/tp-account-widgets/tpaw-account-settings.c
@@ -22,7 +22,7 @@
 #include "tpaw-account-settings.h"
 
 #include "tpaw-connection-managers.h"
-#include "empathy-keyring.h"
+#include "tpaw-keyring.h"
 #include "empathy-presence-manager.h"
 #include "empathy-utils.h"
 
@@ -436,7 +436,7 @@ tpaw_account_settings_get_password_cb (GObject *source,
   const gchar *password;
   GError *error = NULL;
 
-  password = empathy_keyring_get_account_password_finish (TP_ACCOUNT (source),
+  password = tpaw_keyring_get_account_password_finish (TP_ACCOUNT (source),
       result, &error);
 
   if (error != NULL)
@@ -555,7 +555,7 @@ tpaw_account_settings_check_readyness (TpawAccountSettings *self)
 
       /* Make this call but don't block on its readiness. We'll signal
        * if it's updated later with ::password-retrieved. */
-      empathy_keyring_get_account_password_async (priv->account,
+      tpaw_keyring_get_account_password_async (priv->account,
           tpaw_account_settings_get_password_cb, self);
     }
 
@@ -1251,7 +1251,7 @@ tpaw_account_settings_set_password_cb (GObject *source,
     gpointer user_data)
 {
   tpaw_account_settings_processed_password (source, result, user_data,
-      empathy_keyring_set_account_password_finish);
+      tpaw_keyring_set_account_password_finish);
 }
 
 static void
@@ -1260,7 +1260,7 @@ tpaw_account_settings_delete_password_cb (GObject *source,
     gpointer user_data)
 {
   tpaw_account_settings_processed_password (source, result, user_data,
-      empathy_keyring_delete_account_password_finish);
+      tpaw_keyring_delete_account_password_finish);
 }
 
 static void
@@ -1335,13 +1335,13 @@ tpaw_account_settings_account_updated (GObject *source,
           /* FIXME: we shouldn't save the password if we
            * can't (MaySaveResponse=False) but we don't have API to check that
            * at this point (fdo #35382). */
-          empathy_keyring_set_account_password_async (priv->account,
+          tpaw_keyring_set_account_password_async (priv->account,
               priv->password, priv->remember_password,
               tpaw_account_settings_set_password_cb, settings);
         }
       else
         {
-          empathy_keyring_delete_account_password_async (priv->account,
+          tpaw_keyring_delete_account_password_async (priv->account,
               tpaw_account_settings_delete_password_cb, settings);
         }
 
@@ -1384,7 +1384,7 @@ tpaw_account_settings_created_cb (GObject *source,
           /* FIXME: we shouldn't save the password if we
            * can't (MaySaveResponse=False) but we don't have API to check that
            * at this point (fdo #35382). */
-          empathy_keyring_set_account_password_async (priv->account,
+          tpaw_keyring_set_account_password_async (priv->account,
               priv->password, priv->remember_password,
               tpaw_account_settings_set_password_cb,
               settings);
diff --git a/libempathy/empathy-keyring.c b/tp-account-widgets/tpaw-keyring.c
index 367346b0a..cc7eb25fc 100644
--- a/libempathy/empathy-keyring.c
+++ b/tp-account-widgets/tpaw-keyring.c
@@ -17,7 +17,7 @@
  */
 
 #include "config.h"
-#include "empathy-keyring.h"
+#include "tpaw-keyring.h"
 
 #include <glib/gi18n-lib.h>
 #include <libsecret/secret.h>
@@ -249,7 +249,7 @@ out:
 #endif
 
 void
-empathy_keyring_get_account_password_async (TpAccount *account,
+tpaw_keyring_get_account_password_async (TpAccount *account,
     GAsyncReadyCallback callback,
     gpointer user_data)
 {
@@ -260,7 +260,7 @@ empathy_keyring_get_account_password_async (TpAccount *account,
   g_return_if_fail (callback != NULL);
 
   simple = g_simple_async_result_new (G_OBJECT (account), callback,
-      user_data, empathy_keyring_get_account_password_async);
+      user_data, tpaw_keyring_get_account_password_async);
 
   account_id = tp_proxy_get_object_path (account) +
     strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
@@ -289,7 +289,7 @@ empathy_keyring_get_account_password_async (TpAccount *account,
 }
 
 void
-empathy_keyring_get_room_password_async (TpAccount *account,
+tpaw_keyring_get_room_password_async (TpAccount *account,
     const gchar *id,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -302,7 +302,7 @@ empathy_keyring_get_room_password_async (TpAccount *account,
   g_return_if_fail (callback != NULL);
 
   simple = g_simple_async_result_new (G_OBJECT (account), callback,
-      user_data, empathy_keyring_get_room_password_async);
+      user_data, tpaw_keyring_get_room_password_async);
 
   account_id = tp_proxy_get_object_path (account) +
     strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
@@ -318,21 +318,21 @@ empathy_keyring_get_room_password_async (TpAccount *account,
 }
 
 const gchar *
-empathy_keyring_get_account_password_finish (TpAccount *account,
+tpaw_keyring_get_account_password_finish (TpAccount *account,
     GAsyncResult *result,
     GError **error)
 {
   empathy_implement_finish_return_pointer (account,
-      empathy_keyring_get_account_password_async);
+      tpaw_keyring_get_account_password_async);
 }
 
 const gchar *
-empathy_keyring_get_room_password_finish (TpAccount *account,
+tpaw_keyring_get_room_password_finish (TpAccount *account,
     GAsyncResult *result,
     GError **error)
 {
   empathy_implement_finish_return_pointer (account,
-      empathy_keyring_get_room_password_async);
+      tpaw_keyring_get_room_password_async);
 }
 
 /* set */
@@ -546,7 +546,7 @@ uoa_set_account_password (TpAccount *tp_account,
 #endif
 
 void
-empathy_keyring_set_account_password_async (TpAccount *account,
+tpaw_keyring_set_account_password_async (TpAccount *account,
     const gchar *password,
     gboolean remember,
     GAsyncReadyCallback callback,
@@ -560,7 +560,7 @@ empathy_keyring_set_account_password_async (TpAccount *account,
   g_return_if_fail (password != NULL);
 
   simple = g_simple_async_result_new (G_OBJECT (account), callback,
-      user_data, empathy_keyring_set_account_password_async);
+      user_data, tpaw_keyring_set_account_password_async);
 
   account_id = tp_proxy_get_object_path (account) +
     strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
@@ -596,7 +596,7 @@ empathy_keyring_set_account_password_async (TpAccount *account,
 }
 
 void
-empathy_keyring_set_room_password_async (TpAccount *account,
+tpaw_keyring_set_room_password_async (TpAccount *account,
     const gchar *id,
     const gchar *password,
     GAsyncReadyCallback callback,
@@ -611,7 +611,7 @@ empathy_keyring_set_room_password_async (TpAccount *account,
   g_return_if_fail (password != NULL);
 
   simple = g_simple_async_result_new (G_OBJECT (account), callback,
-      user_data, empathy_keyring_set_room_password_async);
+      user_data, tpaw_keyring_set_room_password_async);
 
   account_id = tp_proxy_get_object_path (account) +
     strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
@@ -631,19 +631,19 @@ empathy_keyring_set_room_password_async (TpAccount *account,
 }
 
 gboolean
-empathy_keyring_set_account_password_finish (TpAccount *account,
+tpaw_keyring_set_account_password_finish (TpAccount *account,
     GAsyncResult *result,
     GError **error)
 {
-  empathy_implement_finish_void (account, empathy_keyring_set_account_password_async);
+  empathy_implement_finish_void (account, tpaw_keyring_set_account_password_async);
 }
 
 gboolean
-empathy_keyring_set_room_password_finish (TpAccount *account,
+tpaw_keyring_set_room_password_finish (TpAccount *account,
     GAsyncResult *result,
     GError **error)
 {
-  empathy_implement_finish_void (account, empathy_keyring_set_room_password_async);
+  empathy_implement_finish_void (account, tpaw_keyring_set_room_password_async);
 }
 
 /* delete */
@@ -669,7 +669,7 @@ items_delete_cb (GObject *source,
 }
 
 void
-empathy_keyring_delete_account_password_async (TpAccount *account,
+tpaw_keyring_delete_account_password_async (TpAccount *account,
     GAsyncReadyCallback callback,
     gpointer user_data)
 {
@@ -679,7 +679,7 @@ empathy_keyring_delete_account_password_async (TpAccount *account,
   g_return_if_fail (TP_IS_ACCOUNT (account));
 
   simple = g_simple_async_result_new (G_OBJECT (account), callback,
-      user_data, empathy_keyring_delete_account_password_async);
+      user_data, tpaw_keyring_delete_account_password_async);
 
   account_id = tp_proxy_get_object_path (account) +
     strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
@@ -710,9 +710,9 @@ empathy_keyring_delete_account_password_async (TpAccount *account,
 }
 
 gboolean
-empathy_keyring_delete_account_password_finish (TpAccount *account,
+tpaw_keyring_delete_account_password_finish (TpAccount *account,
     GAsyncResult *result,
     GError **error)
 {
-  empathy_implement_finish_void (account, empathy_keyring_delete_account_password_async);
+  empathy_implement_finish_void (account, tpaw_keyring_delete_account_password_async);
 }
diff --git a/libempathy/empathy-keyring.h b/tp-account-widgets/tpaw-keyring.h
index 8a426a037..bf2e65203 100644
--- a/libempathy/empathy-keyring.h
+++ b/tp-account-widgets/tpaw-keyring.h
@@ -16,48 +16,47 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __EMPATHY_KEYRING_H__
-#define __EMPATHY_KEYRING_H__
+#ifndef __TPAW_KEYRING_H__
+#define __TPAW_KEYRING_H__
 
 #include <gio/gio.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
-void empathy_keyring_get_account_password_async (TpAccount *account,
+void tpaw_keyring_get_account_password_async (TpAccount *account,
     GAsyncReadyCallback callback, gpointer user_data);
 
-const gchar * empathy_keyring_get_account_password_finish (TpAccount *account,
+const gchar * tpaw_keyring_get_account_password_finish (TpAccount *account,
     GAsyncResult *result, GError **error);
 
-void empathy_keyring_get_room_password_async (TpAccount *account,
+void tpaw_keyring_get_room_password_async (TpAccount *account,
     const gchar *id,
     GAsyncReadyCallback callback, gpointer user_data);
 
-const gchar * empathy_keyring_get_room_password_finish (TpAccount *account,
+const gchar * tpaw_keyring_get_room_password_finish (TpAccount *account,
     GAsyncResult *result, GError **error);
 
-void empathy_keyring_set_account_password_async (TpAccount *account,
+void tpaw_keyring_set_account_password_async (TpAccount *account,
     const gchar *password, gboolean remember, GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean empathy_keyring_set_account_password_finish (TpAccount *account,
+gboolean tpaw_keyring_set_account_password_finish (TpAccount *account,
     GAsyncResult *result, GError **error);
 
-void empathy_keyring_set_room_password_async (TpAccount *account,
+void tpaw_keyring_set_room_password_async (TpAccount *account,
     const gchar *id, const gchar *password, GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean empathy_keyring_set_room_password_finish (TpAccount *account,
+gboolean tpaw_keyring_set_room_password_finish (TpAccount *account,
     GAsyncResult *result, GError **error);
 
-void empathy_keyring_delete_account_password_async (TpAccount *account,
+void tpaw_keyring_delete_account_password_async (TpAccount *account,
     GAsyncReadyCallback callback, gpointer user_data);
 
-gboolean empathy_keyring_delete_account_password_finish (TpAccount *account,
+gboolean tpaw_keyring_delete_account_password_finish (TpAccount *account,
     GAsyncResult *result, GError **error);
 
 G_END_DECLS
 
-#endif /* __EMPATHY_KEYRING_H__ */
-
+#endif /* __TPAW_KEYRING_H__ */