#include <widgets/modest-account-view.h>
#include <modest-runtime.h>
+#include "modest-platform.h"
#include <modest-account-mgr-helpers.h>
#include <string.h>
#include "modest-tny-platform-factory.h"
#include "maemo/easysetup/modest-easysetup-wizard.h"
#include "maemo/modest-account-settings-dialog.h"
-#include <maemo/modest-maemo-utils.h>
+#include <modest-utils.h>
#include "widgets/modest-ui-constants.h"
/* 'private'/'protected' functions */
transport_account =
modest_tny_account_store_get_server_account (acc_store,
account_name,
- TNY_ACCOUNT_TYPE_STORE);
+ TNY_ACCOUNT_TYPE_TRANSPORT);
store_conn_status = tny_account_get_connection_status (store_account);
transport_conn_status = tny_account_get_connection_status (transport_account);
if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED ||
transport_conn_status == TNY_CONNECTION_STATUS_CONNECTED) {
- GtkWidget *note = NULL;
gint response;
- note = hildon_note_new_confirmation (GTK_WINDOW (self),
- _("emev_nc_disconnect_account"));
- response = gtk_dialog_run (GTK_DIALOG(note));
-
- gtk_widget_destroy (note);
+ response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self),
+ _("emev_nc_disconnect_account"));
if (response == GTK_RESPONSE_OK) {
/* FIXME: We should only cancel those of this account */
modest_mail_operation_queue_cancel_all (queue);
+
+ /* Also disconnect the account */
+ if (tny_account_get_connection_status (store_account) == TNY_CONNECTION_STATUS_CONNECTED) {
+ tny_account_cancel (store_account);
+ tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
+ FALSE, NULL, NULL);
+ }
+ if (tny_account_get_connection_status (transport_account) == TNY_CONNECTION_STATUS_CONNECTED) {
+ tny_account_cancel (transport_account);
+ tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account),
+ FALSE, NULL, NULL);
+ }
retval = TRUE;
} else {
retval = FALSE;
if (check_for_active_account (self, account_name)) {
/* The warning text depends on the account type: */
gchar *txt = NULL;
+ gint response;
+
if (modest_account_mgr_get_store_protocol (account_mgr, account_name)
== MODEST_PROTOCOL_STORE_POP) {
txt = g_strdup_printf (_("emev_nc_delete_mailbox"),
account_title);
}
- GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self),
- txt));
- gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
+ response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), txt);
g_free (txt);
txt = NULL;
-
- if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) {
+
+ if (response == GTK_RESPONSE_OK) {
/* Remove account. If it succeeds then it also removes
- the account from the ModestAccountView: */
-
+ the account from the ModestAccountView: */
gboolean is_default = FALSE;
gchar *default_account_name = modest_account_mgr_get_default_account (account_mgr);
if (default_account_name && (strcmp (default_account_name, account_name) == 0))
g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__);
}
}
- gtk_widget_destroy (GTK_WIDGET (dialog));
g_free (account_title);
- }
-
+ }
g_free (account_name);
}
}
static void
+on_account_settings_dialog_response (GtkDialog *dialog,
+ gint response,
+ gpointer user_data)
+{
+ TnyAccount *store_account = NULL;
+ gchar* account_name = NULL;
+ ModestAccountViewWindowPrivate *priv = NULL;
+
+ priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data);
+ account_name = modest_account_view_get_selected_account (priv->account_view);
+ store_account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
+ account_name,
+ TNY_ACCOUNT_TYPE_STORE);
+
+ /* Reconnect the store account, no need to reconnect the
+ transport account because it will connect when needed */
+ if (tny_account_get_connection_status (store_account) ==
+ TNY_CONNECTION_STATUS_DISCONNECTED)
+ tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
+ TRUE, NULL, NULL);
+
+ /* Disconnect this handler */
+ g_signal_handlers_disconnect_by_func (dialog, on_account_settings_dialog_response, user_data);
+
+ /* Free */
+ g_free (account_name);
+}
+
+static void
on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
{
- ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
+ ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self);
gchar* account_name = modest_account_view_get_selected_account (priv->account_view);
if (!account_name)
* the user wishes.
*/
if (check_for_active_account (self, account_name)) {
+ GtkWidget *dialog = modest_tny_account_store_show_account_settings_dialog (modest_runtime_get_account_store (), account_name);
- /* Show the Account Settings window: */
- ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
-
- modest_account_settings_dialog_set_account_name (dialog, account_name);
- gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
- modest_maemo_show_dialog_and_forget (GTK_WINDOW (self), GTK_DIALOG (dialog));
+ /* When the dialog is closed, reconnect */
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (on_account_settings_dialog_response),
+ self);
}
g_free (account_name);
{
/* The response has already been handled by the wizard dialog itself,
* creating the new account.
- */
-
+ */
/* Destroy the dialog: */
- if (dialog) {
+ if (dialog)
gtk_widget_destroy (GTK_WIDGET (dialog));
- modest_window_mgr_set_modal_dialog (
- modest_runtime_get_window_mgr(), NULL);
- }
}
static void
on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
{
- GtkDialog *wizard, *dialog;
+ GtkDialog *wizard;
+ GtkWindow *dialog;
/* Show the easy-setup wizard: */
- dialog = modest_window_mgr_get_modal_dialog (modest_runtime_get_window_mgr());
+ dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr());
if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) {
/* old wizard is active already;
*/
- gtk_window_present (GTK_WINDOW(dialog));
+ gtk_window_present (dialog);
return;
}
/* there is no such wizard yet */
- wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ());
- modest_window_mgr_set_modal_dialog (modest_runtime_get_window_mgr(),
- GTK_DIALOG(wizard));
+ wizard = GTK_DIALOG (modest_easysetup_wizard_dialog_new ());
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr(),
+ GTK_WINDOW (wizard));
/* if there is already another modal dialog, make it non-modal */
if (dialog)
priv->account_view = modest_account_view_new (modest_runtime_get_account_mgr());
- gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), 300, 400);
+ /* Only force the height, the width of the widget will depend
+ on the size of the column titles */
+ gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), -1, 400);
gtk_widget_show (GTK_WIDGET (priv->account_view));
GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view));
TRUE, TRUE, 2);
gtk_window_set_title (GTK_WINDOW (obj), _("mcen_ti_emailsetup_accounts"));
+
}
GtkWidget*
projects / modest / blobdiff