Merge branch 'sasl'

[empathy.git] / libempathy / empathy-account-settings.h

diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
index 9bb6657e2479197c50f2ab172a4f256f33a80451..8f3634a195a396f1074ea53e4be733020b08b599 100644 (file)
--- a/libempathy/empathy-account-settings.h
+++ b/libempathy/empathy-account-settings.h
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <libempathy/empathy-account.h>
+#include <telepathy-glib/account.h>
 #include <telepathy-glib/connection-manager.h>
 
 G_BEGIN_DECLS
@@ -63,10 +63,11 @@ GType empathy_account_settings_get_type (void);
 EmpathyAccountSettings * empathy_account_settings_new (
     const gchar *connection_manager,
     const gchar *protocol,
+    const gchar *service,
     const char *display_name);
 
 EmpathyAccountSettings * empathy_account_settings_new_for_account (
-    EmpathyAccount *account);
+    TpAccount *account);
 
 gboolean empathy_account_settings_is_ready (EmpathyAccountSettings *settings);
 
@@ -74,11 +75,14 @@ const gchar *empathy_account_settings_get_cm (EmpathyAccountSettings *settings);
 const gchar *empathy_account_settings_get_protocol (
     EmpathyAccountSettings *settings);
 
-EmpathyAccount *empathy_account_settings_get_account (
+const gchar *empathy_account_settings_get_service (
+    EmpathyAccountSettings *settings);
+
+TpAccount *empathy_account_settings_get_account (
     EmpathyAccountSettings *settings);
 
 gboolean empathy_account_settings_has_account (
-    EmpathyAccountSettings *settings, EmpathyAccount *account);
+    EmpathyAccountSettings *settings, TpAccount *account);
 
 TpConnectionManagerParam *empathy_account_settings_get_tp_params (
     EmpathyAccountSettings *settings);
@@ -86,6 +90,9 @@ TpConnectionManagerParam *empathy_account_settings_get_tp_params (
 void empathy_account_settings_unset (EmpathyAccountSettings *settings,
     const gchar *param);
 
+void empathy_account_settings_discard_changes (
+    EmpathyAccountSettings *settings);
+
 const GValue *empathy_account_settings_get (EmpathyAccountSettings *settings,
   const gchar *param);
 
@@ -100,6 +107,9 @@ empathy_account_settings_get_default (EmpathyAccountSettings *settings,
 const gchar *empathy_account_settings_get_string (
     EmpathyAccountSettings *settings,
     const gchar *param);
+const gchar * const * empathy_account_settings_get_strv (
+    EmpathyAccountSettings *settings,
+    const gchar *param);
 
 gint32 empathy_account_settings_get_int32 (EmpathyAccountSettings *settings,
     const gchar *param);
@@ -114,6 +124,8 @@ gboolean empathy_account_settings_get_boolean (EmpathyAccountSettings *settings,
 
 void empathy_account_settings_set_string (EmpathyAccountSettings *settings,
     const gchar *param, const gchar *value);
+void empathy_account_settings_set_strv (EmpathyAccountSettings *settings,
+    const gchar *param, gchar **value);
 
 void empathy_account_settings_set_int32 (EmpathyAccountSettings *settings,
     const gchar *param, gint32 value);
@@ -130,6 +142,17 @@ void empathy_account_settings_set_boolean (EmpathyAccountSettings *settings,
 gchar *empathy_account_settings_get_icon_name (
   EmpathyAccountSettings *settings);
 
+void empathy_account_settings_set_icon_name_async (
+  EmpathyAccountSettings *settings,
+  const gchar *name,
+  GAsyncReadyCallback callback,
+  gpointer user_data);
+
+gboolean empathy_account_settings_set_icon_name_finish (
+  EmpathyAccountSettings *settings,
+  GAsyncResult *result,
+  GError **error);
+
 const gchar *empathy_account_settings_get_display_name (
   EmpathyAccountSettings *settings);
 
@@ -153,8 +176,19 @@ gboolean empathy_account_settings_apply_finish (
   GAsyncResult *result,
   GError **error);
 
+void empathy_account_settings_set_regex (EmpathyAccountSettings *settings,
+  const gchar *param,
+  const gchar *regex);
+
+gboolean empathy_account_settings_parameter_is_valid (
+    EmpathyAccountSettings *settings,
+    const gchar *param);
+
 gboolean empathy_account_settings_is_valid (EmpathyAccountSettings *settings);
 
+const TpConnectionManagerProtocol * empathy_account_settings_get_tp_protocol (
+    EmpathyAccountSettings *settings);
+
 G_END_DECLS
 
 #endif /* #ifndef __EMPATHY_ACCOUNT_SETTINGS_H__*/