Work to fix bug NB#81989:

[modest] / src / modest-tny-account-store.c

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index ac14b62..05f8fc2 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -59,11 +59,11 @@
 #include <camel/camel.h>
 #include <modest-platform.h>
 #include "modest-ui-actions.h"
+#include <widgets/modest-account-settings-dialog.h>
 
 #ifdef MODEST_PLATFORM_MAEMO
 #include <tny-maemo-conic-device.h>
 #include <maemo/modest-maemo-utils.h>
-#include <maemo/modest-account-settings-dialog.h>
 #endif
 
 #include <libgnomevfs/gnome-vfs-volume-monitor.h>
@@ -126,9 +126,7 @@ typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate;
 struct _ModestTnyAccountStorePrivate {
        gchar              *cache_dir;  
        GHashTable         *password_hash;
-#ifdef MODEST_PLATFORM_MAEMO
        GHashTable         *account_settings_dialog_hash;
-#endif
        ModestAccountMgr   *account_mgr;
        TnySessionCamel    *session;
        TnyDevice          *device;
@@ -276,12 +274,10 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj)
        priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                     g_free, g_free);
 
-#ifdef MODEST_PLATFORM_MAEMO                                                        
        /* A hash-map of modest account names to dialog pointers,
         * so we can avoid showing the account settings twice for the same modest account: */                                 
        priv->account_settings_dialog_hash = g_hash_table_new_full (g_str_hash, g_str_equal, 
                                                                    g_free, NULL);
-#endif
        
        /* Respond to volume mounts and unmounts, such 
         * as the insertion/removal of the memory card: */
@@ -492,7 +488,6 @@ on_account_changed (ModestAccountMgr *acc_mgr,
                g_object_unref (iter);
 }
 
-#ifdef MODEST_PLATFORM_MAEMO
 static void 
 on_account_settings_hide (GtkWidget *widget, gpointer user_data)
 {
@@ -504,7 +499,6 @@ on_account_settings_hide (GtkWidget *widget, gpointer user_data)
        if (account_name)
                g_hash_table_remove (priv->account_settings_dialog_hash, account_name);
 }
-#endif
 
 static void 
 show_password_warning_only ()
@@ -520,7 +514,6 @@ show_password_warning_only ()
                g_warning ("%s: %s", __FUNCTION__, _("mcen_ib_username_pw_incorrect"));
 }
 
-#ifdef MODEST_PLATFORM_MAEMO
 static void 
 show_wrong_password_dialog (TnyAccount *account)
 { 
@@ -544,11 +537,9 @@ show_wrong_password_dialog (TnyAccount *account)
        }
        
        dialog = modest_tny_account_store_show_account_settings_dialog (self, modest_account_name);
-       modest_account_settings_dialog_save_password (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog));
        /* Show an explanatory temporary banner: */
        modest_platform_information_banner (GTK_WIDGET(dialog), NULL, _("mcen_ib_username_pw_incorrect"));
 }
-#endif
 
 /* This callback will be called by Tinymail when it needs the password
  * from the user or the account settings.
@@ -630,9 +621,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                );
                if (settings_have_password) {
                        /* The password must be wrong, so show the account settings dialog so it can be corrected: */
-#ifdef MODEST_PLATFORM_MAEMO
                        show_wrong_password_dialog (account);
-#endif
                        
                        if (cancel)
                                *cancel = TRUE;
@@ -763,12 +752,10 @@ modest_tny_account_store_finalize (GObject *obj)
                priv->password_hash = NULL;
        }
 
-#ifdef MODEST_PLATFORM_MAEMO
        if (priv->account_settings_dialog_hash) {
                g_hash_table_destroy (priv->account_settings_dialog_hash);
                priv->account_settings_dialog_hash = NULL;
        }
-#endif
 
        if (priv->outbox_of_transport) {
                g_hash_table_destroy (priv->outbox_of_transport);
@@ -1513,7 +1500,7 @@ connection_status_changed (TnyAccount *account,
                /* Perform a send receive */
                account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
                main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
-               modest_ui_actions_do_send_receive (account_name, FALSE, FALSE, main_window);
+               modest_ui_actions_do_send_receive (account_name, FALSE, FALSE, FALSE, main_window);
        }
 }