X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.c;h=c80fd3043210909071d367d16ed74caa6ab40bc2;hb=88a7d1cf118e00bd430bbb4432da92717cb2e02b;hp=0cb3db2239941c4d6bb2d936d3f7f9ac1eac4a06;hpb=bb2af3f3812101dd2947281c76030875d85c210a;p=modest

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index 0cb3db2..c80fd30 100644
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -34,6 +34,8 @@
 #include <modest-defs.h>
 #include <string.h>
 #include <strings.h>
+#include <modest-account-protocol.h>
+#include <modest-utils.h>
 
 static const gchar * null_means_empty (const gchar * str);
 
@@ -854,35 +856,31 @@ modest_account_mgr_set_first_account_as_default (ModestAccountMgr *self)
 gchar*
 modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name, const gchar *mailbox)
 {
-	gchar **from;
+	gchar *from;
+	gchar *transport_account;
+	gchar *proto;
 	
 	g_return_val_if_fail (self, NULL);
 	g_return_val_if_fail (name, NULL);
 
 	from = NULL;
 
-	if (mailbox) {
-		gchar *transport_account;
-		gchar *proto;
-
-		transport_account = modest_account_mgr_get_server_account_name (self,
-										name,
-										TNY_ACCOUNT_TYPE_TRANSPORT);
-		if (transport_account) {
-			proto = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO, TRUE);
-			if (proto != NULL) {
-				ModestProtocol *protocol = 
-					modest_protocol_registry_get_protocol_by_name (modest_runtime_get_protocol_registry (),
-										       MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS,
-										       TRUE);
-				if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) {
-					from = modest_account_protocol_get_from (MODEST_ACCOUNT_PROTOCOL (protocol),
-										 name,
-										 mailbox);
-				}
-				g_free (proto);
+	transport_account = modest_account_mgr_get_server_account_name (self,
+									name,
+									TNY_ACCOUNT_TYPE_TRANSPORT);
+	if (transport_account) {
+		proto = modest_account_mgr_get_string (self, transport_account, MODEST_ACCOUNT_PROTO, TRUE);
+		if (proto != NULL) {
+			ModestProtocol *protocol = 
+				modest_protocol_registry_get_protocol_by_name (modest_runtime_get_protocol_registry (),
+									       MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS,
+									       proto);
+			if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) {
+				from = modest_account_protocol_get_from (MODEST_ACCOUNT_PROTOCOL (protocol),
+									 name,
+									 mailbox);
 			}
-			
+			g_free (proto);
 		}
 	}
 
@@ -1181,3 +1179,75 @@ modest_account_mgr_set_user_email (ModestAccountMgr *self,
 				       email, 
 				       FALSE /* not server account */);
 }
+
+gboolean 
+modest_account_mgr_account_is_multimailbox (ModestAccountMgr *mgr,
+					    const gchar *account_name, 
+					    ModestProtocol **mmb_protocol)
+{
+	gchar *transport_account;
+	gboolean result = FALSE;
+
+	if (mmb_protocol)
+		*mmb_protocol = NULL;
+
+	transport_account = modest_account_mgr_get_server_account_name (mgr,
+									account_name,
+									TNY_ACCOUNT_TYPE_TRANSPORT);
+	if (transport_account) {
+		gchar *proto;
+		ModestProtocolRegistry *registry;
+
+		registry = modest_runtime_get_protocol_registry ();
+
+		proto = modest_account_mgr_get_string (mgr, transport_account, 
+						       MODEST_ACCOUNT_PROTO, TRUE);
+		if (proto != NULL) {
+			ModestProtocol *protocol = 
+				modest_protocol_registry_get_protocol_by_name (registry,
+									       MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS,
+									       proto);
+			if (protocol &&
+			    modest_protocol_registry_protocol_type_has_tag 
+			    (registry,
+			     modest_protocol_get_type_id (protocol),
+			     MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS)) {
+				if (mmb_protocol)
+					*mmb_protocol = protocol;
+				result = TRUE;
+			}
+			
+		}
+	}
+
+	return result;
+}
+
+gchar *
+modest_account_mgr_get_signature_from_recipient (ModestAccountMgr *mgr, 
+						 const gchar *current_recipient, 
+						 gboolean *has_signature)
+{
+	gchar *result = NULL;
+	gchar *mailbox = NULL;
+	gchar *account_name;
+	ModestProtocol *protocol = NULL;
+
+	*has_signature = FALSE;
+
+	account_name = modest_utils_get_account_name_from_recipient (current_recipient, &mailbox);
+	if (modest_account_mgr_account_is_multimailbox (mgr, account_name, &protocol)) {
+		if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) {
+			result = modest_account_protocol_get_signature (MODEST_ACCOUNT_PROTOCOL (protocol),
+									account_name, mailbox, 
+									has_signature);
+		}
+	}
+
+	if (result == NULL) {
+		result = modest_account_mgr_get_signature (mgr, 
+							   account_name, has_signature);
+	}
+	return result;
+}
+