GtkWidget *delete_button;
GtkWidget *close_button;
ModestAccountView *account_view;
-
- /* We remember this so that we only open one at a time: */
- ModestEasysetupWizardDialog *wizard;
};
#define MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_ACCOUNT_VIEW_WINDOW, \
static void
modest_account_view_window_finalize (GObject *obj)
{
- ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj);
-
- if (priv->wizard) {
- gtk_widget_destroy (GTK_WIDGET (priv->wizard));
- priv->wizard = NULL;
- }
-
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
GtkTreeModel *model;
GtkTreeIter iter;
gboolean has_selection;
- gchar *account_name;
- gchar *default_account_name;
priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
has_selection =
gtk_tree_selection_get_selected (sel, &model, &iter);
+ /* Set the status of the buttons */
gtk_widget_set_sensitive (priv->edit_button, has_selection);
gtk_widget_set_sensitive (priv->delete_button, has_selection);
-
- account_name = modest_account_view_get_selected_account (priv->account_view);
- default_account_name = modest_account_mgr_get_default_account(
- modest_runtime_get_account_mgr());
-
- g_free (account_name);
- g_free (default_account_name);
}
/** Check whether any connections are active, and cancel them if
* Returns FALSE if the user chose to cancel his request instead.
*/
static gboolean
-check_for_active_acount (ModestAccountViewWindow *self, const gchar* account_name)
+check_for_active_account (ModestAccountViewWindow *self, const gchar* account_name)
{
- /* Check whether any connections are active, and cancel them if
- * the user wishes.
- */
- ModestAccountMgr* mgr = modest_runtime_get_account_mgr ();
- ModestMailOperationQueue* queue = modest_runtime_get_mail_operation_queue();
- if (modest_account_mgr_account_is_busy(mgr, account_name)) {
- GtkWidget *note = hildon_note_new_confirmation (GTK_WINDOW (self),
- _("emev_nc_disconnect_account"));
- const int response = gtk_dialog_run (GTK_DIALOG(note));
+ ModestTnyAccountStore *acc_store;
+ ModestMailOperationQueue* queue;
+ TnyConnectionStatus store_conn_status, transport_conn_status;
+ TnyAccount *store_account = NULL, *transport_account = NULL;
+ gboolean retval = TRUE;
+
+ acc_store = modest_runtime_get_account_store ();
+ queue = modest_runtime_get_mail_operation_queue ();
+
+ store_account =
+ modest_tny_account_store_get_server_account (acc_store,
+ account_name,
+ TNY_ACCOUNT_TYPE_STORE);
+ transport_account =
+ modest_tny_account_store_get_server_account (acc_store,
+ account_name,
+ TNY_ACCOUNT_TYPE_STORE);
+
+ 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);
if (response == GTK_RESPONSE_OK) {
/* FIXME: We should only cancel those of this account */
- modest_mail_operation_queue_cancel_all(queue);
- return TRUE;
+ modest_mail_operation_queue_cancel_all (queue);
+ retval = TRUE;
+ } else {
+ retval = FALSE;
}
- else
- return FALSE;
}
+
+ /* Frees */
+ g_object_unref (store_account);
+ g_object_unref (transport_account);
- return TRUE;
+ return retval;
}
static void
if (account_name) {
gchar *account_title = modest_account_mgr_get_display_name(account_mgr, account_name);
- if (check_for_active_acount (self, account_name)) {
+ if (check_for_active_account (self, account_name)) {
/* The warning text depends on the account type: */
gchar *txt = NULL;
if (modest_account_mgr_get_store_protocol (account_mgr, account_name)
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));
g_free (txt);
txt = NULL;
/* Check whether any connections are active, and cancel them if
* the user wishes.
*/
- if (check_for_active_acount (self, account_name)) {
+ if (check_for_active_account (self, 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));
}
static void
on_wizard_response (GtkDialog *dialog, gint response, gpointer user_data)
-{
- ModestAccountViewWindow *self = MODEST_ACCOUNT_VIEW_WINDOW (user_data);
- ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-
+{
/* The response has already been handled by the wizard dialog itself,
* creating the new account.
*/
/* Destroy the dialog: */
- if (priv->wizard) {
- gtk_widget_destroy (GTK_WIDGET (priv->wizard));
- priv->wizard = NULL;
+ 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)
{
- ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-
- /* Show the easy-setup wizard: */
+ GtkDialog *wizard, *dialog;
- if (priv->wizard) {
- /* Just show the existing window: */
- gtk_window_present (GTK_WINDOW (priv->wizard));
- } else {
- /* Create and show the dialog: */
- priv->wizard = modest_easysetup_wizard_dialog_new_or_present ();
- if (priv->wizard) {
- gtk_window_set_transient_for (GTK_WINDOW (priv->wizard), GTK_WINDOW (self));
- /* Destroy the dialog when it is closed: */
- g_signal_connect (G_OBJECT (priv->wizard), "response", G_CALLBACK (on_wizard_response), self);
- gtk_widget_show (GTK_WIDGET (priv->wizard));
- } else
- /* in this case, the existing one will be topped */
- g_message ("%s: easysetup dialog already exists; ignoring", __FUNCTION__);
+ /* Show the easy-setup wizard: */
+ dialog = modest_window_mgr_get_modal_dialog (modest_runtime_get_window_mgr());
+ if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) {
+ /* old wizard is active already;
+ */
+ gtk_window_present (GTK_WINDOW(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));
+
+ /* if there is already another modal dialog, make it non-modal */
+ if (dialog)
+ gtk_window_set_modal (GTK_WINDOW(dialog), FALSE);
+
+ gtk_window_set_modal (GTK_WINDOW (wizard), TRUE);
+ gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (self));
+ /* Destroy the dialog when it is closed: */
+ g_signal_connect (G_OBJECT (wizard), "response", G_CALLBACK
+ (on_wizard_response), self);
+ gtk_widget_show (GTK_WIDGET (wizard));
}
return button_box;
}
-
static GtkWidget*
window_vbox_new (ModestAccountViewWindow *self)
{
GtkWidget *main_hbox = gtk_hbox_new (FALSE, 6);
priv->account_view = modest_account_view_new (modest_runtime_get_account_mgr());
+
gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), 300, 400);
gtk_widget_show (GTK_WIDGET (priv->account_view));
static void
modest_account_view_window_init (ModestAccountViewWindow *obj)
{
-/*
- ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj);
-*/
gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->vbox)), GTK_WIDGET (window_vbox_new (obj)),
TRUE, TRUE, 2);
gtk_window_set_title (GTK_WINDOW (obj), _("mcen_ti_emailsetup_accounts"));
}
-
GtkWidget*
modest_account_view_window_new (void)
{