Do ignore empty recipients when checking names

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

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index 6565f7a..9a96912 100644 (file)
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -460,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;
        }
 
@@ -708,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;
                }
@@ -727,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;
                }
@@ -869,7 +869,7 @@ modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name, c
                                                                        name,
                                                                        TNY_ACCOUNT_TYPE_TRANSPORT);
        if (transport_account) {
-               proto = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO, TRUE);
+               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 (),
@@ -1251,3 +1251,33 @@ modest_account_mgr_get_signature_from_recipient (ModestAccountMgr *mgr,
        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;
+               }
+       }
+
+}
+