X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.h;h=f10d8739362bafa4081b0cc7338c4670fa361ea4;hp=037859717e67072a4e10513fbe08e00bb08118c5;hb=1086c27e5c28f025850f513f513583720b5057a4;hpb=13ce31f99b59609ff39a22bc8293234a753e4872

diff --git a/src/modest-account-mgr-helpers.h b/src/modest-account-mgr-helpers.h
index 0378597..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,7 +148,7 @@ 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
@@ -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);
 
 
 /**