Implement real LOGIN auth method for IMAP.

[claws.git] / src / prefs_account.c

diff --git a/src/prefs_account.c b/src/prefs_account.c
index cd84c815be884f97e5010337091b1c489cc3cb77..6bd3716220e3f490cc6ebf2238ab8039b2afcd51 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1143,8 +1143,9 @@ static void basic_create_widget_func(PrefsPage * _page,
 
        no_imap_warn_icon = gtk_image_new_from_stock
                         (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
-       no_imap_warn_label = gtk_label_new(_("<span weight=\"bold\">Warning: this version of Claws Mail\n"
-                         "has been built without IMAP and News support.</span>"));
+       no_imap_warn_label = gtk_label_new(g_strconcat("<span weight=\"bold\">",
+                       _("Warning: this version of Claws Mail\n"
+                         "has been built without IMAP and News support."), "</span>", NULL));
        gtk_label_set_use_markup(GTK_LABEL(no_imap_warn_label), TRUE);
 
        gtk_box_pack_start(GTK_BOX (optmenubox), no_imap_warn_icon, FALSE, FALSE, 0);
@@ -1577,12 +1578,14 @@ static void receive_create_widget_func(PrefsPage * _page,
 
        COMBOBOX_ADD (menu, _("Automatic"), 0);
        COMBOBOX_ADD (menu, NULL, 0);
-       COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN);
+       COMBOBOX_ADD (menu, _("Plain text"), IMAP_AUTH_PLAINTEXT);
        COMBOBOX_ADD (menu, "CRAM-MD5", IMAP_AUTH_CRAM_MD5);
        COMBOBOX_ADD (menu, "ANONYMOUS", IMAP_AUTH_ANON);
        COMBOBOX_ADD (menu, "GSSAPI", IMAP_AUTH_GSSAPI);
        COMBOBOX_ADD (menu, "DIGEST-MD5", IMAP_AUTH_DIGEST_MD5);
        COMBOBOX_ADD (menu, "SCRAM-SHA-1", IMAP_AUTH_SCRAM_SHA1);
+       COMBOBOX_ADD (menu, "PLAIN", IMAP_AUTH_PLAIN);
+       COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN);
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
@@ -3361,7 +3364,7 @@ static gboolean sslcert_get_client_cert_hook(gpointer source, gpointer data)
        hookdata->password = NULL;
 
        if (!g_list_find(account_get_list(), account)) {
-               g_warning("can't find sock account\n");
+               g_warning("can't find account");
                return TRUE;
        }
        
@@ -3510,7 +3513,7 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
        *ac_prefs = tmp_ac_prefs;
        while (*p && !g_ascii_isdigit(*p)) p++;
        id = atoi(p);
-       if (id < 0) g_warning("wrong account id: %d\n", id);
+       if (id < 0) g_warning("wrong account id: %d", id);
        ac_prefs->account_id = id;
 
        if (ac_prefs->protocol == A_APOP) {
@@ -3562,7 +3565,7 @@ static void create_privacy_prefs(gpointer key, gpointer _value, gpointer user_da
 
 #define WRITE_PARAM(PARAM_TABLE) \
                if (prefs_write_param(PARAM_TABLE, pfile->fp) < 0) { \
-                       g_warning("failed to write configuration to file\n"); \
+                       g_warning("failed to write configuration to file"); \
                        prefs_file_close_revert(pfile); \
                        g_free(privacy_prefs); \
                        privacy_prefs = NULL; \
@@ -3617,7 +3620,7 @@ void prefs_account_write_config_all(GList *account_list)
        }
 
        if (prefs_file_close(pfile) < 0)
-               g_warning("failed to write configuration to file\n");
+               g_warning("failed to write configuration to file");
 }
 #undef WRITE_PARAM