From aafa724cb33fb9d87aa83d443a90dedd8d4fe3ef Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Mon, 21 Apr 2008 10:16:47 +0000 Subject: [PATCH] * Partially fixes NB#84505, do not call tny_folder_get_account over a merge folder pmo-trunk-r4435 --- src/maemo/modest-account-settings-dialog.c | 4 ++-- src/modest-mail-operation.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c index e501233..b7a5bb3 100644 --- a/src/maemo/modest-account-settings-dialog.c +++ b/src/maemo/modest-account-settings-dialog.c @@ -1646,9 +1646,9 @@ modest_account_settings_dialog_check_allow_changes (ModestAccountSettingsDialog gtk_widget_set_sensitive (self->entry_outgoingserver, !username_known); gtk_widget_set_sensitive (self->entry_outgoing_username, !username_known); gtk_widget_set_sensitive (self->entry_incoming_port, !username_known); - gtk_widget_set_sensitive (self->entry_outgoing_port, !username_known); +/* gtk_widget_set_sensitive (self->entry_outgoing_port, !username_known); */ gtk_widget_set_sensitive (self->combo_incoming_security, !username_known); - gtk_widget_set_sensitive (self->combo_outgoing_security, !username_known); +/* gtk_widget_set_sensitive (self->combo_outgoing_security, !username_known); */ } void diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index a885498..023d565 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -3083,7 +3083,7 @@ modest_mail_operation_sync_folder (ModestMailOperation *self, priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; - priv->account = TNY_ACCOUNT (tny_folder_get_account (folder)); + priv->account = modest_tny_folder_get_account (folder); priv->op_type = MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER; modest_mail_operation_notify_start (self); -- 1.7.9.5