X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.c;h=9a969125df9234d02089a5260e8cd5a9eb7cda8c;hp=bbf8f9d9df858984f3ed4ad7b5c865bc35585625;hb=d247599eff740c2a5a9f5729f3e51dc647250f89;hpb=31bdef88ae8d94fd15a4c0a369847c8e5db973ff diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c index bbf8f9d..9a96912 100644 --- a/src/modest-account-mgr-helpers.c +++ b/src/modest-account-mgr-helpers.c @@ -34,6 +34,8 @@ #include #include #include +#include +#include static const gchar * null_means_empty (const gchar * str); @@ -458,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; } @@ -706,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; } @@ -725,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; } @@ -738,15 +740,13 @@ void modest_account_mgr_save_account_settings (ModestAccountMgr *mgr, ModestAccountSettings *settings) { - g_return_if_fail (MODEST_IS_ACCOUNT_MGR (mgr)); - g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS (settings)); - const gchar *account_name; - const gchar *store_account_name; - const gchar *transport_account_name; ModestServerAccountSettings *store_settings; ModestServerAccountSettings *transport_settings; + g_return_if_fail (MODEST_IS_ACCOUNT_MGR (mgr)); + g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS (settings)); + account_name = modest_account_settings_get_account_name (settings); g_return_if_fail (account_name != NULL); @@ -770,20 +770,26 @@ modest_account_mgr_save_account_settings (ModestAccountMgr *mgr, modest_account_settings_get_use_connection_specific_smtp (settings)); store_settings = modest_account_settings_get_store_settings (settings); - store_account_name = modest_server_account_settings_get_account_name (store_settings); - if (store_settings != NULL) { + if (store_settings) { + const gchar *store_account_name; + store_account_name = modest_server_account_settings_get_account_name (store_settings); + if (store_account_name) + modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_STORE_ACCOUNT, + store_account_name, FALSE); modest_account_mgr_save_server_settings (mgr, store_settings); + g_object_unref (store_settings); } - modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_STORE_ACCOUNT, store_account_name, FALSE); - g_object_unref (store_settings); transport_settings = modest_account_settings_get_transport_settings (settings); - transport_account_name = modest_server_account_settings_get_account_name (transport_settings); - if (transport_settings != NULL) { + if (transport_settings) { + const gchar *transport_account_name; + transport_account_name = modest_server_account_settings_get_account_name (transport_settings); + if (transport_account_name) + modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, + transport_account_name, FALSE); modest_account_mgr_save_server_settings (mgr, transport_settings); + g_object_unref (transport_settings); } - modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, transport_account_name, FALSE); - g_object_unref (transport_settings); modest_account_mgr_set_enabled (mgr, account_name, TRUE); } @@ -848,22 +854,49 @@ modest_account_mgr_set_first_account_as_default (ModestAccountMgr *self) } gchar* -modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name) +modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name, const gchar *mailbox) { - gchar *fullname, *email, *from; + gchar *from; + gchar *transport_account; + gchar *proto; g_return_val_if_fail (self, NULL); g_return_val_if_fail (name, NULL); - fullname = modest_account_mgr_get_string (self, name,MODEST_ACCOUNT_FULLNAME, - FALSE); - email = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_EMAIL, - FALSE); - from = g_strdup_printf ("%s <%s>", - fullname ? fullname : "", - email ? email : ""); - g_free (fullname); - g_free (email); + from = NULL; + + 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); + } + } + + if (from == NULL) { + gchar *fullname, *email; + + fullname = modest_account_mgr_get_string (self, name,MODEST_ACCOUNT_FULLNAME, + FALSE); + email = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_EMAIL, + FALSE); + from = g_strdup_printf ("%s <%s>", + fullname ? fullname : "", + email ? email : ""); + g_free (fullname); + g_free (email); + } return from; } @@ -1146,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; + } + } + +} +