#include "utils.h"
#include "alertpanel.h"
#include "colorlabel.h"
+#include "smtp.h"
+#include "imap.h"
static gboolean cancelled;
GtkWidget *rmmail_chkbtn;
GtkWidget *leave_time_entry;
GtkWidget *getall_chkbtn;
- GtkWidget *sd_filter_on_recv_chkbtn;
- GtkWidget *sd_rmmail_chkbtn;
GtkWidget *size_limit_chkbtn;
GtkWidget *size_limit_entry;
- GtkWidget *filter_on_recv_chkbtn;
GtkWidget *inbox_label;
GtkWidget *inbox_entry;
GtkWidget *inbox_btn;
+ GtkWidget *filter_on_recv_chkbtn;
GtkWidget *recvatgetall_chkbtn;
+
+ GtkWidget *imap_frame;
+ GtkWidget *imap_auth_type_optmenu;
GtkWidget *frame_maxarticle;
GtkWidget *label_maxarticle;
GtkWidget *nntpport_entry;
GtkWidget *domain_chkbtn;
GtkWidget *domain_entry;
- GtkWidget *tunnelcmd_chkbtn;
- GtkWidget *tunnelcmd_entry;
GtkWidget *crosspost_chkbtn;
GtkWidget *crosspost_colormenu;
- GtkWidget *imap_frame;
+ GtkWidget *tunnelcmd_chkbtn;
+ GtkWidget *tunnelcmd_entry;
+ GtkWidget *imapdir_label;
GtkWidget *imapdir_entry;
GtkWidget *sent_folder_chkbtn;
static void prefs_account_protocol_set_optmenu (PrefParam *pparam);
static void prefs_account_protocol_activated (GtkMenuItem *menuitem);
+static void prefs_account_imap_auth_type_set_data_from_optmenu
+ (PrefParam *pparam);
+static void prefs_account_imap_auth_type_set_optmenu (PrefParam *pparam);
static void prefs_account_smtp_auth_type_set_data_from_optmenu
(PrefParam *pparam);
static void prefs_account_smtp_auth_type_set_optmenu (PrefParam *pparam);
{"user_id", "ENV_USER", &tmp_ac_prefs.userid, P_STRING,
&basic.uid_entry, prefs_set_data_from_entry, prefs_set_entry},
- {"password", NULL, &tmp_ac_prefs.passwd, P_STRING,
+ {"password", NULL, &tmp_ac_prefs.passwd, P_PASSWORD,
&basic.pass_entry, prefs_set_data_from_entry, prefs_set_entry},
{"inbox", "inbox", &tmp_ac_prefs.inbox, P_STRING,
&receive.filter_on_recv_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
- /* selective download */
- {"sd_filter_on_receive", "TRUE", &tmp_ac_prefs.sd_filter_on_recv, P_BOOL,
- &receive.sd_filter_on_recv_chkbtn,
- prefs_set_data_from_toggle, prefs_set_toggle},
- {"sd_remove_mail_on_download", "TRUE", &tmp_ac_prefs.sd_rmmail_on_download, P_BOOL,
- &receive.sd_rmmail_chkbtn,
- prefs_set_data_from_toggle, prefs_set_toggle},
+ {"imap_auth_method", "0", &tmp_ac_prefs.imap_auth_type, P_ENUM,
+ &receive.imap_auth_type_optmenu,
+ prefs_account_imap_auth_type_set_data_from_optmenu,
+ prefs_account_imap_auth_type_set_optmenu},
{"receive_at_get_all", "TRUE", &tmp_ac_prefs.recv_at_getall, P_BOOL,
&receive.recvatgetall_chkbtn,
{"smtp_user_id", NULL, &tmp_ac_prefs.smtp_userid, P_STRING,
&p_send.smtp_uid_entry, prefs_set_data_from_entry, prefs_set_entry},
- {"smtp_password", NULL, &tmp_ac_prefs.smtp_passwd, P_STRING,
+ {"smtp_password", NULL, &tmp_ac_prefs.smtp_passwd, P_PASSWORD,
&p_send.smtp_pass_entry, prefs_set_data_from_entry, prefs_set_entry},
{"pop_before_smtp", "FALSE", &tmp_ac_prefs.pop_before_smtp, P_BOOL,
GtkWidget *size_limit_entry;
GtkWidget *label;
GtkWidget *filter_on_recv_chkbtn;
- GtkWidget *sd_filter_on_recv_chkbtn;
- GtkWidget *sd_rmmail_chkbtn;
GtkWidget *vbox3;
GtkWidget *inbox_label;
GtkWidget *inbox_entry;
GtkWidget *inbox_btn;
+ GtkWidget *imap_frame;
+ GtkWidget *optmenu;
+ GtkWidget *optmenu_menu;
+ GtkWidget *menuitem;
GtkWidget *recvatgetall_chkbtn;
GtkWidget *hbox2;
PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
_("Download all messages on server"));
- PACK_CHECK_BUTTON (vbox2, sd_filter_on_recv_chkbtn,
- _("Use filtering rules with Selective Download"));
- PACK_CHECK_BUTTON (vbox2, sd_rmmail_chkbtn,
- _("Remove mail after downloading with Selective Download"));
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
SET_TOGGLE_SENSITIVITY (size_limit_chkbtn, size_limit_entry);
- PACK_CHECK_BUTTON (vbox2, filter_on_recv_chkbtn,
- _("Filter messages on receiving"));
-
PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (hbox2), label_maxarticle, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (label_maxarticle), GTK_JUSTIFY_LEFT);
+ PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
+
+ vbox2 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox2);
+ gtk_container_add (GTK_CONTAINER (imap_frame), vbox2);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+ label = gtk_label_new (_("Authentication method"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+
+ optmenu = gtk_option_menu_new ();
+ gtk_widget_show (optmenu);
+ gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
+
+ optmenu_menu = gtk_menu_new ();
+
+ MENUITEM_ADD (optmenu_menu, menuitem, _("Automatic"), 0);
+ MENUITEM_ADD (optmenu_menu, menuitem, "LOGIN", IMAP_AUTH_LOGIN);
+ MENUITEM_ADD (optmenu_menu, menuitem, "CRAM-MD5", IMAP_AUTH_CRAM_MD5);
+
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
+
+ PACK_CHECK_BUTTON (vbox1, filter_on_recv_chkbtn,
+ _("Filter messages on receiving"));
PACK_CHECK_BUTTON
(vbox1, recvatgetall_chkbtn,
receive.size_limit_chkbtn = size_limit_chkbtn;
receive.size_limit_entry = size_limit_entry;
receive.filter_on_recv_chkbtn = filter_on_recv_chkbtn;
- receive.sd_filter_on_recv_chkbtn = sd_filter_on_recv_chkbtn;
- receive.sd_rmmail_chkbtn = sd_rmmail_chkbtn;
receive.inbox_label = inbox_label;
receive.inbox_entry = inbox_entry;
receive.inbox_btn = inbox_btn;
+ receive.imap_frame = imap_frame;
+ receive.imap_auth_type_optmenu = optmenu;
+
receive.recvatgetall_chkbtn = recvatgetall_chkbtn;
receive.frame_maxarticle = frame2;
gtk_container_add (GTK_CONTAINER (frame_sig), vbox_sig);
gtk_container_set_border_width (GTK_CONTAINER (vbox_sig), 8);
+ PACK_CHECK_BUTTON (vbox_sig, checkbtn_autosig,
+ _("Insert signature automatically"));
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox_sig), hbox1, TRUE, TRUE, 0);
+ label_sigsep = gtk_label_new (_("Signature separator"));
+ gtk_widget_show (label_sigsep);
+ gtk_box_pack_start (GTK_BOX (hbox1), label_sigsep, FALSE, FALSE, 0);
+
+ entry_sigsep = gtk_entry_new ();
+ gtk_widget_show (entry_sigsep);
+ gtk_box_pack_start (GTK_BOX (hbox1), entry_sigsep, FALSE, FALSE, 0);
+
+ gtk_widget_set_usize (entry_sigsep, 64, -1);
+
sig_hbox = gtk_hbox_new (FALSE, 8);
gtk_widget_show (sig_hbox);
gtk_box_pack_start (GTK_BOX (vbox_sig), sig_hbox, FALSE, FALSE, 0);
gtk_object_set_user_data (GTK_OBJECT (sigcmd_radiobtn),
GINT_TO_POINTER (SIG_COMMAND));
- PACK_CHECK_BUTTON (vbox_sig, checkbtn_autosig,
- _("Insert signature automatically"));
-
- hbox1 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox_sig), hbox1, TRUE, TRUE, 0);
- label_sigsep = gtk_label_new (_("Signature separator"));
- gtk_widget_show (label_sigsep);
- gtk_box_pack_start (GTK_BOX (hbox1), label_sigsep, FALSE, FALSE, 0);
-
- entry_sigsep = gtk_entry_new ();
- gtk_widget_show (entry_sigsep);
- gtk_box_pack_start (GTK_BOX (hbox1), entry_sigsep, FALSE, FALSE, 0);
-
- gtk_widget_set_usize (entry_sigsep, 64, -1);
-
hbox2 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (vbox_sig), hbox2, TRUE, TRUE, 0);
- label_sigpath = gtk_label_new (_("Signature file"));
+ label_sigpath = gtk_label_new (_("Signature"));
gtk_widget_show (label_sigpath);
gtk_box_pack_start (GTK_BOX (hbox2), label_sigpath, FALSE, FALSE, 0);
GtkWidget *entry_nntpport;
GtkWidget *checkbtn_domain;
GtkWidget *entry_domain;
- GtkWidget *checkbtn_tunnelcmd;
- GtkWidget *entry_tunnelcmd;
- GtkWidget *checkbtn_crosspost;
+ GtkWidget *checkbtn_crosspost;
GtkWidget *colormenu_crosspost;
GtkWidget *menu;
- GtkWidget *imap_frame;
- GtkWidget *imapdir_label;
+ GtkWidget *checkbtn_tunnelcmd;
+ GtkWidget *entry_tunnelcmd;
+ GtkWidget *imapdir_label;
GtkWidget *imapdir_entry;
GtkWidget *folder_frame;
GtkWidget *vbox3;
PACK_HBOX (hbox1);
PACK_CHECK_BUTTON (hbox1, checkbtn_tunnelcmd,
- _("Tunnel command to open connection"));
+ _("Use command to communicate with server"));
entry_tunnelcmd = gtk_entry_new ();
gtk_widget_show (entry_tunnelcmd);
gtk_box_pack_start (GTK_BOX (hbox1), entry_tunnelcmd, TRUE, TRUE, 0);
gtk_option_menu_set_menu (GTK_OPTION_MENU(colormenu_crosspost), menu);
SET_TOGGLE_SENSITIVITY(checkbtn_crosspost, colormenu_crosspost);
- PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
-
- vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox3);
- gtk_container_add (GTK_CONTAINER (imap_frame), vbox3);
- gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
-
- hbox1 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
-
+ PACK_HBOX (hbox1);
imapdir_label = gtk_label_new (_("IMAP server directory"));
gtk_widget_show (imapdir_label);
gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
advanced.nntpport_entry = entry_nntpport;
advanced.domain_chkbtn = checkbtn_domain;
advanced.domain_entry = entry_domain;
- advanced.tunnelcmd_chkbtn = checkbtn_tunnelcmd;
- advanced.tunnelcmd_entry = entry_tunnelcmd;
advanced.crosspost_chkbtn = checkbtn_crosspost;
advanced.crosspost_colormenu = colormenu_crosspost;
- advanced.imap_frame = imap_frame;
+ advanced.tunnelcmd_chkbtn = checkbtn_tunnelcmd;
+ advanced.tunnelcmd_entry = entry_tunnelcmd;
+ advanced.imapdir_label = imapdir_label;
advanced.imapdir_entry = imapdir_entry;
advanced.sent_folder_chkbtn = sent_folder_chkbtn;
prefs_custom_header_open(&tmp_ac_prefs);
}
-#if USE_GPGME || USE_OPENSSL
static void prefs_account_enum_set_data_from_radiobtn(PrefParam *pparam)
{
GtkRadioButton *radiobtn;
}
}
-#endif /* USE_GPGME || USE_OPENSSL */
-
#if USE_GPGME
static void prefs_account_gnupg_inline_warning(GtkWidget *widget)
{
gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
}
+static void prefs_account_imap_auth_type_set_data_from_optmenu(PrefParam *pparam)
+{
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+
+ menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
+ menuitem = gtk_menu_get_active(GTK_MENU(menu));
+ *((RecvProtocol *)pparam->data) = GPOINTER_TO_INT
+ (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+}
+
+static void prefs_account_imap_auth_type_set_optmenu(PrefParam *pparam)
+{
+ IMAPAuthType type = *((IMAPAuthType *)pparam->data);
+ GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+
+ switch (type) {
+ case IMAP_AUTH_LOGIN:
+ gtk_option_menu_set_history(optmenu, 1);
+ break;
+ case IMAP_AUTH_CRAM_MD5:
+ gtk_option_menu_set_history(optmenu, 2);
+ break;
+ case 0:
+ default:
+ gtk_option_menu_set_history(optmenu, 0);
+ }
+
+ menu = gtk_option_menu_get_menu(optmenu);
+ menuitem = gtk_menu_get_active(GTK_MENU(menu));
+ gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+}
+
static void prefs_account_smtp_auth_type_set_data_from_optmenu(PrefParam *pparam)
{
GtkWidget *menu;
prefs_account_nntpauth_toggled
(GTK_TOGGLE_BUTTON(basic.nntpauth_chkbtn), NULL);
gtk_widget_hide(receive.pop3_frame);
+ gtk_widget_hide(receive.imap_frame);
gtk_widget_show(receive.frame_maxarticle);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
/* update pop_before_smtp sensitivity */
gtk_widget_show(advanced.nntpport_hbox);
gtk_widget_show(advanced.crosspost_chkbtn);
gtk_widget_show(advanced.crosspost_colormenu);
- gtk_widget_hide(advanced.imap_frame);
+ gtk_widget_hide(advanced.tunnelcmd_chkbtn);
+ gtk_widget_hide(advanced.tunnelcmd_entry);
+ gtk_widget_hide(advanced.imapdir_label);
+ gtk_widget_hide(advanced.imapdir_entry);
break;
case A_LOCAL:
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_set_sensitive(basic.uid_entry, TRUE);
gtk_widget_set_sensitive(basic.pass_entry, TRUE);
gtk_widget_hide(receive.pop3_frame);
+ gtk_widget_hide(receive.imap_frame);
gtk_widget_hide(receive.frame_maxarticle);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
prefs_account_mailcmd_toggled
gtk_widget_hide(advanced.nntpport_hbox);
gtk_widget_hide(advanced.crosspost_chkbtn);
gtk_widget_hide(advanced.crosspost_colormenu);
- gtk_widget_hide(advanced.imap_frame);
+ gtk_widget_hide(advanced.tunnelcmd_chkbtn);
+ gtk_widget_hide(advanced.tunnelcmd_entry);
+ gtk_widget_hide(advanced.imapdir_label);
+ gtk_widget_hide(advanced.imapdir_entry);
break;
case A_IMAP4:
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_set_sensitive(basic.uid_entry, TRUE);
gtk_widget_set_sensitive(basic.pass_entry, TRUE);
gtk_widget_hide(receive.pop3_frame);
+ gtk_widget_show(receive.imap_frame);
gtk_widget_hide(receive.frame_maxarticle);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
gtk_widget_hide(advanced.nntpport_hbox);
gtk_widget_hide(advanced.crosspost_chkbtn);
gtk_widget_hide(advanced.crosspost_colormenu);
- gtk_widget_show(advanced.imap_frame);
+ gtk_widget_show(advanced.tunnelcmd_chkbtn);
+ gtk_widget_show(advanced.tunnelcmd_entry);
+ gtk_widget_show(advanced.imapdir_label);
+ gtk_widget_show(advanced.imapdir_entry);
break;
case A_POP3:
default:
gtk_widget_set_sensitive(basic.pass_entry, TRUE);
gtk_widget_set_sensitive(receive.pop3_frame, TRUE);
gtk_widget_show(receive.pop3_frame);
+ gtk_widget_hide(receive.imap_frame);
gtk_widget_hide(receive.frame_maxarticle);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
gtk_widget_hide(advanced.nntpport_hbox);
gtk_widget_hide(advanced.crosspost_chkbtn);
gtk_widget_hide(advanced.crosspost_colormenu);
- gtk_widget_hide(advanced.imap_frame);
+ gtk_widget_hide(advanced.tunnelcmd_chkbtn);
+ gtk_widget_hide(advanced.tunnelcmd_entry);
+ gtk_widget_hide(advanced.imapdir_label);
+ gtk_widget_hide(advanced.imapdir_entry);
break;
}
projects / claws.git / blobdiff