* First steps to apply global and per-account settings to send&receive

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

diff --git a/src/modest-account-mgr-helpers.h b/src/modest-account-mgr-helpers.h
index 45ad0e0..f04d78f 100644 (file)
--- a/src/modest-account-mgr-helpers.h
+++ b/src/modest-account-mgr-helpers.h
@@ -44,13 +44,13 @@ typedef struct {
        gchar            *account_name;
        gchar            *hostname;
        gchar            *username;
-       gchar            *uri;
-       ModestProtocol    proto; /*< The store or transport. Not ORed. */
+       gchar            *uri; /*< Only for mbox and maildir accounts. */
+       ModestTransportStoreProtocol    proto; /*< The store or transport. Not ORed. */
        gchar            *password;
        time_t            last_updated;
-       gint             port; /* Or 0, if the default should be used. */
-       ModestProtocol   secure_auth;
-       ModestProtocol   security;
+       gint              port; /* Or 0, if the default should be used. */
+       ModestAuthProtocol   secure_auth;
+       ModestConnectionProtocol   security;
 } ModestServerAccountData;
 
 typedef struct {
@@ -326,7 +326,7 @@ modest_server_account_get_hostname (ModestAccountMgr *self, const gchar* account
  *
  * Returns: The secure authentication enum value.
  */
-ModestProtocol
+ModestAuthProtocol
 modest_server_account_get_secure_auth (ModestAccountMgr *self, const gchar* account_name);
 
 /**
@@ -339,7 +339,7 @@ modest_server_account_get_secure_auth (ModestAccountMgr *self, const gchar* acco
  */
 void
 modest_server_account_set_secure_auth (ModestAccountMgr *self, const gchar* account_name, 
-       ModestProtocol secure_auth);
+                                      ModestAuthProtocol secure_auth);
        
 /**
  * modest_server_account_data_get_security:
@@ -350,7 +350,7 @@ modest_server_account_set_secure_auth (ModestAccountMgr *self, const gchar* acco
  *
  * Returns: The security enum value.
  */
-ModestProtocol
+ModestConnectionProtocol
 modest_server_account_get_security (ModestAccountMgr *self, const gchar* account_name);
 
 /**
@@ -362,7 +362,7 @@ modest_server_account_get_security (ModestAccountMgr *self, const gchar* account
  */
 void
 modest_server_account_set_security (ModestAccountMgr *self, const gchar* account_name, 
-       ModestProtocol security);
+                                   ModestConnectionProtocol security);
 
 ModestServerAccountData*
 modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* name);