diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/imap.c | 5 | ||||
| -rw-r--r-- | src/inc.c | 3 | ||||
| -rw-r--r-- | src/main.c | 3 | ||||
| -rw-r--r-- | src/news.c | 5 | ||||
| -rw-r--r-- | src/send_message.c | 5 |
5 files changed, 9 insertions, 12 deletions
@@ -49,7 +49,6 @@ #include "base64.h" #include "utils.h" #include "prefs_common.h" -#include "inputdialog.h" #define IMAP4_PORT 143 #if USE_SSL @@ -596,8 +595,8 @@ static gint imap_session_connect(IMAPSession *session) pass = account->passwd; if (!pass) { gchar *tmp_pass; - tmp_pass = input_dialog_query_password(account->recv_server, - account->userid); + tmp_pass = input_query_password(account->recv_server, + account->userid); if (!tmp_pass) return IMAP_ERROR; Xstrdup_a(pass, tmp_pass, @@ -54,7 +54,6 @@ #include "manage_window.h" #include "stock_pixmap.h" #include "progressdialog.h" -#include "inputdialog.h" #include "alertpanel.h" #include "trayicon.h" #include "filter.h" @@ -496,7 +495,7 @@ static gint inc_start(IncProgressDialog *inc_dialog) (inc_dialog->dialog->window, NULL, NULL); - pass = input_dialog_query_password + pass = input_query_password (pop3_session->ac_prefs->recv_server, pop3_session->user); @@ -67,6 +67,7 @@ #include "import.h" #include "manage_window.h" #include "alertpanel.h" +#include "inputdialog.h" #include "statusbar.h" #include "addressbook.h" #include "addrindex.h" @@ -194,6 +195,8 @@ int main(int argc, char *argv[]) } set_log_file("sylpheed.log"); + set_input_query_password_func(input_dialog_query_password); + CHDIR_EXIT_IF_FAIL(get_home_dir(), 1); prefs_common_read_config(); @@ -44,8 +44,6 @@ #include "utils.h" #include "prefs_common.h" #include "prefs_account.h" -#include "inputdialog.h" -#include "alertpanel.h" #if USE_SSL # include "ssl.h" #endif @@ -234,8 +232,7 @@ static Session *news_session_new_for_folder(Folder *folder) if (ac->passwd && ac->passwd[0]) passwd = g_strdup(ac->passwd); else - passwd = input_dialog_query_password(ac->nntp_server, - userid); + passwd = input_query_password(ac->nntp_server, userid); } #if USE_SSL diff --git a/src/send_message.c b/src/send_message.c index 0579c619..ff5f7dee 100644 --- a/src/send_message.c +++ b/src/send_message.c @@ -49,7 +49,6 @@ #include "filter.h" #include "progressdialog.h" #include "statusbar.h" -#include "inputdialog.h" #include "alertpanel.h" #include "manage_window.h" #include "socket.h" @@ -482,7 +481,7 @@ static gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp) g_strdup(ac_prefs->tmp_smtp_pass); else { smtp_session->pass = - input_dialog_query_password + input_query_password (ac_prefs->smtp_server, smtp_session->user); if (!smtp_session->pass) @@ -499,7 +498,7 @@ static gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp) g_strdup(ac_prefs->tmp_pass); else { smtp_session->pass = - input_dialog_query_password + input_query_password (ac_prefs->smtp_server, smtp_session->user); if (!smtp_session->pass) |