X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-connection-specific-smtp-window.c;h=64513d299362e17ee8f092b826c3d08fa5988f2e;hp=2f6dbe42e2ba8b3e294f7f336b506629f011945f;hb=12408690b2cda835dc08e32d2185eef864955c73;hpb=191a72617b88b6c955005639d6a737538f4e10b4 diff --git a/src/maemo/modest-connection-specific-smtp-window.c b/src/maemo/modest-connection-specific-smtp-window.c index 2f6dbe4..64513d2 100644 --- a/src/maemo/modest-connection-specific-smtp-window.c +++ b/src/maemo/modest-connection-specific-smtp-window.c @@ -46,10 +46,13 @@ #include "modest-hildon-includes.h" #include "modest-platform.h" +#include "modest-maemo-utils.h" #include +#include -G_DEFINE_TYPE (ModestConnectionSpecificSmtpWindow, modest_connection_specific_smtp_window, GTK_TYPE_WINDOW); +G_DEFINE_TYPE (ModestConnectionSpecificSmtpWindow, modest_connection_specific_smtp_window, + GTK_TYPE_DIALOG); #define CONNECTION_SPECIFIC_SMTP_WINDOW_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_WINDOW, ModestConnectionSpecificSmtpWindowPrivate)) @@ -99,7 +102,7 @@ enum MODEL_COLS { MODEL_COL_ID = 1, /* libconic IAP ID: a string */ MODEL_COL_SERVER_ACCOUNT_NAME = 2, /* a string */ MODEL_COL_SERVER_NAME = 3, /* a string */ - MODEL_COL_SERVER_ACCOUNT_DATA = 4 /* a gpointer */ + MODEL_COL_SERVER_ACCOUNT_SETTINGS = 4 /* a gpointer */ }; @@ -114,14 +117,14 @@ modest_connection_specific_smtp_window_finalize (GObject *object) GtkTreeIter iter; gboolean valid = gtk_tree_model_get_iter_first (priv->model, &iter); while (valid) { - ModestServerAccountData *data = NULL; + ModestServerAccountSettings *server_settings = NULL; gtk_tree_model_get (priv->model, &iter, - MODEL_COL_SERVER_ACCOUNT_DATA, &data, + MODEL_COL_SERVER_ACCOUNT_SETTINGS, &server_settings, -1); - if (data) - modest_account_mgr_free_server_account_data (priv->account_manager, data); + if (server_settings) + g_object_unref (server_settings); /* Get next row: */ valid = gtk_tree_model_iter_next (priv->model, &iter); @@ -151,8 +154,10 @@ modest_connection_specific_smtp_window_class_init (ModestConnectionSpecificSmtpW /* #define DEBUG_WITHOUT_LIBCONIC 1 */ void -modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSpecificSmtpWindow *self, ModestAccountMgr *account_manager) +modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSpecificSmtpWindow *self, + ModestAccountMgr *account_manager) { +#ifdef MODEST_HAVE_CONIC ModestConnectionSpecificSmtpWindowPrivate *priv = CONNECTION_SPECIFIC_SMTP_WINDOW_GET_PRIVATE (self); priv->account_manager = account_manager; @@ -189,7 +194,7 @@ modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSp /* Get any already-associated connection-specific server account: */ gchar *server_account_name = NULL; server_account_name = modest_account_mgr_get_connection_specific_smtp ( - priv->account_manager, connection_name); + priv->account_manager, connection_id); /* Add the row to the model: */ GtkTreeIter iter; @@ -212,6 +217,7 @@ modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSp #endif update_model_server_names (self); +#endif /*MODEST_HAVE_CONIC */ } static void @@ -219,11 +225,12 @@ on_button_edit (GtkButton *button, gpointer user_data) { ModestConnectionSpecificSmtpWindow *self = MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (user_data); ModestConnectionSpecificSmtpWindowPrivate *priv = CONNECTION_SPECIFIC_SMTP_WINDOW_GET_PRIVATE (self); + ModestAccountMgr *mgr = modest_runtime_get_account_mgr (); gchar *id = NULL; gchar *connection_name = NULL; gchar *server_account_name = NULL; - ModestServerAccountData *data = NULL; + ModestServerAccountSettings *server_settings = NULL; GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview)); GtkTreeIter iter; GtkTreeModel *model = 0; @@ -232,7 +239,7 @@ on_button_edit (GtkButton *button, gpointer user_data) MODEL_COL_ID, &id, MODEL_COL_NAME, &connection_name, MODEL_COL_SERVER_ACCOUNT_NAME, &server_account_name, - MODEL_COL_SERVER_ACCOUNT_DATA, &data, + MODEL_COL_SERVER_ACCOUNT_SETTINGS, &server_settings, -1); /* printf("DEBUG: %s: BEFORE: connection-specific server_account_name=%s\n", __FUNCTION__, server_account_name); */ @@ -240,25 +247,24 @@ on_button_edit (GtkButton *button, gpointer user_data) * If not then we should check for it. */ /* Get existing server account data if a server account is already specified: */ - gboolean data_was_retrieved = FALSE; - if (server_account_name && !data) { - data = modest_account_mgr_get_server_account_data (priv->account_manager, - server_account_name); - if (data) - data_was_retrieved = TRUE; + gboolean settings_were_retrieved = FALSE; + if (server_account_name && !server_settings) { + server_settings = modest_account_mgr_load_server_settings(mgr, server_account_name); + if (server_settings) + settings_were_retrieved = TRUE; } GtkWidget * window = GTK_WIDGET (modest_connection_specific_smtp_edit_window_new ()); modest_connection_specific_smtp_edit_window_set_connection ( - MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW (window), id, connection_name, data); + MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW (window), id, connection_name, server_settings); /* Delete data, unless it was data from the rowmodel: */ - if (data_was_retrieved) { - modest_account_mgr_free_server_account_data (priv->account_manager, data); - data = NULL; + if (settings_were_retrieved) { + g_object_unref (server_settings); + server_settings = NULL; } - gtk_window_set_transient_for (GTK_WINDOW (self), GTK_WINDOW (window)); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (window)); gboolean dialog_finished = FALSE; while (!dialog_finished) @@ -268,52 +274,43 @@ on_button_edit (GtkButton *button, gpointer user_data) gtk_widget_hide (window); dialog_finished = TRUE; /* Delete any previous data for this row: */ - if (data) + if (server_settings) { - modest_account_mgr_free_server_account_data (priv->account_manager, data); - data = NULL; + g_object_unref (server_settings); + server_settings = NULL; } /* Get the new account data and save it in the row for later: * We free this in finalize(), * and save it to our configuration in * modest_connection_specific_smtp_window_save_server_accounts(). */ - data = modest_connection_specific_smtp_edit_window_get_settings ( - MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW (window), - priv->account_manager); + server_settings = modest_connection_specific_smtp_edit_window_get_settings ( + MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW (window)); - const gchar* server_name = data ? data->hostname : NULL; - gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter, - MODEL_COL_SERVER_ACCOUNT_DATA, data, - MODEL_COL_SERVER_NAME, server_name, - -1); + if (server_settings) { + gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter, + MODEL_COL_SERVER_ACCOUNT_SETTINGS, server_settings, + MODEL_COL_SERVER_NAME, modest_server_account_settings_get_hostname (server_settings), + -1); + } else { + gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter, + MODEL_COL_SERVER_ACCOUNT_SETTINGS, NULL, + MODEL_COL_SERVER_NAME, NULL, + MODEL_COL_SERVER_ACCOUNT_NAME, NULL, + -1); + } } else { - if (!modest_connection_specific_smtp_edit_window_is_dirty( - MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW(window))) - { - gtk_widget_hide(window); - dialog_finished = TRUE; - } - else - { - - gint response; - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window), - _("imum_nc_wizard_confirm_lose_changes")); - if (response == GTK_RESPONSE_OK) - { - gtk_widget_hide(window); - dialog_finished = TRUE; - } - } + gtk_widget_hide(window); + dialog_finished = TRUE; } } } g_free (connection_name); g_free (id); g_free (server_account_name); + update_model_server_names (self); } static void @@ -395,7 +392,8 @@ modest_connection_specific_smtp_window_init (ModestConnectionSpecificSmtpWindow /* The application must call modest_connection_specific_smtp_window_fill_with_connections(). */ - GtkWidget *vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT); + GtkWidget *vbox = GTK_DIALOG(self)->vbox; + //gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT); /* Introductory note: */ /* TODO: For some reason this label does not wrap. It is truncated. */ @@ -437,7 +435,7 @@ modest_connection_specific_smtp_window_init (ModestConnectionSpecificSmtpWindow g_signal_connect (G_OBJECT (button_cancel), "clicked", G_CALLBACK (on_button_cancel), self); - gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (vbox)); + //gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (vbox)); gtk_widget_show (vbox); /* Disable the Edit button when nothing is selected: */ @@ -459,6 +457,10 @@ modest_connection_specific_smtp_window_init (ModestConnectionSpecificSmtpWindow g_signal_connect (G_OBJECT (self), "key-press-event", G_CALLBACK (on_key_pressed), NULL); + + hildon_help_dialog_help_enable (GTK_DIALOG(self), + "applications_email_connectionsspecificsmtpconf", + modest_maemo_utils_get_osso_context()); } ModestConnectionSpecificSmtpWindow* @@ -472,6 +474,7 @@ modest_connection_specific_smtp_window_new (void) gboolean modest_connection_specific_smtp_window_save_server_accounts (ModestConnectionSpecificSmtpWindow *self) { + ModestAccountMgr *mgr = modest_runtime_get_account_mgr (); ModestConnectionSpecificSmtpWindowPrivate *priv = CONNECTION_SPECIFIC_SMTP_WINDOW_GET_PRIVATE (self); @@ -482,20 +485,22 @@ modest_connection_specific_smtp_window_save_server_accounts (ModestConnectionSpe /* Walk through the list, reading each row */ while (valid) { - gchar *id = NULL; + gchar *id = NULL; gchar *connection_name = NULL; gchar *server_account_name = NULL; - ModestServerAccountData *data = NULL; + gchar *server_name = NULL; + ModestServerAccountSettings *server_settings = NULL; gtk_tree_model_get (priv->model, &iter, MODEL_COL_ID, &id, MODEL_COL_NAME, &connection_name, + MODEL_COL_SERVER_NAME, &server_name, MODEL_COL_SERVER_ACCOUNT_NAME, &server_account_name, - MODEL_COL_SERVER_ACCOUNT_DATA, &data, + MODEL_COL_SERVER_ACCOUNT_SETTINGS, &server_settings, -1); gboolean success = TRUE; - if (id && data) { /* The presence of data suggests that there is something to save. */ + if (id && server_settings) { /* The presence of data suggests that there is something to save. */ if (!server_account_name) { /* Add a new server account, building a (non-human-visible) name: */ gchar *name_start = g_strdup_printf("specific_%s", connection_name); @@ -504,47 +509,39 @@ modest_connection_specific_smtp_window_save_server_accounts (ModestConnectionSpe g_assert (server_account_name); g_free (name_start); - success = modest_account_mgr_add_server_account (priv->account_manager, - server_account_name, - data->hostname, 0, - data->username, data->password, - MODEST_PROTOCOL_TRANSPORT_SMTP, - data->security, - data->secure_auth); - + modest_server_account_settings_set_account_name (server_settings, server_account_name); + success = modest_account_mgr_save_server_settings (mgr, server_settings); + if (success) { + TnyAccount *account = TNY_ACCOUNT (modest_tny_account_store_new_connection_specific_transport_account + (modest_runtime_get_account_store (), + server_account_name)); + if (account) + g_object_unref (account); + } + /* associate the specific server account with this connection for this account: */ success = success && modest_account_mgr_set_connection_specific_smtp ( - priv->account_manager, connection_name, server_account_name); - + priv->account_manager, id, server_account_name); + /* Save the new name in the treemodel, so it can be edited again later: */ gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter, MODEL_COL_SERVER_ACCOUNT_NAME, server_account_name, -1); } else { - /* Change an existing server account: */ - success = modest_account_mgr_set_string (priv->account_manager, server_account_name, - MODEST_ACCOUNT_HOSTNAME, data->hostname, TRUE /* server account */); - - modest_server_account_set_username (priv->account_manager, server_account_name, - data->username); - - modest_server_account_set_password (priv->account_manager, server_account_name, - data->password); - - modest_server_account_set_secure_auth (priv->account_manager, server_account_name, - data->secure_auth); - - modest_server_account_set_security (priv->account_manager, server_account_name, - data->security); - - modest_account_mgr_set_int (priv->account_manager, server_account_name, - MODEST_ACCOUNT_PORT, data->port, TRUE /* server account */); + modest_account_mgr_save_server_settings (mgr, server_settings); } + } else if (id && server_name && + !strcmp (server_name, _("mcen_ia_optionalsmtp_notdefined"))) { + modest_account_mgr_remove_connection_specific_smtp (priv->account_manager, + id); + gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter, + MODEL_COL_SERVER_ACCOUNT_NAME, NULL, -1); } g_free (connection_name); g_free (id); g_free (server_account_name); + g_free (server_name); if (!success) return FALSE; @@ -567,14 +564,21 @@ void update_model_server_names (ModestConnectionSpecificSmtpWindow *self) while (valid) { gchar *server_account_name = NULL; + ModestServerAccountSettings *server_settings = NULL; gtk_tree_model_get (priv->model, &iter, MODEL_COL_SERVER_ACCOUNT_NAME, &server_account_name, - -1); - - if (server_account_name) { + MODEL_COL_SERVER_ACCOUNT_SETTINGS, &server_settings, + -1); + if (server_settings && modest_server_account_settings_get_hostname (server_settings) + && (modest_server_account_settings_get_hostname (server_settings) [0] != '\0')) { + gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter, + MODEL_COL_SERVER_NAME, modest_server_account_settings_get_hostname (server_settings), + -1); + } else if (server_account_name) { + /* Get the server hostname and show it in the treemodel: */ - gchar *hostname = modest_account_mgr_get_string (priv->account_manager, - server_account_name, MODEST_ACCOUNT_HOSTNAME, TRUE /* server account */); + gchar *hostname = modest_account_mgr_get_server_account_hostname (priv->account_manager, + server_account_name); gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter, MODEL_COL_SERVER_NAME, hostname, -1);