2007-06-07 Murray Cumming <murrayc@murrayc.com>

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

diff --git a/src/modest-account-mgr-helpers.h b/src/modest-account-mgr-helpers.h
index b06b9e1..b09818e 100644 (file)
--- 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. */
-       ModestSecureAuthentication   secure_auth;
-       ModestSecureConnection   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.
  */
-ModestSecureAuthentication
+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, 
-       ModestSecureAuthentication 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.
  */
-ModestSecureConnection
+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, 
-       ModestSecureConnection security);
+                                   ModestConnectionProtocol security);
 
 ModestServerAccountData*
 modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* name);