Use account ID instead of name in passwordstorerc.

[claws.git] / src / news.c

diff --git a/src/news.c b/src/news.c
index fdcea333543dc1572f1af650aad8ddde0f551b7c..3bfbce46b496a2f3d9b728ccb8705d9c04c7a7ba 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -48,6 +48,7 @@
 #include "statusbar.h"
 #include "codeconv.h"
 #include "utils.h"
+#include "passwordstore.h"
 #include "prefs_common.h"
 #include "prefs_account.h"
 #include "inputdialog.h"
@@ -404,12 +405,12 @@ static Session *news_session_new_for_folder(Folder *folder)
                userid = ac->userid;
                if (password_get(userid, ac->nntp_server, "nntp", port, &passwd)) {
                        /* NOP */;
-               } else if (ac->passwd && ac->passwd[0])
-                       passwd = g_strdup(ac->passwd);
-               else
+               } else if ((passwd = passwd_store_get_account(ac->account_id,
+                                       PWS_ACCOUNT_RECV)) == NULL) {
                        passwd = input_dialog_query_password_keep(ac->nntp_server,
                                                                  userid,
                                                                  &(ac->session_passwd));
+               }
        }
 
        if (session != NULL)