2007-07-10 Murray Cumming <murrayc@murrayc.com>

* src/modest-tny-account-store.c: (on_idle_wrong_password):
A compilation fix, though the build wasn't broken for me.

pmo-trunk-r2663

diff --git a/ChangeLog2 b/ChangeLog2
index 84fe310..1b6db3c 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,3 +1,8 @@
+2007-07-10  Murray Cumming  <murrayc@murrayc.com>
+
+       * src/modest-tny-account-store.c: (on_idle_wrong_password):
+       A compilation fix, though the build wasn't broken for me.
+

 2007-07-09  Murray Cumming  <murrayc@murrayc.com>
 
        * src/modest-ui-actions.c: (modest_ui_actions_on_send_receive):
 2007-07-09  Murray Cumming  <murrayc@murrayc.com>
 
        * src/modest-ui-actions.c: (modest_ui_actions_on_send_receive):

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index a7b5bfd..70e3d5f 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -443,20 +443,19 @@ gboolean on_idle_wrong_password (gpointer user_data)
         * for instance because of a previous get_password() call: 
         */
        gpointer dialog_as_gpointer = NULL;
         * for instance because of a previous get_password() call: 
         */
        gpointer dialog_as_gpointer = NULL;

-       priv->account_settings_dialog_hash && 
-                               g_hash_table_lookup_extended (priv->account_settings_dialog_hash,
-                                                     modest_account_name,
-                                                     NULL,
-                                                     (gpointer*)&dialog_as_gpointer);
-                                                     
+       gboolean found = FALSE;
+       if (priv->account_settings_dialog_hash) {
+               found = g_hash_table_lookup_extended (priv->account_settings_dialog_hash,
+                       modest_account_name, NULL, (gpointer*)&dialog_as_gpointer);
+       }
+                             

        ModestAccountSettingsDialog *dialog = dialog_as_gpointer;
                                        
        ModestWindow *main_window = 
                                modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
                                              
        gboolean created_dialog = FALSE;
        ModestAccountSettingsDialog *dialog = dialog_as_gpointer;
                                        
        ModestWindow *main_window = 
                                modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
                                              
        gboolean created_dialog = FALSE;

-       if (!dialog) {
-               
+       if (!found || !dialog) {

                dialog = modest_account_settings_dialog_new ();
                modest_account_settings_dialog_set_account_name (dialog, modest_account_name);
                modest_account_settings_dialog_switch_to_user_info (dialog);
                dialog = modest_account_settings_dialog_new ();
                modest_account_settings_dialog_set_account_name (dialog, modest_account_name);
                modest_account_settings_dialog_switch_to_user_info (dialog);