Remove attachments button in subject line of editor

[modest] / src / hildon2 / modest-default-account-settings-dialog.c

diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c
index 9535237..8a61537 100644 (file)
--- a/src/hildon2/modest-default-account-settings-dialog.c
+++ b/src/hildon2/modest-default-account-settings-dialog.c
@@ -173,9 +173,6 @@ modest_default_account_settings_dialog_finalize (GObject *object)
        if (priv->account_manager)
                g_object_unref (G_OBJECT (priv->account_manager));
 
-       if (priv->signature_dialog)
-               gtk_widget_destroy (priv->signature_dialog);
-
        if (priv->settings) {
                g_object_unref (priv->settings);
                priv->settings = NULL;
@@ -1156,9 +1153,6 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo
        priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (dialog);
        protocol_registry = modest_runtime_get_protocol_registry ();
 
-       incoming_account = modest_account_settings_get_store_settings (settings);
-       outgoing_account = modest_account_settings_get_transport_settings (settings);
-
        account_name = modest_account_settings_get_account_name (settings);
 
        /* Save the account name so we can refer to it later: */
@@ -1197,6 +1191,7 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo
        hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_leave_messages), 
                                        modest_account_settings_get_leave_messages_on_server (settings));
 
+       incoming_account = modest_account_settings_get_store_settings (settings);
        if (incoming_account) {
                const gchar *username, *password, *hostname, *proto_str, *account_title;
                gchar *proto_name, *title;