* modest-account-mgr*.[ch]:

[modest] / src / modest-account-mgr.h

diff --git a/src/modest-account-mgr.h b/src/modest-account-mgr.h
index 2ae7a21..4171581 100644 (file)
--- a/src/modest-account-mgr.h
+++ b/src/modest-account-mgr.h
@@ -33,8 +33,8 @@
 
 #include <glib-object.h>
 #include <modest-conf.h>
-#include <modest-account-keys.h>
-#include <modest-protocol-mgr.h>
+#include <modest-defs.h>
+#include <modest-protocol-info.h>
 
 G_BEGIN_DECLS
 
@@ -64,33 +64,9 @@ struct _ModestAccountMgrClass {
                                    gpointer user_data);
 };
 
-/*
- * some convenience structs to get bulk data about an account 
- */
-struct _ModestServerAccountData {
-       gchar *account_name;
-       gchar *hostname;
-       gchar *username;
-       gchar *proto;
-       gchar *password;
-};
-typedef struct _ModestServerAccountData ModestServerAccountData;
-
-struct _ModestAccountData {
-       gchar *account_name;
-       gchar *full_name;
-       gchar *email;
-       gboolean enabled;
-       
-       ModestServerAccountData *transport_account;
-       ModestServerAccountData *store_account;
-};
-typedef struct _ModestAccountData ModestAccountData;
-
-
 
 /**
- * modest_ui_get_type:
+ * modest_account_mgr_get_type:
  * 
  * get the GType for ModestAccountMgr
  *  
@@ -148,13 +124,14 @@ gboolean modest_account_mgr_add_server_account    (ModestAccountMgr *self,
                                                   const gchar *hostname,
                                                   const gchar *username,
                                                   const gchar *password,
-                                                  const gchar *proto);  
+                                                  ModestProtocol proto);  
 
 /**
  * modest_account_mgr_remove_account:
  * @self: a ModestAccountMgr instance
  * @name: the name of the account to remove
- * @err: a GError ptr, or NULL to ignore.
+ * @server_account: TRUE if the account to remove is a server account
+ * @err: a #GError ptr, or NULL to ignore.
  * 
  * remove an existing account. the account with @name should already exist
  *
@@ -197,7 +174,7 @@ GSList*             modest_account_mgr_account_names    (ModestAccountMgr *self, GEr
 GSList*  modest_account_mgr_search_server_accounts  (ModestAccountMgr *self,
                                                     const gchar*       account_name,
                                                     ModestProtocolType type,
-                                                    const gchar*       proto);
+                                                    ModestProtocol     proto);
 
 /**
  * modest_account_mgr_account_exists:
@@ -216,55 +193,6 @@ gboolean   modest_account_mgr_account_exists         (ModestAccountMgr *self,
                                                           gboolean server_account,
                                                           GError **err);
 
-/**
- * modest_account_mgr_get_account_data:
- * @self: a ModestAccountMgr instance
- * @name: the name of the account
- * 
- * get information about an account
- *
- * Returns: a ModestAccountData structure with information about the account.
- * the data should not be changed, and be freed with modest_account_mgr_free_account_data
- */
-ModestAccountData *modest_account_mgr_get_account_data     (ModestAccountMgr *self,
-                                                           const gchar* name);
-
-
-/**
- * modest_account_mgr_free_account_data:
- * @self: a ModestAccountMgr instance
- * @data: a ModestAccountData instance
- * 
- * free the account data structure
- */
-void       modest_account_mgr_free_account_data     (ModestAccountMgr *self,
-                                                    ModestAccountData *data);
-
-/**
- * modest_account_mgr_account_set_enabled
- * @self: a ModestAccountMgr instance
- * @name: the account name 
- * @enabled: if TRUE, the account will be enabled, if FALSE, it will be disabled
- * 
- * enable/disabled an account
- *
- * Returns: TRUE if it worked, FALSE otherwise
- */
-gboolean modest_account_mgr_account_set_enabled (ModestAccountMgr *self, const gchar* name,
-                                                gboolean enabled);
-
-
-/**
- * modest_account_mgr_account_get_enabled:
- * @self: a ModestAccountMgr instance
- * @name: the account name to check
- *
- * check whether a certain account is enabled
- *
- * Returns: TRUE if it is enabled, FALSE otherwise
- */
-gboolean modest_account_mgr_account_get_enabled (ModestAccountMgr *self, const gchar* name);
-
 
 /**
  * modest_account_mgr_get_account_string:
@@ -285,7 +213,6 @@ gchar*              modest_account_mgr_get_string     (ModestAccountMgr *self,
                                                   gboolean server_account,
                                                   GError **err);
 
-
 /**
  * modest_account_mgr_get_account_int:
  * @self: a ModestAccountMgr instance