X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr.h;h=e296e0e94e705f72991b5973069327491064e8c5;hp=05873b96013a8f236336173762b8148ab927de6c;hb=3d97ccb4c2ac55b9afe04fbd4e5c780a87b5f089;hpb=e89a59542dc457b92443a0af5e7dc4cc03ac6eb2

diff --git a/src/modest-account-mgr.h b/src/modest-account-mgr.h
index 05873b9..e296e0e 100644
--- a/src/modest-account-mgr.h
+++ b/src/modest-account-mgr.h
@@ -64,28 +64,23 @@ struct _ModestAccountMgrClass {
 				    gpointer user_data);
 };
 
-/*
- * some convenience structs to get bulk data about an account 
- */
-struct _ModestServerAccountData {
+typedef struct {
 	gchar *account_name;
 	gchar *hostname;
 	gchar *username;
 	ModestProtocol proto;
 	gchar *password;
-};
-typedef struct _ModestServerAccountData ModestServerAccountData;
+} ModestServerAccountData;
 
-struct _ModestAccountData {
+typedef struct {
 	gchar *account_name;
-	gchar *full_name;
+	gchar *display_name;
+	gchar *fullname;
 	gchar *email;
 	gboolean enabled;
-	
 	ModestServerAccountData *transport_account;
 	ModestServerAccountData *store_account;
-};
-typedef struct _ModestAccountData ModestAccountData;
+} ModestAccountData;
 
 
 
@@ -167,6 +162,32 @@ gboolean        modest_account_mgr_remove_account         (ModestAccountMgr *sel
 							   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
+ * The function does a sanity check, an if it's not returning NULL,
+ * it is a valid account
+ */
+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_names:
@@ -218,30 +239,6 @@ gboolean	modest_account_mgr_account_exists	  (ModestAccountMgr *self,
 							   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