Fix modest_tny_msg_header_get_all_recipients_list (in case from is empty)

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

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index e680756..9a96912 100644 (file)
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -35,6 +35,7 @@
 #include <string.h>
 #include <strings.h>
 #include <modest-account-protocol.h>
+#include <modest-utils.h>
 
 static const gchar * null_means_empty (const gchar * str);
 
@@ -459,7 +460,7 @@ modest_account_mgr_load_server_settings (ModestAccountMgr *self, const gchar* na
        gchar *hostname, *username, *pwd, *uri, *proto, *auth, *sec;
 
        if (!modest_account_mgr_account_exists (self, name, TRUE)) {
-               g_message ("%s account %s does not exist", __FUNCTION__, name);
+               g_warning ("%s account %s does not exist", __FUNCTION__, name);
                return NULL;
        }
 
@@ -707,7 +708,7 @@ modest_account_mgr_load_account_settings (ModestAccountMgr *self,
                                                                    store_settings);
                        g_object_unref (store_settings);
                } else {
-                       g_message ("%s can not load server settings. Account corrupted?", __FUNCTION__);
+                       g_warning ("%s can not load server settings. Account corrupted?", __FUNCTION__);
                        g_object_unref (settings);
                        return NULL;
                }
@@ -726,7 +727,7 @@ modest_account_mgr_load_account_settings (ModestAccountMgr *self,
                        modest_account_settings_set_transport_settings (settings, transport_settings);
                        g_object_unref (transport_settings);
                } else {
-                       g_message ("%s can not load server settings. Account corrupted?", __FUNCTION__);
+                       g_warning ("%s can not load server settings. Account corrupted?", __FUNCTION__);
                        g_object_unref (settings);
                        return NULL;
                }
@@ -856,34 +857,30 @@ gchar*
 modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name, const gchar *mailbox)
 {
        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,
-                                                                                      proto);
-                               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);
                }
        }
 
@@ -1182,3 +1179,105 @@ 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;
+}
+
+void
+modest_account_mgr_get_branding_from_recipient (ModestAccountMgr *mgr, 
+                                               const gchar *current_recipient, 
+                                               gchar **service_name,
+                                               const GdkPixbuf **service_icon,
+                                               guint64 icon_size)
+{
+       gchar *mailbox = NULL;
+       gchar *account_name;
+       ModestProtocol *protocol = NULL;
+
+       *service_name = NULL;
+       *service_icon = NULL;
+
+       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)) {
+                       gchar *name;
+                       const GdkPixbuf *icon;
+                       name = modest_account_protocol_get_service_name (MODEST_ACCOUNT_PROTOCOL (protocol),
+                                                                        account_name, mailbox);
+                       icon = modest_account_protocol_get_service_icon (MODEST_ACCOUNT_PROTOCOL (protocol),
+                                                                        account_name, mailbox, icon_size);
+                       *service_name = name;
+                       *service_icon = icon;
+               }
+       }
+
+}
+