X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.h;h=b09818e93aa694f26723894e30bc2f8a5db6db08;hb=55708b6454e3fe93a7cc9f7ee5c0b06e95998506;hp=67b6959789faf2e643435cc2840b56cc6e6d5cc7;hpb=b587d015280efc78a756a9271b9e1c2075757dca;p=modest

diff --git a/src/modest-account-mgr-helpers.h b/src/modest-account-mgr-helpers.h
index 67b6959..b09818e 100644
--- a/src/modest-account-mgr-helpers.h
+++ b/src/modest-account-mgr-helpers.h
@@ -45,12 +45,12 @@ typedef struct {
 	gchar            *hostname;
 	gchar            *username;
 	gchar	         *uri; /*< Only for mbox and maildir accounts. */
-	ModestProtocol    proto; /*< The store or transport. Not ORed. */
+	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 {
@@ -228,6 +228,14 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s
 					 const gchar* connection_name);
 
 /**
+ * modest_account_mgr_get_has_connection_specific_smtp
+ * @self: a ModestAccountMgr instance
+ * @name: the account name
+ * @result: Whether this account uses any connection-specific smtp server accounts.
+ */	
+gboolean modest_account_mgr_get_has_connection_specific_smtp (ModestAccountMgr *self, const gchar* account_name);
+
+/**
  * modest_account_mgr_get_connection_specific_smtp
  * @self: a ModestAccountMgr instance
  * @name: the account name
@@ -326,7 +334,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 +347,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 +358,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 +370,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);