Merge branch 'gnome-3-8'

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

diff --git a/libempathy/empathy-keyring.h b/libempathy/empathy-keyring.h
index 76cb4fbeb01c034c82393b1b0c0f56ece6284ae8..6471099f9292cae7fb298468ff845472ea7a64ab 100644 (file)
--- a/libempathy/empathy-keyring.h
+++ b/libempathy/empathy-keyring.h
@@ -20,8 +20,7 @@
 #define __EMPATHY_KEYRING_H__
 
 #include <gio/gio.h>
-
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
@@ -33,13 +32,27 @@ void empathy_keyring_get_account_password_async (TpAccount *account,
 const gchar * empathy_keyring_get_account_password_finish (TpAccount *account,
     GAsyncResult *result, GError **error);
 
+void empathy_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,
+    GAsyncResult *result, GError **error);
+
 void empathy_keyring_set_account_password_async (TpAccount *account,
-    const gchar *password, GAsyncReadyCallback callback,
+    const gchar *password, gboolean remember, GAsyncReadyCallback callback,
     gpointer user_data);
 
 gboolean empathy_keyring_set_account_password_finish (TpAccount *account,
     GAsyncResult *result, GError **error);
 
+void empathy_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,
+    GAsyncResult *result, GError **error);
+
 void empathy_keyring_delete_account_password_async (TpAccount *account,
     GAsyncReadyCallback callback, gpointer user_data);