X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.h;h=f10d8739362bafa4081b0cc7338c4670fa361ea4;hp=8df2c76a1b13000326533891cddb4f0f50e4068d;hb=02102b8b1899e7a60565e6f2f0f7373b408ce99f;hpb=7929406e046ed92142ff337bd9161e6a16e1d04e;ds=sidebyside

diff --git a/src/modest-account-mgr-helpers.h b/src/modest-account-mgr-helpers.h
index 8df2c76..f10d873 100644
--- a/src/modest-account-mgr-helpers.h
+++ b/src/modest-account-mgr-helpers.h
@@ -125,6 +125,19 @@ gboolean modest_account_mgr_set_signature (ModestAccountMgr *self, const gchar*
  */
 gchar* modest_account_mgr_get_signature (ModestAccountMgr *self, const gchar* name, 
 	gboolean* use_signature);
+
+gchar *modest_account_mgr_get_signature_from_recipient (ModestAccountMgr *self, const gchar *recipient,
+							gboolean *use_signature);
+
+void modest_account_mgr_get_branding_from_recipient (ModestAccountMgr *mgr, 
+						     const gchar *current_recipient, 
+						     gchar **service_name,
+						     const GdkPixbuf **service_icon,
+						     guint64 icon_size);
+
+gboolean modest_account_mgr_account_is_multimailbox (ModestAccountMgr *mgr,
+						     const gchar *account_name, 
+						     ModestProtocol **mmb_protocol);
 	
 /**
  * modest_account_mgr_get_store_protocol:
@@ -135,12 +148,12 @@ gchar* modest_account_mgr_get_signature (ModestAccountMgr *self, const gchar* na
  *
  * Returns: The protocol type.
  */
-ModestTransportStoreProtocol modest_account_mgr_get_store_protocol (ModestAccountMgr *self, const gchar* name);
+ModestProtocolType modest_account_mgr_get_store_protocol (ModestAccountMgr *self, const gchar* name);
 
 /**
  * modest_account_mgr_set_connection_specific_smtp
  * @self: a ModestAccountMgr instance
- * @connection_name: A libconic IAP connection name
+ * @connection_id: A libconic IAP connection name
  * @server_account_name: a server account name to use for this connection.
  * 
  * Specify a server account to use with the specific connection for this account.
@@ -148,19 +161,19 @@ ModestTransportStoreProtocol modest_account_mgr_get_store_protocol (ModestAccoun
  * Returns: TRUE if it worked, FALSE otherwise
  */
 gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self, 
-					 const gchar* connection_name, const gchar* server_account_name);
+					 const gchar* connection_id, const gchar* server_account_name);
 
 /**
  * modest_account_mgr_remove_connection_specific_smtp
  * @self: a ModestAccountMgr instance
- * @connection_name: A libconic IAP connection name
+ * @connection_id: A libconic IAP connection name
  * 
  * Disassociate a server account to use with the specific connection for this account.
  *
  * Returns: TRUE if it worked, FALSE otherwise
  */				 
 gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *self, 
-	const gchar* connection_name);
+	const gchar* connection_id);
 
 /**
  * modest_account_mgr_get_use_connection_specific_smtp
@@ -184,14 +197,14 @@ gboolean modest_account_mgr_set_use_connection_specific_smtp (ModestAccountMgr *
 /**
  * modest_account_mgr_get_connection_specific_smtp
  * @self: a ModestAccountMgr instance
- * @connection_name: A libconic IAP connection name
+ * @connection_id: A libconic IAP connection id
  * 
  * Retrieve a server account to use with this specific connection for this account.
  *
  * Returns: a server account name to use for this connection, or NULL if none is specified.
  */			 
 gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self, 
-							const gchar* connection_name);
+							const gchar* connection_id);
 
 
 /**
@@ -309,7 +322,7 @@ void  modest_account_mgr_set_server_account_hostname (ModestAccountMgr *self,
  *
  * Returns: The secure authentication enum value.
  */
-ModestAuthProtocol modest_account_mgr_get_server_account_secure_auth (ModestAccountMgr *self, 
+ModestProtocolType modest_account_mgr_get_server_account_secure_auth (ModestAccountMgr *self, 
 								      const gchar* account_name);
 
 /**
@@ -322,7 +335,7 @@ ModestAuthProtocol modest_account_mgr_get_server_account_secure_auth (ModestAcco
  */
 void modest_account_mgr_set_server_account_secure_auth (ModestAccountMgr *self, 
 							const gchar* account_name, 
-							ModestAuthProtocol secure_auth);
+							ModestProtocolType secure_auth);
 	
 /**
  * modest_server_account_data_get_security:
@@ -331,10 +344,10 @@ void modest_account_mgr_set_server_account_secure_auth (ModestAccountMgr *self,
  *
  * Gets the security method for this server account.
  *
- * Returns: The security enum value.
+ * Returns: The security connection protocol.
  */
-ModestConnectionProtocol modest_account_mgr_get_server_account_security (ModestAccountMgr *self, 
-									 const gchar* account_name);
+ModestProtocolType modest_account_mgr_get_server_account_security (ModestAccountMgr *self, 
+								   const gchar* account_name);
 
 /**
  * modest_account_mgr_set_server_account_security:
@@ -345,24 +358,26 @@ ModestConnectionProtocol modest_account_mgr_get_server_account_security (ModestA
  */
 void modest_account_mgr_set_server_account_security (ModestAccountMgr *self, 
 						     const gchar* account_name, 
-						     ModestConnectionProtocol security);
+						     ModestProtocolType security);
 
 gboolean modest_account_mgr_save_server_settings (ModestAccountMgr *self,
 						  ModestServerAccountSettings *settings);
 
 ModestServerAccountSettings *modest_account_mgr_load_server_settings (ModestAccountMgr *self,
-								      const gchar *account_name);
+								      const gchar *account_name,
+								      gboolean is_transport_not_store);
 
 /**
  * modest_account_mgr_get_from_string
  * @self: a #ModestAccountMgr instance
  * @name: the account name
+ * @mailbox: the mailbox
  *
  * get the From: string for some account; ie. "Foo Bar" <foo.bar@cuux.yy>"
  *
  * Returns: the newly allocated from-string, or NULL in case of error
  */
-gchar * modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name);
+gchar * modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name, const gchar *mailbox);
 
 
 /**