GtkWidget *button_edit;
ModestAccountMgr *account_manager;
- gchar* account_name;
};
+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,
GValue *value, GParamSpec *pspec)
}
g_object_unref (G_OBJECT (priv->model));
- g_free (priv->account_name);
G_OBJECT_CLASS (modest_connection_specific_smtp_window_parent_class)->finalize (object);
}
/* #define DEBUG_WITHOUT_LIBCONIC 1 */
void
-modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSpecificSmtpWindow *self, ModestAccountMgr *account_manager,
- const gchar* account_name)
+modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSpecificSmtpWindow *self, ModestAccountMgr *account_manager)
{
ModestConnectionSpecificSmtpWindowPrivate *priv =
CONNECTION_SPECIFIC_SMTP_WINDOW_GET_PRIVATE (self);
priv->account_manager = account_manager;
- priv->account_name = account_name ? g_strdup (account_name) : NULL;
GtkListStore *liststore = GTK_LIST_STORE (priv->model);
ConIcIap *iap = (ConIcIap*)iter->data;
if (iap) {
#ifdef DEBUG_WITHOUT_LIBCONIC
- const gchar *name = "debug name";
- const gchar *id = "debug id";
+ const gchar *connection_name = "debug name";
+ const gchar *connection_id = "debug id";
#else
- const gchar *name = con_ic_iap_get_name (iap);
- const gchar *id = con_ic_iap_get_id (iap);
+ const gchar *connection_name = con_ic_iap_get_name (iap);
+ const gchar *connection_id = con_ic_iap_get_id (iap);
#endif
- printf ("debug: iac name=%s, id=%s\n", name, id);
+ printf ("debug: iac name=%s, id=%s\n", connection_name, connection_id);
/* Get any already-associated connection-specific server account: */
gchar *server_account_name = NULL;
- if (priv->account_name)
- server_account_name = modest_account_mgr_get_connection_specific_smtp (
- priv->account_manager, priv->account_name, name);
+ server_account_name = modest_account_mgr_get_connection_specific_smtp (
+ priv->account_manager, connection_name);
/* Add the row to the model: */
GtkTreeIter iter;
gtk_list_store_append (liststore, &iter);
gtk_list_store_set(liststore, &iter,
- MODEL_COL_ID, id,
- MODEL_COL_NAME, name,
+ MODEL_COL_ID, connection_id,
+ MODEL_COL_NAME, connection_name,
MODEL_COL_SERVER_ACCOUNT_NAME, server_account_name,
-1);
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 (GTK_STOCK_EDIT);
+ 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 (GTK_STOCK_CLOSE);
+ 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",
/* 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);
}
ModestConnectionSpecificSmtpWindow*
}
/** The application should call this when the user changes should be saved.
- * @account_name: Specify this again in case it was not previously known.
*/
gboolean
-modest_connection_specific_smtp_window_save_server_accounts (ModestConnectionSpecificSmtpWindow *self,
- const gchar* account_name)
+modest_connection_specific_smtp_window_save_server_accounts (ModestConnectionSpecificSmtpWindow *self)
{
ModestConnectionSpecificSmtpWindowPrivate *priv =
CONNECTION_SPECIFIC_SMTP_WINDOW_GET_PRIVATE (self);
if (id && data) { /* 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("%s_specific_%s",
- priv->account_name, connection_name);
+ gchar *name_start = g_strdup_printf("specific_%s", connection_name);
server_account_name = modest_account_mgr_get_unused_account_name (
priv->account_manager, name_start, TRUE /* server account. */);
g_assert (server_account_name);
/* associate the specific server account with this connection for this account: */
success = success && modest_account_mgr_set_connection_specific_smtp (
- priv->account_manager, priv->account_name,
- connection_name, server_account_name);
+ priv->account_manager, connection_name, 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,
} 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_account_mgr_set_server_account_hostname (priv->account_manager, server_account_name,
+ data->hostname);
- modest_server_account_set_username (priv->account_manager, server_account_name,
+ modest_account_mgr_set_server_account_username (priv->account_manager, server_account_name,
data->username);
- modest_server_account_set_password (priv->account_manager, server_account_name,
+ modest_account_mgr_set_server_account_password (priv->account_manager, server_account_name,
data->password);
- modest_server_account_set_secure_auth (priv->account_manager, server_account_name,
+ modest_account_mgr_set_server_account_secure_auth (priv->account_manager, server_account_name,
data->secure_auth);
- modest_server_account_set_security (priv->account_manager, server_account_name,
+ modest_account_mgr_set_server_account_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_set_server_account_port (priv->account_manager, server_account_name, data->port);
}
}
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);
}
}
+static gboolean
+on_key_pressed (GtkWidget *self,
+ GdkEventKey *event,
+ gpointer user_data)
+{
+ if (event->keyval == GDK_Escape) {
+ /* Simulate a press on Cancel to close the dialog */
+ on_button_cancel (NULL, self);
+ }
+
+ return FALSE;
+}