#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);
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;
}
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;
}
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;
}
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);
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);
}
}
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;
}
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;
+ }
+ }
+
+}
+
projects / modest / blobdiff