ModestAccountMgr *account_manager;
};
-static gboolean on_key_pressed (GtkWidget *self, GdkEventKey *event, gpointer user_data);
+static void on_response (GtkDialog *dialog,
+ gint response,
+ gpointer user_data);
+
+/* static gboolean on_key_pressed (GtkWidget *self, GdkEventKey *event, gpointer user_data); */
static void
modest_connection_specific_smtp_window_get_property (GObject *object, guint property_id,
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 */
};
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);
/* 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;
- gtk_list_store_append (liststore, &iter);
- gtk_list_store_set(liststore, &iter,
- MODEL_COL_ID, connection_id,
- MODEL_COL_NAME, connection_name,
- MODEL_COL_SERVER_ACCOUNT_NAME, server_account_name,
- -1);
-
- g_free (server_account_name);
+ if (server_account_name) {
+ /* Add the row to the model: */
+ GtkTreeIter iter;
+ gtk_list_store_append (liststore, &iter);
+ gtk_list_store_set(liststore, &iter,
+ MODEL_COL_ID, connection_id,
+ MODEL_COL_NAME, connection_name,
+ MODEL_COL_SERVER_ACCOUNT_NAME, server_account_name,
+ -1);
+ g_free (server_account_name);
+ }
}
iter = g_slist_next (iter);
update_model_server_names (self);
#endif /*MODEST_HAVE_CONIC */
}
-
+
static void
-on_button_edit (GtkButton *button, gpointer user_data)
+on_button_edit (ModestConnectionSpecificSmtpWindow *self)
{
- 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;
if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
- gtk_tree_model_get (priv->model, &iter,
- MODEL_COL_ID, &id,
- MODEL_COL_NAME, &connection_name,
+ gtk_tree_model_get (priv->model, &iter,
+ 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); */
- /* TODO: Is 0 an allowed libconic IAP ID?
+ /* TODO: Is 0 an allowed libconic IAP ID?
* 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, TRUE);
+ 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),
+ GTK_WINDOW (self));
- gboolean dialog_finished = FALSE;
- while (!dialog_finished)
- {
- gint response = gtk_dialog_run (GTK_DIALOG (window));
- if (response == GTK_RESPONSE_OK) {
- gtk_widget_hide (window);
- dialog_finished = TRUE;
- /* Delete any previous data for this row: */
- if (data)
- {
- modest_account_mgr_free_server_account_data (priv->account_manager, data);
- data = 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);
-
- if (data) {
- gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter,
- MODEL_COL_SERVER_ACCOUNT_DATA, data,
- MODEL_COL_SERVER_NAME, data->hostname,
- -1);
- } else {
- gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter,
- MODEL_COL_SERVER_ACCOUNT_DATA, NULL,
- MODEL_COL_SERVER_NAME, NULL,
- MODEL_COL_SERVER_ACCOUNT_NAME, NULL,
- -1);
- }
+ gint response = gtk_dialog_run (GTK_DIALOG (window));
+ if (response == GTK_RESPONSE_OK) {
+
+ /* Delete any previous data for this row: */
+ if (server_settings) {
+ g_object_unref (server_settings);
+ server_settings = NULL;
}
- 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;
- }
- }
+
+ /* 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(). */
+ server_settings = modest_connection_specific_smtp_edit_window_get_settings (
+ MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW (window));
+
+ 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);
}
}
+ gtk_widget_destroy (window);
}
g_free (connection_name);
g_free (id);
}
static void
-on_button_cancel (GtkButton *button, gpointer user_data)
-{
- ModestConnectionSpecificSmtpWindow *self = MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (user_data);
-
- /* Hide the window.
- * The code that showed it will respond to the hide signal. */
- gtk_widget_hide (GTK_WIDGET (self));
-}
-
-static void
on_selection_changed (GtkTreeSelection *sel, ModestConnectionSpecificSmtpWindow *self)
{
ModestConnectionSpecificSmtpWindowPrivate *priv =
/* Show the column headers,
* which does not seem to be the default on Maemo.
- */
+ */
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(priv->treeview), TRUE);
/* name column:
gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (priv->treeview));
gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (scrolled_window), TRUE, TRUE, MODEST_MARGIN_HALF);
gtk_widget_show (GTK_WIDGET (priv->treeview));
-
- /* Add the buttons: */
- GtkWidget *hbox = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (hbox);
-
- priv->button_edit = gtk_button_new_from_stock (_("mcen_bd_edit"));
- gtk_box_pack_start (GTK_BOX (hbox), priv->button_edit, TRUE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (priv->button_edit);
- g_signal_connect (G_OBJECT (priv->button_edit), "clicked",
- G_CALLBACK (on_button_edit), self);
-
- GtkWidget *button_cancel = gtk_button_new_from_stock (_("mcen_bd_close"));
- gtk_box_pack_start (GTK_BOX (hbox), button_cancel, TRUE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (button_cancel);
- g_signal_connect (G_OBJECT (button_cancel), "clicked",
- G_CALLBACK (on_button_cancel), self);
-
- //gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (vbox));
gtk_widget_show (vbox);
+ /* Hack: we use the response apply to identify the click on the edit button */
+ priv->button_edit = gtk_dialog_add_button (GTK_DIALOG(self), _("mcen_bd_edit"), GTK_RESPONSE_APPLY);
+ gtk_dialog_add_button (GTK_DIALOG(self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
+
/* Disable the Edit button when nothing is selected: */
GtkTreeSelection *sel = gtk_tree_view_get_selection (priv->treeview);
g_signal_connect (sel, "changed",
/* Set window title */
gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_optionalsmtp_servers"));
- /* Track key presses to close the window if the Escape is pressed */
- g_signal_connect (G_OBJECT (self),
- "key-press-event",
- G_CALLBACK (on_key_pressed), NULL);
+ g_signal_connect (self, "response", G_CALLBACK (on_response), NULL);
hildon_help_dialog_help_enable (GTK_DIALOG(self),
- "applications_email_connectionsspecificsmtpconf",
+ "email_connectionsspecificsmtpconf",
modest_maemo_utils_get_osso_context());
}
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);
gchar *connection_name = NULL;
gchar *server_account_name = NULL;
gchar *server_name = NULL;
- ModestServerAccountData *data = 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);
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 (),
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: */
- modest_account_mgr_set_server_account_hostname (priv->account_manager, server_account_name,
- data->hostname);
-
- modest_account_mgr_set_server_account_username (priv->account_manager, server_account_name,
- data->username);
-
- modest_account_mgr_set_server_account_password (priv->account_manager, server_account_name,
- data->password);
-
- modest_account_mgr_set_server_account_secure_auth (priv->account_manager, server_account_name,
- data->secure_auth);
-
- modest_account_mgr_set_server_account_security (priv->account_manager, server_account_name,
- data->security);
-
- modest_account_mgr_set_server_account_port (priv->account_manager, server_account_name, data->port);
+ modest_account_mgr_save_server_settings (mgr, server_settings);
}
- } else if (connection_name && server_name &&
+ } else if (id && server_name &&
!strcmp (server_name, _("mcen_ia_optionalsmtp_notdefined"))) {
modest_account_mgr_remove_connection_specific_smtp (priv->account_manager,
- connection_name);
+ id);
gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter,
MODEL_COL_SERVER_ACCOUNT_NAME, NULL, -1);
}
while (valid) {
gchar *server_account_name = NULL;
- ModestServerAccountData *data = NULL;
+ ModestServerAccountSettings *server_settings = NULL;
gtk_tree_model_get (priv->model, &iter,
MODEL_COL_SERVER_ACCOUNT_NAME, &server_account_name,
- MODEL_COL_SERVER_ACCOUNT_DATA, &data,
- -1);
- if (data && data->hostname && (data->hostname[0] != '\0')) {
+ 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, data->hostname,
+ MODEL_COL_SERVER_NAME, modest_server_account_settings_get_hostname (server_settings),
-1);
} else if (server_account_name) {
}
}
-static gboolean
-on_key_pressed (GtkWidget *self,
- GdkEventKey *event,
- gpointer user_data)
+static void
+on_response (GtkDialog *dialog,
+ gint response,
+ gpointer user_data)
{
- if (event->keyval == GDK_Escape) {
- /* Simulate a press on Cancel to close the dialog */
- on_button_cancel (NULL, self);
+ switch (response) {
+ case GTK_RESPONSE_APPLY:
+ /* We use it for the edit button */
+ on_button_edit (MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (dialog));
+ g_signal_stop_emission_by_name (dialog, "response");
+ break;
+ case GTK_RESPONSE_CLOSE:
+ case GTK_RESPONSE_NONE:
+ case GTK_RESPONSE_DELETE_EVENT:
+ /* Generated as a response to delete-event, i.e,
+ pressin Esc, or by pressing the Close button */
+ modest_connection_specific_smtp_window_save_server_accounts (MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (dialog));
+ gtk_widget_destroy (GTK_WIDGET (dialog));
}
-
- return FALSE;
}
projects / modest / blobdiff