#include "utils.h"
#include "alertpanel.h"
#include "colorlabel.h"
+#include "smtp.h"
+#include "imap.h"
+#include "remotefolder.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 *autoreplyto_entry;
} compose;
-#if USE_GPGME
static struct Privacy {
+ GtkWidget *default_privacy_system;
GtkWidget *default_encrypt_chkbtn;
GtkWidget *default_sign_chkbtn;
- GtkWidget *gnupg_mime_radiobtn;
- GtkWidget *gnupg_inline_radiobtn;
- GtkWidget *defaultkey_radiobtn;
- GtkWidget *emailkey_radiobtn;
- GtkWidget *customkey_radiobtn;
- GtkWidget *customkey_entry;
} privacy;
-#endif /* USE_GPGME */
#if USE_OPENSSL
static struct SSLPrefs {
GtkWidget *smtp_nossl_radiobtn;
GtkWidget *smtp_ssltunnel_radiobtn;
GtkWidget *smtp_starttls_radiobtn;
+
+ GtkWidget *use_nonblocking_ssl_chkbtn;
} ssl;
#endif /* USE_OPENSSL */
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_set_string_from_optmenu (PrefParam *pparam);
+static void prefs_account_set_optmenu_from_string (PrefParam *pparam);
+
+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);
static void prefs_account_enum_set_data_from_radiobtn (PrefParam *pparam);
static void prefs_account_enum_set_radiobtn (PrefParam *pparam);
-#if USE_GPGME
-static void prefs_account_gnupg_inline_warning (GtkWidget *widget);
-#endif /* USE_GPGME */
-
static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam);
static void prefs_account_crosspost_set_colormenu(PrefParam *pparam);
{"nntp_server", NULL, &tmp_ac_prefs.nntp_server, P_STRING,
&basic.nntpserv_entry, prefs_set_data_from_entry, prefs_set_entry},
- {"local_mbox", NULL, &tmp_ac_prefs.local_mbox, P_STRING,
+ {"local_mbox", "/var/mail", &tmp_ac_prefs.local_mbox, P_STRING,
&basic.localmbox_entry, prefs_set_data_from_entry, prefs_set_entry},
{"use_mail_command", "FALSE", &tmp_ac_prefs.use_mail_command, P_BOOL,
&basic.mailcmd_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
- {"mail_command", "/usr/sbin/sendmail -t", &tmp_ac_prefs.mail_command, P_STRING,
+ {"mail_command", DEFAULT_SENDMAIL_CMD, &tmp_ac_prefs.mail_command, P_STRING,
&basic.mailcmd_entry, prefs_set_data_from_entry, prefs_set_entry},
{"use_nntp_auth", "FALSE", &tmp_ac_prefs.use_nntp_auth, P_BOOL,
&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,
&compose.autoreplyto_entry,
prefs_set_data_from_entry, prefs_set_entry},
-#if USE_GPGME
/* Privacy */
+ {"default_privacy_system", "", &tmp_ac_prefs.default_privacy_system, P_STRING,
+ &privacy.default_privacy_system,
+ prefs_account_set_string_from_optmenu, prefs_account_set_optmenu_from_string},
{"default_encrypt", "FALSE", &tmp_ac_prefs.default_encrypt, P_BOOL,
&privacy.default_encrypt_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL,
&privacy.default_sign_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"default_gnupg_mode", NULL, &tmp_ac_prefs.default_gnupg_mode, P_ENUM,
- &privacy.gnupg_mime_radiobtn,
- prefs_account_enum_set_data_from_radiobtn,
- prefs_account_enum_set_radiobtn},
- {"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM,
- &privacy.defaultkey_radiobtn,
- prefs_account_enum_set_data_from_radiobtn,
- prefs_account_enum_set_radiobtn},
- {"sign_key_id", NULL, &tmp_ac_prefs.sign_key_id, P_STRING,
- &privacy.customkey_entry,
- prefs_set_data_from_entry, prefs_set_entry},
-#endif /* USE_GPGME */
#if USE_OPENSSL
/* SSL */
&ssl.smtp_nossl_radiobtn,
prefs_account_enum_set_data_from_radiobtn,
prefs_account_enum_set_radiobtn},
+
+ {"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
+ &ssl.use_nonblocking_ssl_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
#endif /* USE_OPENSSL */
/* Advanced */
static void prefs_account_receive_create (void);
static void prefs_account_send_create (void);
static void prefs_account_compose_create (void);
-#if USE_GPGME
static void prefs_account_privacy_create (void);
-#endif /* USE_GPGME */
#if USE_OPENSSL
static void prefs_account_ssl_create (void);
#endif /* USE_OPENSSL */
static gint prefs_account_deleted (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
-static void prefs_account_key_pressed (GtkWidget *widget,
+static gboolean prefs_account_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static void prefs_account_ok (void);
void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
{
- const gchar *p = label;
+ const guchar *p = label;
gint id;
g_return_if_fail(ac_prefs != NULL);
prefs_custom_header_read_config(ac_prefs);
}
-void prefs_account_save_config_all(GList *account_list)
+void prefs_account_write_config_all(GList *account_list)
{
GList *cur;
gchar *rcpath;
return last_id + 1;
}
+void update_privacy_system_menu() {
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+ GSList *system_ids, *cur;
+
+ menu = gtk_menu_new();
+ menuitem = gtk_menu_item_new_with_label(_("None"));
+ gtk_widget_show(menuitem);
+ g_object_set_data(G_OBJECT(menuitem), MENU_VAL_ID, "");
+ gtk_menu_append(GTK_MENU(menu), menuitem);
+
+ system_ids = privacy_get_system_ids();
+ for (cur = system_ids; cur != NULL; cur = g_slist_next(cur)) {
+ gchar *id = (gchar *) cur->data;
+ const gchar *name;
+
+ name = privacy_system_get_name(id);
+ menuitem = gtk_menu_item_new_with_label(name);
+ gtk_widget_show(menuitem);
+ g_object_set_data_full(G_OBJECT(menuitem), MENU_VAL_ID, id, g_free);
+ gtk_menu_append(GTK_MENU(menu), menuitem);
+ }
+
+ gtk_option_menu_set_menu(GTK_OPTION_MENU(privacy.default_privacy_system), menu);
+}
+
PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
{
gboolean new_account = FALSE;
}
manage_window_set_transient(GTK_WINDOW(dialog.window));
- gtk_notebook_set_page(GTK_NOTEBOOK(dialog.notebook), 0);
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(dialog.notebook), 0);
gtk_widget_grab_focus(dialog.ok_btn);
tmp_ac_prefs = *ac_prefs;
+ update_privacy_system_menu();
+
if (new_account) {
PrefsAccount *def_ac;
gchar *buf;
_("Preferences for new account"));
gtk_widget_hide(dialog.apply_btn);
} else {
+ gchar *title;
prefs_set_dialog(param);
- gtk_window_set_title(GTK_WINDOW(dialog.window),
- _("Account preferences"));
+ title = g_strdup_printf (_("%s - Account preferences"),
+ ac_prefs->account_name);
+ gtk_window_set_title(GTK_WINDOW(dialog.window), title);
+ g_free (title);
gtk_widget_show(dialog.apply_btn);
}
- if (ac_prefs->protocol != A_LOCAL) {
- gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
- gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
- }
-
pop_bfr_smtp_tm_set_sens (NULL, NULL);
gtk_widget_show(dialog.window);
/* create dialog */
prefs_dialog_create(&dialog);
- gtk_signal_connect(GTK_OBJECT(dialog.window), "delete_event",
- GTK_SIGNAL_FUNC(prefs_account_deleted), NULL);
- gtk_signal_connect(GTK_OBJECT(dialog.window), "key_press_event",
- GTK_SIGNAL_FUNC(prefs_account_key_pressed), NULL);
+ g_signal_connect(G_OBJECT(dialog.window), "delete_event",
+ G_CALLBACK(prefs_account_deleted), NULL);
+ g_signal_connect(G_OBJECT(dialog.window), "key_press_event",
+ G_CALLBACK(prefs_account_key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(dialog.window);
- gtk_signal_connect(GTK_OBJECT(dialog.ok_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_account_ok), NULL);
- gtk_signal_connect(GTK_OBJECT(dialog.apply_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_account_apply), NULL);
- gtk_signal_connect(GTK_OBJECT(dialog.cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_account_cancel), NULL);
+ g_signal_connect(G_OBJECT(dialog.ok_btn), "clicked",
+ G_CALLBACK(prefs_account_ok), NULL);
+ g_signal_connect(G_OBJECT(dialog.apply_btn), "clicked",
+ G_CALLBACK(prefs_account_apply), NULL);
+ g_signal_connect(G_OBJECT(dialog.cancel_btn), "clicked",
+ G_CALLBACK(prefs_account_cancel), NULL);
prefs_account_basic_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Basic"), page++);
SET_NOTEBOOK_LABEL(dialog.notebook, _("Send"), page++);
prefs_account_compose_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Compose"), page++);
-#if USE_GPGME
prefs_account_privacy_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Privacy"), page++);
-#endif /* USE_GPGME */
#if USE_OPENSSL
prefs_account_ssl_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("SSL"), page++);
#define SET_ACTIVATE(menuitem) \
{ \
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate", \
- GTK_SIGNAL_FUNC(prefs_account_protocol_activated), \
- NULL); \
+ g_signal_connect(G_OBJECT(menuitem), "activate", \
+ G_CALLBACK(prefs_account_protocol_activated), \
+ NULL); \
}
#define TABLE_YPAD 2
acname_entry = gtk_entry_new ();
gtk_widget_show (acname_entry);
- gtk_widget_set_usize (acname_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_widget_set_size_request (acname_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_box_pack_start (GTK_BOX (hbox), acname_entry, TRUE, TRUE, 0);
default_chkbtn = gtk_check_button_new_with_label (_("Set as default"));
SET_ACTIVATE (menuitem);
MENUITEM_ADD (optmenu_menu, menuitem, _("News (NNTP)"), A_NNTP);
SET_ACTIVATE (menuitem);
- MENUITEM_ADD (optmenu_menu, menuitem, _("None (local)"), A_LOCAL);
+ MENUITEM_ADD (optmenu_menu, menuitem, _("Local mbox file"), A_LOCAL);
+ SET_ACTIVATE (menuitem);
+ MENUITEM_ADD (optmenu_menu, menuitem, _("None (SMTP only)"), A_NONE);
SET_ACTIVATE (menuitem);
gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
uid_entry = gtk_entry_new ();
gtk_widget_show (uid_entry);
- gtk_widget_set_usize (uid_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_widget_set_size_request (uid_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_table_attach (GTK_TABLE (serv_table), uid_entry, 1, 2, 7, 8,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
pass_entry = gtk_entry_new ();
gtk_widget_show (pass_entry);
- gtk_widget_set_usize (pass_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_widget_set_size_request (pass_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_table_attach (GTK_TABLE (serv_table), pass_entry, 3, 4, 7, 8,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment (GTK_MISC (recvserv_label), 1, 0.5);
- localmbox_label = gtk_label_new (_("Local mailbox file"));
+ localmbox_label = gtk_label_new (_("Local mailbox"));
gtk_widget_show (localmbox_label);
gtk_table_attach (GTK_TABLE (serv_table), localmbox_label, 0, 1, 3, 4,
GTK_FILL, 0, 0, 0);
gtk_table_attach (GTK_TABLE (serv_table), mailcmd_chkbtn, 0, 4, 5, 6,
GTK_EXPAND | GTK_FILL,
0, 0, TABLE_YPAD);
- gtk_signal_connect(GTK_OBJECT(mailcmd_chkbtn), "toggled",
- GTK_SIGNAL_FUNC(prefs_account_mailcmd_toggled),
- NULL);
+ g_signal_connect(G_OBJECT(mailcmd_chkbtn), "toggled",
+ G_CALLBACK(prefs_account_mailcmd_toggled),
+ NULL);
mailcmd_label = gtk_label_new (_("command to send mails"));
gtk_widget_show (mailcmd_label);
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;
hbox_spc = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox_spc);
gtk_box_pack_start (GTK_BOX (hbox1), hbox_spc, FALSE, FALSE, 0);
- gtk_widget_set_usize (hbox_spc, 12, -1);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
leave_time_label = gtk_label_new (_("Remove after"));
gtk_widget_show (leave_time_label);
leave_time_entry = gtk_entry_new ();
gtk_widget_show (leave_time_entry);
- gtk_widget_set_usize (leave_time_entry, 64, -1);
+ gtk_widget_set_size_request (leave_time_entry, 64, -1);
gtk_box_pack_start (GTK_BOX (hbox1), leave_time_entry, FALSE, FALSE, 0);
leave_time_label = gtk_label_new (_("days"));
hbox_spc = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox_spc);
gtk_box_pack_start (GTK_BOX (hbox1), hbox_spc, FALSE, FALSE, 0);
- gtk_widget_set_usize (hbox_spc, 12, -1);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
leave_time_label = gtk_label_new (_("(0 days: remove immediately)"));
gtk_widget_show (leave_time_label);
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);
size_limit_entry = gtk_entry_new ();
gtk_widget_show (size_limit_entry);
- gtk_widget_set_usize (size_limit_entry, 64, -1);
+ gtk_widget_set_size_request (size_limit_entry, 64, -1);
gtk_box_pack_start (GTK_BOX (hbox1), size_limit_entry, FALSE, FALSE, 0);
label = gtk_label_new (_("KB"));
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);
inbox_entry = gtk_entry_new ();
gtk_widget_show (inbox_entry);
- gtk_widget_set_usize (inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_widget_set_size_request (inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_box_pack_start (GTK_BOX (hbox1), inbox_entry, TRUE, TRUE, 0);
inbox_btn = gtk_button_new_with_label (_(" Select... "));
gtk_widget_show (inbox_btn);
gtk_box_pack_start (GTK_BOX (hbox1), inbox_btn, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (inbox_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_account_select_folder_cb),
- inbox_entry);
+ g_signal_connect (G_OBJECT (inbox_btn), "clicked",
+ G_CALLBACK (prefs_account_select_folder_cb),
+ inbox_entry);
PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
gtk_widget_show (spinbtn_maxarticle);
gtk_box_pack_start (GTK_BOX (hbox2), spinbtn_maxarticle,
FALSE, FALSE, 0);
- gtk_widget_set_usize (spinbtn_maxarticle, 64, -1);
+ gtk_widget_set_size_request (spinbtn_maxarticle, 64, -1);
gtk_spin_button_set_numeric
(GTK_SPIN_BUTTON (spinbtn_maxarticle), TRUE);
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_widget_show (customhdr_edit_btn);
gtk_box_pack_start (GTK_BOX (hbox), customhdr_edit_btn,
FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (customhdr_edit_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_account_edit_custom_header),
- NULL);
+ g_signal_connect (G_OBJECT (customhdr_edit_btn), "clicked",
+ G_CALLBACK (prefs_account_edit_custom_header),
+ NULL);
SET_TOGGLE_SENSITIVITY (customhdr_chkbtn, customhdr_edit_btn);
hbox_spc = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox_spc);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
- gtk_widget_set_usize (hbox_spc, 12, -1);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
label = gtk_label_new (_("Authentication method"));
gtk_widget_show (label);
hbox_spc = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox_spc);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
- gtk_widget_set_usize (hbox_spc, 12, -1);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
label = gtk_label_new (_("User ID"));
gtk_widget_show (label);
smtp_uid_entry = gtk_entry_new ();
gtk_widget_show (smtp_uid_entry);
- gtk_widget_set_usize (smtp_uid_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_widget_set_size_request (smtp_uid_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_box_pack_start (GTK_BOX (hbox), smtp_uid_entry, TRUE, TRUE, 0);
label = gtk_label_new (_("Password"));
smtp_pass_entry = gtk_entry_new ();
gtk_widget_show (smtp_pass_entry);
- gtk_widget_set_usize (smtp_pass_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_widget_set_size_request (smtp_pass_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_box_pack_start (GTK_BOX (hbox), smtp_pass_entry, TRUE, TRUE, 0);
gtk_entry_set_visibility (GTK_ENTRY (smtp_pass_entry), FALSE);
hbox_spc = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox_spc);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
- gtk_widget_set_usize (hbox_spc, 12, -1);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
label = gtk_label_new
(_("If you leave these entries empty, the same\n"
PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_chkbtn,
_("Authenticate with POP3 before sending"));
- gtk_signal_connect (GTK_OBJECT (pop_bfr_smtp_chkbtn), "clicked",
- GTK_SIGNAL_FUNC (pop_bfr_smtp_tm_set_sens),
- NULL);
+ g_signal_connect (G_OBJECT (pop_bfr_smtp_chkbtn), "clicked",
+ G_CALLBACK (pop_bfr_smtp_tm_set_sens),
+ NULL);
hbox = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox);
hbox_spc = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox_spc);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
- gtk_widget_set_usize (hbox_spc, 12, -1);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
label = gtk_label_new(_("POP authentication timeout: "));
gtk_widget_show (label);
pop_bfr_smtp_tm_entry = gtk_entry_new ();
gtk_widget_show (pop_bfr_smtp_tm_entry);
- gtk_widget_set_usize (pop_bfr_smtp_tm_entry, 30, -1);
+ gtk_widget_set_size_request (pop_bfr_smtp_tm_entry, 30, -1);
gtk_box_pack_start (GTK_BOX (hbox), pop_bfr_smtp_tm_entry, FALSE, FALSE, 0);
label = gtk_label_new(_("minutes"));
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);
+ gtk_widget_set_size_request (entry_sigsep, 64, -1);
sig_hbox = gtk_hbox_new (FALSE, 8);
gtk_widget_show (sig_hbox);
gtk_widget_show (sigfile_radiobtn);
gtk_box_pack_start (GTK_BOX (sig_hbox), sigfile_radiobtn,
FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (sigfile_radiobtn),
- GINT_TO_POINTER (SIG_FILE));
+ g_object_set_data (G_OBJECT (sigfile_radiobtn),
+ MENU_VAL_ID,
+ GINT_TO_POINTER (SIG_FILE));
sigcmd_radiobtn = gtk_radio_button_new_with_label_from_widget
(GTK_RADIO_BUTTON(sigfile_radiobtn), _("Command output"));
gtk_widget_show (sigcmd_radiobtn);
gtk_box_pack_start (GTK_BOX (sig_hbox), sigcmd_radiobtn,
FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (sigcmd_radiobtn),
- GINT_TO_POINTER (SIG_COMMAND));
+ g_object_set_data (G_OBJECT (sigcmd_radiobtn),
+ MENU_VAL_ID,
+ GINT_TO_POINTER (SIG_COMMAND));
hbox2 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox2);
compose.autoreplyto_entry = autoreplyto_entry;
}
-#if USE_GPGME
static void prefs_account_privacy_create(void)
{
GtkWidget *vbox1;
- GtkWidget *frame_mode;
- GtkWidget *vbox_mode;
- GtkWidget *frame1;
GtkWidget *vbox2;
GtkWidget *hbox1;
GtkWidget *label;
+ GtkWidget *default_privacy_system;
GtkWidget *default_encrypt_chkbtn;
GtkWidget *default_sign_chkbtn;
- GtkWidget *gnupg_mime_radiobtn;
- GtkWidget *gnupg_inline_radiobtn;
- GtkWidget *defaultkey_radiobtn;
- GtkWidget *emailkey_radiobtn;
- GtkWidget *customkey_radiobtn;
- GtkWidget *customkey_entry;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
- PACK_CHECK_BUTTON (vbox2, default_encrypt_chkbtn,
- _("Encrypt message by default"));
- PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
- _("Sign message by default"));
-
- PACK_FRAME (vbox1, frame_mode, _("Default mode"));
-
- vbox_mode = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox_mode);
- gtk_container_add (GTK_CONTAINER (frame_mode), vbox_mode);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_mode), 8);
-
- gnupg_mime_radiobtn = gtk_radio_button_new_with_label
- (NULL, _("Use PGP/MIME"));
- gtk_widget_show (gnupg_mime_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox_mode), gnupg_mime_radiobtn,
- FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (gnupg_mime_radiobtn),
- GINT_TO_POINTER (GNUPG_MODE_DETACH));
-
- gnupg_inline_radiobtn = gtk_radio_button_new_with_label_from_widget
- (GTK_RADIO_BUTTON (gnupg_mime_radiobtn),
- _("Use Inline"));
- gtk_widget_show (gnupg_inline_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox_mode), gnupg_inline_radiobtn,
- FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (gnupg_inline_radiobtn),
- GINT_TO_POINTER (GNUPG_MODE_INLINE));
- gtk_signal_connect (GTK_OBJECT (gnupg_inline_radiobtn), "clicked",
- prefs_account_gnupg_inline_warning, NULL);
-
-
- PACK_FRAME (vbox1, frame1, _("Sign key"));
-
- vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame1), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-
- defaultkey_radiobtn = gtk_radio_button_new_with_label
- (NULL, _("Use default GnuPG key"));
- gtk_widget_show (defaultkey_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox2), defaultkey_radiobtn,
- FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (defaultkey_radiobtn),
- GINT_TO_POINTER (SIGN_KEY_DEFAULT));
-
- emailkey_radiobtn = gtk_radio_button_new_with_label_from_widget
- (GTK_RADIO_BUTTON (defaultkey_radiobtn),
- _("Select key by your email address"));
- gtk_widget_show (emailkey_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox2), emailkey_radiobtn,
- FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (emailkey_radiobtn),
- GINT_TO_POINTER (SIGN_KEY_BY_FROM));
-
- customkey_radiobtn = gtk_radio_button_new_with_label_from_widget
- (GTK_RADIO_BUTTON (defaultkey_radiobtn),
- _("Specify key manually"));
- gtk_widget_show (customkey_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox2), customkey_radiobtn,
- FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (customkey_radiobtn),
- GINT_TO_POINTER (SIGN_KEY_CUSTOM));
-
- hbox1 = gtk_hbox_new (FALSE, 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 ("");
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
- gtk_widget_set_usize (label, 16, -1);
+ gtk_container_add (GTK_CONTAINER(vbox2), hbox1);
- label = gtk_label_new (_("User or key ID:"));
- gtk_widget_show (label);
+ label = gtk_label_new(_("Default privacy system"));
+ gtk_widget_show(label);
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
- customkey_entry = gtk_entry_new ();
- gtk_widget_show (customkey_entry);
- gtk_box_pack_start (GTK_BOX (hbox1), customkey_entry,
- TRUE, TRUE, 0);
-
- SET_TOGGLE_SENSITIVITY (customkey_radiobtn, customkey_entry);
+ default_privacy_system = gtk_option_menu_new();
+ gtk_widget_show (default_privacy_system);
+ gtk_box_pack_start (GTK_BOX(hbox1), default_privacy_system, TRUE, TRUE, 0);
+ PACK_CHECK_BUTTON (vbox2, default_encrypt_chkbtn,
+ _("Encrypt message by default"));
+ PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
+ _("Sign message by default"));
+
+ privacy.default_privacy_system = default_privacy_system;
privacy.default_encrypt_chkbtn = default_encrypt_chkbtn;
privacy.default_sign_chkbtn = default_sign_chkbtn;
- privacy.gnupg_mime_radiobtn = gnupg_mime_radiobtn;
- privacy.gnupg_inline_radiobtn = gnupg_inline_radiobtn;
- privacy.defaultkey_radiobtn = defaultkey_radiobtn;
- privacy.emailkey_radiobtn = emailkey_radiobtn;
- privacy.customkey_radiobtn = customkey_radiobtn;
- privacy.customkey_entry = customkey_entry;
}
-#endif /* USE_GPGME */
#if USE_OPENSSL
(GTK_RADIO_BUTTON (btn_p), label); \
gtk_widget_show (btn); \
gtk_box_pack_start (GTK_BOX (box), btn, FALSE, FALSE, 0); \
- gtk_object_set_user_data (GTK_OBJECT (btn), \
- GINT_TO_POINTER (data)); \
+ g_object_set_data (G_OBJECT (btn), \
+ MENU_VAL_ID, \
+ GINT_TO_POINTER (data)); \
}
#define CREATE_RADIO_BUTTONS(box, \
btn1 = gtk_radio_button_new_with_label(NULL, btn1_label); \
gtk_widget_show (btn1); \
gtk_box_pack_start (GTK_BOX (box), btn1, FALSE, FALSE, 0); \
- gtk_object_set_user_data (GTK_OBJECT (btn1), \
- GINT_TO_POINTER (btn1_data)); \
+ g_object_set_data (G_OBJECT (btn1), \
+ MENU_VAL_ID, \
+ GINT_TO_POINTER (btn1_data)); \
\
CREATE_RADIO_BUTTON(box, btn2, btn1, btn2_label, btn2_data); \
CREATE_RADIO_BUTTON(box, btn3, btn1, btn3_label, btn3_data); \
GtkWidget *smtp_ssltunnel_radiobtn;
GtkWidget *smtp_starttls_radiobtn;
+ GtkWidget *vbox6;
+ GtkWidget *use_nonblocking_ssl_chkbtn;
+ GtkWidget *hbox;
+ GtkWidget *hbox_spc;
+ GtkWidget *label;
+
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_widget_show (nntp_nossl_radiobtn);
gtk_box_pack_start (GTK_BOX (vbox4), nntp_nossl_radiobtn,
FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (nntp_nossl_radiobtn),
- GINT_TO_POINTER (SSL_NONE));
+ g_object_set_data (G_OBJECT (nntp_nossl_radiobtn),
+ MENU_VAL_ID,
+ GINT_TO_POINTER (SSL_NONE));
CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn,
_("Use SSL for NNTP connection"), SSL_TUNNEL);
_("Use STARTTLS command to start SSL session"),
SSL_STARTTLS);
+ vbox6 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox6);
+ gtk_box_pack_start (GTK_BOX (vbox1), vbox6, FALSE, FALSE, 0);
+
+ PACK_CHECK_BUTTON(vbox6, use_nonblocking_ssl_chkbtn,
+ _("Use non-blocking SSL"));
+
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox6), hbox, FALSE, FALSE, 0);
+
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox_spc);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 16, -1);
+
+ label = gtk_label_new
+ (_("(Turn this off if you have SSL connection problems)"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
ssl.pop_frame = pop_frame;
ssl.pop_nossl_radiobtn = pop_nossl_radiobtn;
ssl.pop_ssltunnel_radiobtn = pop_ssltunnel_radiobtn;
ssl.smtp_nossl_radiobtn = smtp_nossl_radiobtn;
ssl.smtp_ssltunnel_radiobtn = smtp_ssltunnel_radiobtn;
ssl.smtp_starttls_radiobtn = smtp_starttls_radiobtn;
+
+ ssl.use_nonblocking_ssl_chkbtn = use_nonblocking_ssl_chkbtn;
}
#undef CREATE_RADIO_BUTTONS
menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(advanced.crosspost_colormenu));
menuitem = gtk_menu_get_active(GTK_MENU(menu));
*((gint *)pparam->data) = GPOINTER_TO_INT
- (gtk_object_get_data(GTK_OBJECT(menuitem), "color"));
+ (g_object_get_data(G_OBJECT(menuitem), "color"));
}
static void prefs_account_crosspost_set_colormenu(PrefParam *pparam)
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;
#define PACK_PORT_ENTRY(box, entry) \
{ \
- entry = gtk_entry_new_with_max_length (5); \
+ entry = gtk_entry_new (); \
+ gtk_entry_set_max_length (GTK_ENTRY(entry), 5); \
gtk_widget_show (entry); \
gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 0); \
- gtk_widget_set_usize (entry, 64, -1); \
+ gtk_widget_set_size_request (entry, 64, -1); \
}
vbox1 = gtk_vbox_new (FALSE, VSPACING);
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);
PACK_HBOX (hbox1);
PACK_CHECK_BUTTON (hbox1, checkbtn_crosspost,
_("Mark cross-posted messages as read and color:"));
- gtk_signal_connect (GTK_OBJECT (checkbtn_crosspost), "toggled",
- GTK_SIGNAL_FUNC (crosspost_color_toggled),
- NULL);
+ g_signal_connect (G_OBJECT (checkbtn_crosspost), "toggled",
+ G_CALLBACK (crosspost_color_toggled),
+ NULL);
colormenu_crosspost = gtk_option_menu_new();
gtk_widget_show (colormenu_crosspost);
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);
gtk_widget_show (button); \
gtk_table_attach (GTK_TABLE (table), button, \
2, 3, n, n + 1, GTK_FILL, 0, 0, 0); \
- gtk_signal_connect \
- (GTK_OBJECT (button), "clicked", \
- GTK_SIGNAL_FUNC (prefs_account_select_folder_cb), \
+ g_signal_connect \
+ (G_OBJECT (button), "clicked", \
+ G_CALLBACK (prefs_account_select_folder_cb), \
entry); \
\
SET_TOGGLE_SENSITIVITY (chkbtn, entry); \
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;
return TRUE;
}
-static void prefs_account_key_pressed(GtkWidget *widget, GdkEventKey *event,
- gpointer data)
+static gboolean prefs_account_key_pressed(GtkWidget *widget, GdkEventKey *event,
+ gpointer data)
{
if (event && event->keyval == GDK_Escape)
prefs_account_cancel();
+ return FALSE;
}
static void prefs_account_ok(void)
menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(basic.protocol_optmenu));
menuitem = gtk_menu_get_active(GTK_MENU(menu));
protocol = GPOINTER_TO_INT
- (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+ (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
if (*gtk_entry_get_text(GTK_ENTRY(basic.acname_entry)) == '\0') {
alertpanel_error(_("Account name is not entered."));
alertpanel_error(_("Mail address is not entered."));
return -1;
}
- if ((protocol == A_POP3 || protocol == A_APOP || (protocol == A_LOCAL && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn)))) &&
+ if (((protocol == A_POP3) ||
+ (protocol == A_APOP) ||
+ (protocol == A_LOCAL && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn))) ||
+ (protocol == A_NONE)) &&
*gtk_entry_get_text(GTK_ENTRY(basic.smtpserv_entry)) == '\0') {
alertpanel_error(_("SMTP server is not entered."));
return -1;
GSList *group;
radiobtn = GTK_RADIO_BUTTON (*pparam->widget);
- group = gtk_radio_button_group (radiobtn);
+ group = gtk_radio_button_get_group (radiobtn);
while (group != NULL) {
GtkToggleButton *btn = GTK_TOGGLE_BUTTON (group->data);
if (gtk_toggle_button_get_active (btn)) {
*((gint *)pparam->data) = GPOINTER_TO_INT
- (gtk_object_get_user_data (GTK_OBJECT (btn)));
+ (g_object_get_data (G_OBJECT (btn), MENU_VAL_ID));
break;
}
group = group->next;
data = GINT_TO_POINTER (*((gint *)pparam->data));
radiobtn = GTK_RADIO_BUTTON (*pparam->widget);
- group = gtk_radio_button_group (radiobtn);
+ group = gtk_radio_button_get_group (radiobtn);
while (group != NULL) {
GtkToggleButton *btn = GTK_TOGGLE_BUTTON (group->data);
- gpointer data1 = gtk_object_get_user_data (GTK_OBJECT (btn));
+ gpointer data1 = g_object_get_data (G_OBJECT (btn), MENU_VAL_ID);
if (data1 == data) {
gtk_toggle_button_set_active (btn, TRUE);
break;
}
}
-#if USE_GPGME
-static void prefs_account_gnupg_inline_warning(GtkWidget *widget)
-{
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) &&
- gtk_notebook_get_current_page(GTK_NOTEBOOK(dialog.notebook)) > 0)
- alertpanel_warning
- (_("Its not recommended to use the old style Inline\n"
- "mode for GnuPG messages. It doesn't comply with\n"
- "RFC 3156 - MIME Security with OpenPGP."));
-}
-#endif /* USE_GPGME */
-
static void prefs_account_protocol_set_data_from_optmenu(PrefParam *pparam)
{
GtkWidget *menu;
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)));
+ (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
}
static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
-1, /* A_RPOP */
2, /* A_IMAP4 */
3, /* A_NNTP */
- 4 /* A_LOCAL */
+ 4, /* A_LOCAL */
+ 5, /* A_NONE */
};
protocol = *((RecvProtocol *)pparam->data);
- if (protocol < 0 || protocol > A_LOCAL) return;
+ if (protocol < 0 || protocol > A_NONE) return;
if (list_order[protocol] < 0) return;
gtk_option_menu_set_history(optmenu, list_order[protocol]);
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
+ (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+}
+
+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;
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)));
+ (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
}
static void prefs_account_smtp_auth_type_set_optmenu(PrefParam *pparam)
gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
}
+static void prefs_account_set_string_from_optmenu(PrefParam *pparam)
+{
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+ gchar **str;
+
+ g_return_if_fail(*pparam->widget != NULL);
+
+ menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
+ menuitem = gtk_menu_get_active(GTK_MENU(menu));
+ if (menuitem == NULL)
+ return;
+
+ str = (gchar **) pparam->data;
+ g_free(*str);
+ *str = g_strdup(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+}
+
+static void prefs_account_set_optmenu_from_string(PrefParam *pparam)
+{
+ GtkWidget *optionmenu;
+ GtkWidget *menu;
+ gboolean found = FALSE;
+ GList *children, *cur;
+ gchar *prefsid;
+ guint i = 0;
+
+ g_return_if_fail(*pparam->widget != NULL);
+
+ prefsid = *((gchar **) pparam->data);
+ if (prefsid == NULL)
+ return;
+
+ optionmenu = *pparam->widget;
+ menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(optionmenu));
+ children = gtk_container_children(GTK_CONTAINER(menu));
+ for (cur = children; cur != NULL; cur = g_list_next(cur)) {
+ GtkWidget *item = (GtkWidget *) cur->data;
+ gchar *id;
+
+ id = g_object_get_data(G_OBJECT(item), MENU_VAL_ID);
+ if (id != NULL && strcmp(id, prefsid) == 0) {
+ found = TRUE;
+ gtk_option_menu_set_history(GTK_OPTION_MENU(optionmenu), i);
+ }
+ i++;
+ }
+
+ if (!found) {
+ gchar *name;
+ GtkWidget *menuitem;
+
+ name = g_strdup_printf(_("Unsupported (%s)"), prefsid);
+ menuitem = gtk_menu_item_new_with_label(name);
+ gtk_widget_show(menuitem);
+ g_object_set_data_full(G_OBJECT(menuitem), MENU_VAL_ID, g_strdup(prefsid), g_free);
+ gtk_menu_append(GTK_MENU(menu), menuitem);
+ g_free(name);
+
+ gtk_option_menu_set_history(GTK_OPTION_MENU(optionmenu), i);
+ }
+
+ g_list_free(children);
+}
+
static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
{
RecvProtocol protocol;
protocol = GPOINTER_TO_INT
- (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+ (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
switch(protocol) {
case A_NNTP:
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_NONE:
+ gtk_widget_hide(basic.nntpserv_label);
+ gtk_widget_hide(basic.nntpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 0, 0);
+ gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
+ gtk_widget_hide(basic.nntpauth_chkbtn);
+
+ gtk_widget_set_sensitive(basic.nntpauth_onconnect_chkbtn, FALSE);
+ gtk_widget_hide(basic.nntpauth_onconnect_chkbtn);
+
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 1, 0);
+ gtk_widget_set_sensitive(basic.recvserv_label, FALSE);
+ gtk_widget_set_sensitive(basic.recvserv_entry, FALSE);
+ gtk_widget_hide(basic.recvserv_label);
+ gtk_widget_hide(basic.recvserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 2, VSPACING_NARROW);
+ gtk_widget_show(basic.smtpserv_label);
+ gtk_widget_show(basic.smtpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 4, VSPACING_NARROW);
+ gtk_widget_hide(basic.localmbox_label);
+ gtk_widget_hide(basic.localmbox_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 3, 0);
+ gtk_widget_hide(basic.mailcmd_label);
+ gtk_widget_hide(basic.mailcmd_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 6, 0);
+ gtk_widget_hide(basic.mailcmd_chkbtn);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 5, 0);
+ gtk_widget_hide(basic.uid_label);
+ gtk_widget_hide(basic.pass_label);
+ gtk_widget_hide(basic.uid_entry);
+ gtk_widget_hide(basic.pass_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 7, VSPACING_NARROW);
+
+ gtk_widget_set_sensitive(basic.uid_label, FALSE);
+ gtk_widget_set_sensitive(basic.pass_label, FALSE);
+ gtk_widget_set_sensitive(basic.uid_entry, FALSE);
+ gtk_widget_set_sensitive(basic.pass_entry, FALSE);
+ gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
+ 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, FALSE);
+
+ gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
+ gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
+
+ /* update pop_before_smtp sensitivity */
+ gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
+ pop_bfr_smtp_tm_set_sens(NULL, NULL);
+
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn), FALSE);
+
+#if USE_OPENSSL
+ gtk_widget_hide(ssl.pop_frame);
+ gtk_widget_hide(ssl.imap_frame);
+ gtk_widget_hide(ssl.nntp_frame);
+ gtk_widget_show(ssl.send_frame);
+#endif
+ gtk_widget_hide(advanced.popport_hbox);
+ gtk_widget_hide(advanced.imapport_hbox);
+ gtk_widget_hide(advanced.nntpport_hbox);
+ gtk_widget_hide(advanced.crosspost_chkbtn);
+ gtk_widget_hide(advanced.crosspost_colormenu);
+ 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_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