/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net>
+ * Copyright (C) 1999-2015 Colin Leroy <colin@colino.net>
* and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
#include <gtk/gtk.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "utils.h"
#include "gtk/menu.h"
#include "plugin.h"
#include "setup.h"
#include "folder.h"
#include "alertpanel.h"
-#ifdef USE_OPENSSL
+#include "filesel.h"
+#ifdef USE_GNUTLS
#include "ssl.h"
#endif
#include "prefs_common.h"
+#include "combobox.h"
typedef enum
{
GtkWidget *organization;
GtkWidget *mailbox_name;
+ GtkWidget *mailbox_label;
GtkWidget *smtp_server;
GtkWidget *smtp_auth;
GtkWidget *recv_imap_subdir;
GtkWidget *subsonly_checkbtn;
GtkWidget *no_imap_warning;
-#ifdef USE_OPENSSL
+#ifdef USE_GNUTLS
GtkWidget *smtp_use_ssl;
GtkWidget *recv_use_ssl;
GtkWidget *smtp_use_tls;
GtkWidget *recv_use_tls;
+ GtkWidget *smtp_ssl_cert_file;
+ GtkWidget *recv_ssl_cert_file;
+ GtkWidget *smtp_ssl_cert_pass;
+ GtkWidget *recv_ssl_cert_pass;
+ GtkWidget *smtp_cert_table;
+ GtkWidget *recv_cert_table;
+#endif
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+ GtkWidget *auto_configure_lbl;
+ GtkWidget *auto_configure_btn;
+ GtkWidget *auto_configure_cancel_btn;
#endif
-
gboolean create_mailbox;
gboolean finished;
gboolean result;
gchar *mailbox;
gboolean smtpssl;
gboolean recvssl;
+ gchar *smtpssl_cert;
+ gchar *recvssl_cert;
+ gchar *smtpssl_cert_pass;
+ gchar *recvssl_cert_pass;
} AccountTemplate;
static AccountTemplate tmpl;
&tmpl.smtpssl, P_INT, NULL, NULL, NULL},
{"recvssl", "0",
&tmpl.recvssl, P_INT, NULL, NULL, NULL},
+ {"smtpssl_cert", "",
+ &tmpl.smtpssl_cert, P_STRING, NULL, NULL, NULL},
+ {"recvssl_cert", "",
+ &tmpl.recvssl_cert, P_STRING, NULL, NULL, NULL},
+ {"smtpssl_cert_pass", "",
+ &tmpl.smtpssl_cert, P_STRING, NULL, NULL, NULL},
+ {"recvssl_cert_pass", "",
+ &tmpl.recvssl_cert, P_STRING, NULL, NULL, NULL},
{NULL, NULL, NULL, P_INT, NULL, NULL, NULL}
};
"#organization=\n"
"\n"
"#you can use $DOMAIN here \n"
- "#the default is stmp.$DOMAIN\n"
+ "#the default is smtp.$DOMAIN\n"
"#smtpserver=\n"
"\n"
"#Whether to use smtp authentication\n"
"#default is \"Mail\"\n"
"#mailbox=\n"
"\n"
- "#whether to use ssl on STMP connections\n"
+ "#whether to use ssl on smtp connections\n"
"#default is 0, 1 is ssl, 2 is starttls\n"
"#smtpssl=\n"
"\n"
"#whether to use ssl on pop or imap connections\n"
"#default is 0, 1 is ssl, 2 is starttls\n"
- "#recvssl=\n";
+ "#recvssl=\n"
+ "\n"
+ "#SSL client certificate path for SMTP\n"
+ "#default is empty (no certificate)\n"
+ "#smtpssl_cert=\n"
+ "\n"
+ "#SSL client certificate path for POP/IMAP\n"
+ "#default is empty (no certificate)\n"
+ "#recvssl_cert=\n"
+ "\n"
+ "#SSL client certificate password for SMTP\n"
+ "#default is empty (no password)\n"
+ "#smtpssl_cert_pass=\n"
+ "\n"
+ "#SSL client certificate password for POP/IMAP\n"
+ "#default is empty (no password)\n"
+ "#recvssl_cert_pass=\n"
+ ;
static gchar *wizard_get_default_domain_name(void)
{
if (domain_name == NULL) {
domain_name = g_strdup(get_domain_name());
- if (strchr(domain_name, '.') != strrchr(domain_name, '.')
+ if (strchr(domain_name, '.') != NULL
+ && strchr(domain_name, '.') != strrchr(domain_name, '.')
&& strlen(strchr(domain_name, '.')) > 6) {
gchar *tmp = g_strdup(strchr(domain_name, '.')+1);
g_free(domain_name);
static gchar *get_name_for_mail(void)
{
- gchar *name = g_strdup(tmpl.name);
- if (name == NULL)
+ gchar *name = NULL;
+ if (tmpl.name == NULL)
return NULL;
- g_strdown(name);
+ name = g_utf8_strdown(tmpl.name, -1);
while(strstr(name, " "))
*strstr(name, " ")='.';
#define PARSE_DEFAULT(str) { \
gchar *tmp = NULL, *new = NULL; \
if (str != NULL) { \
- tmp = g_strdup(str); \
if (strstr(str, "$USERNAME")) { \
- tmp = g_strdup(str); \
+ tmp = g_strdup(str); \
*strstr(tmp, "$USERNAME") = '\0'; \
new = g_strconcat(tmp, g_get_real_name(), \
strstr(str, "$USERNAME")+strlen("$USERNAME"), \
new = NULL; \
} \
if (strstr(str, "$LOGIN")) { \
- tmp = g_strdup(str); \
+ tmp = g_strdup(str); \
*strstr(tmp, "$LOGIN") = '\0'; \
new = g_strconcat(tmp, g_get_user_name(), \
strstr(str, "$LOGIN")+strlen("$LOGIN"), \
new = NULL; \
} \
if (strstr(str, "$EMAIL")) { \
- tmp = g_strdup(str); \
+ tmp = g_strdup(str); \
*strstr(tmp, "$EMAIL") = '\0'; \
new = g_strconcat(tmp, tmpl.email, \
strstr(str, "$EMAIL")+strlen("$EMAIL"), \
new = NULL; \
} \
if (strstr(str, "$NAME_MAIL")) { \
- tmp = g_strdup(str); \
+ tmp = g_strdup(str); \
*strstr(tmp, "$NAME_MAIL") = '\0'; \
new = g_strconcat(tmp, get_name_for_mail(), \
strstr(str, "$NAME_MAIL")+strlen("$NAME_MAIL"), \
new = NULL; \
} \
if (strstr(str, "$DEFAULTDOMAIN")) { \
- tmp = g_strdup(str); \
+ tmp = g_strdup(str); \
*strstr(tmp, "$DEFAULTDOMAIN") = '\0'; \
new = g_strconcat(tmp, wizard_get_default_domain_name(), \
strstr(str, "$DEFAULTDOMAIN")+strlen("$DEFAULTDOMAIN"), \
new = NULL; \
} \
if (strstr(str, "$DOMAIN")) { \
- tmp = g_strdup(str); \
+ tmp = g_strdup(str); \
*strstr(tmp, "$DOMAIN") = '\0'; \
new = g_strconcat(tmp, tmpl.domain, \
strstr(str, "$DOMAIN")+strlen("$DOMAIN"), \
PARSE_DEFAULT(tmpl.mboxfile);
PARSE_DEFAULT(tmpl.mailbox);
/*
- printf("defaults:"
+ g_print("defaults:"
"%s, %s, %s, %s, %s, %d, %s, %s, %s, %s, %s, %s, %d, %d\n",
tmpl.name,tmpl.domain,tmpl.email,tmpl.organization,tmpl.smtpserver,
tmpl.recvtype,tmpl.recvserver,tmpl.recvuser,tmpl.recvpass,
{
GtkWidget *widget = wizard->email;
gint size = pango_font_description_get_size(
- widget->style->font_desc)
+ gtk_widget_get_style(widget)->font_desc)
/PANGO_SCALE;
gchar *tmp, *new;
-
+#ifdef G_OS_WIN32
+ PangoFontDescription *bold_desc;
+ gchar *curfont = pango_font_description_to_string(widget->style->font_desc);
+ g_free(prefs_common.smallfont);
+ g_free(prefs_common.normalfont);
+ g_free(prefs_common.boldfont);
+ prefs_common.smallfont = g_strdup(curfont);
+ prefs_common.normalfont = g_strdup(curfont);
+ bold_desc = pango_font_description_from_string(curfont);
+ pango_font_description_set_weight(bold_desc, PANGO_WEIGHT_BOLD);
+ prefs_common.boldfont = pango_font_description_to_string(bold_desc);
+ pango_font_description_free(bold_desc);
+ g_free(curfont);
+#endif
tmp = g_strdup(prefs_common.textfont);
if (strrchr(tmp, ' ')) {
*(strrchr(tmp, ' ')) = '\0';
prefs_common.normalfont = new;
}
g_free(tmp);
+
+ tmp = g_strdup(prefs_common.boldfont);
+ if (strrchr(tmp, ' ')) {
+ *(strrchr(tmp, ' ')) = '\0';
+ new = g_strdup_printf("%s %d", tmp, size);
+ g_free(prefs_common.boldfont);
+ prefs_common.boldfont = new;
+ }
+ g_free(tmp);
}
#define XFACE "+}Axz@~a,-Yx?0Ysa|q}CLRH=89Y]\"')DSX^<6p\"d)'81yx5%G#u^o*7JG&[aPU0h1Ux.vb2yIjH83{5`/bVo|~nn/i83vE^E)qk-4W)_E.4Y=D*qvf/,Ci_=P<iY<M6"
get_rfc822_date(buf_date, sizeof(buf_date));
conv_encode_header_full(enc_subject, sizeof(enc_subject),
- Q_("Welcome Mail Subject|Welcome to Claws Mail"),
+ C_("Welcome Mail Subject", "Welcome to Claws Mail"),
strlen("Subject: "), FALSE, CS_INTERNAL);
conv_encode_header_full(enc_to_name, sizeof(enc_to_name),
gtk_entry_get_text(GTK_ENTRY(wizard->full_name)),
g_free(head);
g_free(body);
g_free(msg);
- g_unlink(file);
+ claws_unlink(file);
}
#undef XFACE
static gboolean mailbox_ok = FALSE;
PrefsAccount *prefs_account = prefs_account_new();
GList *account_list = NULL;
- GtkWidget *menu, *menuitem;
gchar *smtp_server, *recv_server;
- gchar *tmp;
gint smtp_port, recv_port;
-#ifdef USE_OPENSSL
+#ifdef USE_GNUTLS
SSLType smtp_ssl_type, recv_ssl_type;
#endif
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(wizard->recv_type));
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- prefs_account->protocol = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
-
+ prefs_account->protocol = combobox_get_active_data(
+ GTK_COMBO_BOX(wizard->recv_type));
if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4 &&
!strlen(gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name)))) {
gtk_entry_get_text(GTK_ENTRY(wizard->organization)));
prefs_account->smtp_server = g_strdup(smtp_server);
- tmp = g_path_get_basename(gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name)));
- prefs_account->inbox = g_strdup_printf("#mh/%s/inbox",
+ if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4) {
+ gchar *tmp;
+ tmp = g_path_get_basename(gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name)));
+ prefs_account->inbox = g_strdup_printf("#mh/%s/inbox",
(!strcmp("Mail", gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name))))
?_("Mailbox"):tmp);
- g_free(tmp);
- prefs_account->local_inbox = g_strdup(prefs_account->inbox);
+ g_free(tmp);
+ prefs_account->local_inbox = g_strdup(prefs_account->inbox);
+ } else if (prefs_account->protocol != A_IMAP4) {
+ if (folder_get_default_inbox())
+ prefs_account->local_inbox =
+ folder_item_get_identifier(folder_get_default_inbox());
+ }
if (prefs_account->protocol != A_LOCAL)
prefs_account->recv_server = g_strdup(recv_server);
prefs_account->use_smtp_auth = TRUE;
}
-#ifdef USE_OPENSSL
+#ifdef USE_GNUTLS
smtp_ssl_type = SSL_NONE;
recv_ssl_type = SSL_NONE;
else
prefs_account->ssl_pop = recv_ssl_type;
+ prefs_account->out_ssl_client_cert_file = g_strdup(
+ gtk_entry_get_text(GTK_ENTRY(wizard->smtp_ssl_cert_file)));
+ prefs_account->out_ssl_client_cert_pass = g_strdup(
+ gtk_entry_get_text(GTK_ENTRY(wizard->smtp_ssl_cert_pass)));
+ prefs_account->in_ssl_client_cert_file = g_strdup(
+ gtk_entry_get_text(GTK_ENTRY(wizard->recv_ssl_cert_file)));
+ prefs_account->in_ssl_client_cert_pass = g_strdup(
+ gtk_entry_get_text(GTK_ENTRY(wizard->recv_ssl_cert_pass)));
#endif
if (prefs_account->protocol == A_IMAP4) {
gchar *directory = gtk_editable_get_chars(
initialize_fonts(wizard);
if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4)
write_welcome_email(wizard);
-
+
#ifndef G_OS_WIN32
plugin_load_standard_plugins();
#endif
WizardWindow *wizard = (WizardWindow *)data;
RecvProtocol protocol;
gchar *text;
- protocol = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(wizard->recv_type), MENU_VAL_ID));
+ protocol = combobox_get_active_data(GTK_COMBO_BOX(wizard->recv_type));
text = get_default_server(wizard, "smtp");
gtk_entry_set_text(GTK_ENTRY(wizard->smtp_server), text);
{
GtkWidget *table = gtk_table_new(1,1, FALSE);
GtkWidget *vbox;
- GtkWidget *hbox;
+ GtkWidget *label;
+ GtkWidget *user_table;
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
gtk_table_attach(GTK_TABLE(table), vbox, 0,1,1,2,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ user_table = gtk_table_new(3, 2, FALSE);
+ gtk_table_set_row_spacings(GTK_TABLE(user_table), VSPACING_NARROW);
+ gtk_box_pack_start(GTK_BOX(vbox), user_table, FALSE, FALSE, 0);
+
+ label = gtk_label_new(_("<span weight=\"bold\">Your name:</span>"));
+ gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ gtk_table_attach(GTK_TABLE(user_table), label, 0,1,0,1,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->full_name = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->full_name), tmpl.name?tmpl.name:"");
- PACK_BOX(hbox, _("<span weight=\"bold\">Your name:</span>"),
- wizard->full_name);
-
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ gtk_table_attach(GTK_TABLE(user_table), wizard->full_name, 1,2,0,1,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new(_("<span weight=\"bold\">Your email address:</span>"));
+ gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ gtk_table_attach(GTK_TABLE(user_table), label, 0,1,1,2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->email = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->email), tmpl.email?tmpl.email:"");
- PACK_BOX(hbox, _("<span weight=\"bold\">Your email address:</span>"),
- wizard->email);
-
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ gtk_table_attach(GTK_TABLE(user_table), wizard->email, 1,2,1,2,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new(_("Your organization:"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ gtk_table_attach(GTK_TABLE(user_table), label, 0,1,2,3,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->organization = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->organization), tmpl.organization?tmpl.organization:"");
- PACK_BOX(hbox, _("Your organization:"), wizard->organization);
+ gtk_table_attach(GTK_TABLE(user_table), wizard->organization, 1,2,2,3,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
g_signal_connect(G_OBJECT(wizard->email), "changed",
G_CALLBACK(wizard_email_changed),
GtkWidget *table = gtk_table_new(1,1, FALSE);
GtkWidget *vbox;
GtkWidget *hbox;
- GtkTooltips *tips = gtk_tooltips_new();
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+ wizard->mailbox_label = gtk_label_new(_("<span weight=\"bold\">Mailbox name:</span>"));
+ gtk_label_set_use_markup(GTK_LABEL(wizard->mailbox_label), TRUE);
+ if (GTK_IS_MISC(wizard->mailbox_label))
+ gtk_misc_set_alignment(GTK_MISC(wizard->mailbox_label), 1, 0.5);
wizard->mailbox_name = gtk_entry_new();
+
gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), tmpl.mailbox?tmpl.mailbox:"");
- gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), wizard->mailbox_name,
- _("You can also specify an absolute path, for example: "
- "\"/home/john/Documents/Mail\""),
- NULL);
+ CLAWS_SET_TIP(wizard->mailbox_name, _("You can also specify an absolute path, for example: "
+ "\"/home/john/Documents/Mail\""));
+
+ gtk_box_pack_start(GTK_BOX(hbox), wizard->mailbox_label, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), wizard->mailbox_name, TRUE, TRUE, 0);
- PACK_BOX(hbox, _("<span weight=\"bold\">Mailbox name:</span>"),
- wizard->mailbox_name);
-
return table;
}
gtk_widget_set_sensitive(wizard->smtp_password_label, do_auth);
}
+#ifdef USE_GNUTLS
+static void cert_browse_cb(GtkWidget *widget, gpointer data)
+{
+ GtkEntry *dest = GTK_ENTRY(data);
+ gchar *filename;
+ gchar *utf8_filename;
+
+ filename = filesel_select_file_open(_("Select certificate file"), NULL);
+ if (!filename) return;
+
+ utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+ if (!utf8_filename) {
+ g_warning("cert_browse_cb(): failed to convert character set.");
+ utf8_filename = g_strdup(filename);
+ }
+ gtk_entry_set_text(dest, utf8_filename);
+ g_free(utf8_filename);
+}
+#endif
+
static GtkWidget* smtp_page (WizardWindow * wizard)
{
GtkWidget *table = gtk_table_new(1, 1, FALSE);
GtkWidget *vbox;
GtkWidget *hbox;
- GtkTooltips *tips = gtk_tooltips_new();
+ GtkWidget *hbox_spc;
+ GtkWidget *smtp_auth_table;
+ GtkWidget *label;
+#ifdef USE_GNUTLS
+ GtkWidget *button;
+ GtkWidget *smtp_cert_table;
+#endif
gchar *text;
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_entry_set_text(GTK_ENTRY(wizard->smtp_server), text);
g_free(text);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), wizard->smtp_server,
+ CLAWS_SET_TIP(wizard->smtp_server,
_("You can specify the port number by appending it at the end: "
- "\"mail.example.com:25\""),
- NULL);
+ "\"mail.example.com:25\""));
PACK_BOX(hbox, _("<span weight=\"bold\">SMTP server address:</span>"),
wizard->smtp_server);
-
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->smtp_auth = gtk_check_button_new_with_label(
wizard);
gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_auth, FALSE, FALSE, 0);
- text = get_default_smtp_account(wizard);
+ label = gtk_label_new(_("<span size=\"small\">(empty to use the same as receive)</span>"));
+ gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+ SET_TOGGLE_SENSITIVITY (wizard->smtp_auth, label);
+ gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+ smtp_auth_table = gtk_table_new(2, 2, FALSE);
+ SET_TOGGLE_SENSITIVITY (wizard->smtp_auth, smtp_auth_table);
+ gtk_box_pack_start(GTK_BOX(hbox), smtp_auth_table, TRUE, TRUE, 0);
+
+ wizard->smtp_username_label = gtk_label_new(_("SMTP username:"));
+ gtk_misc_set_alignment(GTK_MISC(wizard->smtp_username_label), 1, 0.5);
+ gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_username_label, 0,1,0,1,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
+ text = get_default_smtp_account(wizard);
wizard->smtp_username = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->smtp_username), text);
g_free(text);
- wizard->smtp_username_label = gtk_label_new(_("SMTP username:\n"
- "<span size=\"small\">(empty to use the same as receive)</span>"));
- gtk_label_set_use_markup(GTK_LABEL(wizard->smtp_username_label), TRUE);
- if (GTK_IS_MISC(wizard->smtp_username_label))
- gtk_misc_set_alignment(GTK_MISC(wizard->smtp_username_label), 1, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_username_label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_username, TRUE, TRUE, 0);
+ gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_username, 1,2,0,1,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ wizard->smtp_password_label = gtk_label_new(_("SMTP password:"));
+ gtk_misc_set_alignment(GTK_MISC(wizard->smtp_password_label), 1, 0.5);
+ gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_password_label, 0,1,1,2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->smtp_password = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->smtp_password), tmpl.smtppass?tmpl.smtppass:"");
gtk_entry_set_visibility(GTK_ENTRY(wizard->smtp_password), FALSE);
- wizard->smtp_password_label = gtk_label_new(_("SMTP password:\n"
- "<span size=\"small\">(empty to use the same as receive)</span>"));
- gtk_label_set_use_markup(GTK_LABEL(wizard->smtp_password_label), TRUE);
- if (GTK_IS_MISC(wizard->smtp_password_label))
- gtk_misc_set_alignment(GTK_MISC(wizard->smtp_password_label), 1, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_password_label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_password, TRUE, TRUE, 0);
-#ifdef USE_OPENSSL
+ gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_password, 1,2,1,2,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
+#ifdef USE_GNUTLS
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->smtp_use_ssl = gtk_check_button_new_with_label(
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
wizard->smtp_use_tls = gtk_check_button_new_with_label(
_("Use SSL via STARTTLS"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_tls),
tmpl.smtpssl == 2);
gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_use_tls, FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY (wizard->smtp_use_ssl, wizard->smtp_use_tls);
+
+ smtp_cert_table = gtk_table_new(3,3, FALSE);
+ gtk_box_pack_start (GTK_BOX(vbox), smtp_cert_table, FALSE, FALSE, 4);
+ hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+ label = gtk_label_new(_("Client SSL certificate (optional)"));
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
+ hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+ label = gtk_label_new(_("File"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 1, 1, 2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
+ wizard->smtp_ssl_cert_file = gtk_entry_new();
+ gtk_entry_set_text(GTK_ENTRY(wizard->smtp_ssl_cert_file), tmpl.smtpssl_cert?tmpl.smtpssl_cert:"");
+ gtk_table_attach(GTK_TABLE(smtp_cert_table), wizard->smtp_ssl_cert_file, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
+ button = gtkut_get_browse_file_btn(_("Browse"));
+ gtk_table_attach(GTK_TABLE(smtp_cert_table), button, 2, 3, 1, 2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(cert_browse_cb), wizard->smtp_ssl_cert_file);
+
+ hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+ label = gtk_label_new(_("Password"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 1, 2, 3,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
+ wizard->smtp_ssl_cert_pass = gtk_entry_new();
+ gtk_entry_set_visibility(GTK_ENTRY(wizard->smtp_ssl_cert_pass), FALSE);
+ gtk_entry_set_text(GTK_ENTRY(wizard->smtp_ssl_cert_pass), tmpl.smtpssl_cert_pass?tmpl.smtpssl_cert_pass:"");
+ gtk_table_attach(GTK_TABLE(smtp_cert_table), wizard->smtp_ssl_cert_pass, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
+ SET_TOGGLE_SENSITIVITY (wizard->smtp_use_ssl, smtp_cert_table);
+ wizard->smtp_cert_table = smtp_cert_table;
#endif
smtp_auth_changed(NULL, wizard);
return table;
gtk_widget_show(wizard->recv_username_label);
gtk_widget_show(wizard->recv_password_label);
gtk_widget_hide(wizard->no_imap_warning);
-#ifdef USE_OPENSSL
+#ifdef USE_GNUTLS
gtk_widget_show(wizard->recv_use_ssl);
gtk_widget_show(wizard->recv_use_tls);
+ gtk_widget_show(wizard->recv_cert_table);
+#endif
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+ gtk_widget_show(wizard->auto_configure_btn);
+ gtk_widget_hide(wizard->auto_configure_cancel_btn);
+ gtk_widget_show(wizard->auto_configure_lbl);
#endif
gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("<span weight=\"bold\">Server address:</span>"));
gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, TRUE);
g_free(text);
+ if (wizard->create_mailbox) {
+ gtk_widget_show(wizard->mailbox_label);
+ gtk_widget_show(wizard->mailbox_name);
+ }
} else if (protocol == A_IMAP4) {
#ifdef HAVE_LIBETPAN
text = get_default_server(wizard, "imap");
gtk_widget_show(wizard->recv_username_label);
gtk_widget_show(wizard->recv_password_label);
gtk_widget_hide(wizard->no_imap_warning);
-#ifdef USE_OPENSSL
+#ifdef USE_GNUTLS
gtk_widget_show(wizard->recv_use_ssl);
gtk_widget_show(wizard->recv_use_tls);
+ gtk_widget_show(wizard->recv_cert_table);
+#endif
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+ gtk_widget_show(wizard->auto_configure_btn);
+ gtk_widget_hide(wizard->auto_configure_cancel_btn);
+ gtk_widget_show(wizard->auto_configure_lbl);
#endif
gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("<span weight=\"bold\">Server address:</span>"));
gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, TRUE);
g_free(text);
+ if (wizard->create_mailbox) {
+ gtk_widget_hide(wizard->mailbox_label);
+ gtk_widget_hide(wizard->mailbox_name);
+ }
#else
gtk_widget_hide(wizard->recv_imap_label);
gtk_widget_hide(wizard->recv_imap_subdir);
gtk_widget_hide(wizard->recv_username_label);
gtk_widget_hide(wizard->recv_password_label);
gtk_widget_show(wizard->no_imap_warning);
-#ifdef USE_OPENSSL
+ if (wizard->create_mailbox) {
+ gtk_widget_hide(wizard->mailbox_label);
+ gtk_widget_hide(wizard->mailbox_name);
+ }
+#ifdef USE_GNUTLS
gtk_widget_hide(wizard->recv_use_ssl);
gtk_widget_hide(wizard->recv_use_tls);
+ gtk_widget_hide(wizard->recv_cert_table);
#endif
gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, FALSE);
#endif
gtk_widget_hide(wizard->recv_password);
gtk_widget_hide(wizard->recv_username_label);
gtk_widget_hide(wizard->recv_password_label);
-#ifdef USE_OPENSSL
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+ gtk_widget_hide(wizard->auto_configure_btn);
+ gtk_widget_hide(wizard->auto_configure_cancel_btn);
+ gtk_widget_hide(wizard->auto_configure_lbl);
+#endif
+#ifdef USE_GNUTLS
gtk_widget_hide(wizard->recv_use_ssl);
gtk_widget_hide(wizard->recv_use_tls);
+ gtk_widget_hide(wizard->recv_cert_table);
#endif
+ if (wizard->create_mailbox) {
+ gtk_widget_show(wizard->mailbox_label);
+ gtk_widget_show(wizard->mailbox_name);
+ }
gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, TRUE);
}
}
-static void wizard_protocol_changed(GtkMenuItem *menuitem, gpointer data)
+static void wizard_protocol_changed(GtkComboBox *combo, gpointer data)
{
WizardWindow *wizard = (WizardWindow *)data;
- RecvProtocol protocol;
- protocol = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+ RecvProtocol protocol = combobox_get_active_data(combo);
wizard_protocol_change(wizard, protocol);
}
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+static void auto_configure_cb (GtkWidget *widget, gpointer data)
+{
+ gchar *address = NULL;
+ AutoConfigureData *recv_data;
+ AutoConfigureData *send_data;
+ static GCancellable *recv_cancel = NULL;
+ static GCancellable *send_cancel = NULL;
+ WizardWindow *wizard = (WizardWindow *)data;
+ RecvProtocol protocol = combobox_get_active_data(GTK_COMBO_BOX(wizard->recv_type));
+
+ if (!recv_cancel) {
+ recv_cancel = g_cancellable_new();
+ send_cancel = g_cancellable_new();
+ }
+
+ if (widget == wizard->auto_configure_cancel_btn) {
+ g_cancellable_cancel(recv_cancel);
+ g_cancellable_cancel(send_cancel);
+ g_object_unref(recv_cancel);
+ g_object_unref(send_cancel);
+ recv_cancel = NULL;
+ send_cancel = NULL;
+ return;
+ }
+
+ address = gtk_editable_get_chars(GTK_EDITABLE(wizard->email), 0, -1);
+
+ if (strchr(address, '@') == NULL) {
+ g_free(address);
+ gtk_label_set_text(GTK_LABEL(wizard->auto_configure_lbl),
+ _("Failed (wrong address)"));
+ return;
+ }
+
+ if (protocol == A_POP3 || protocol == A_IMAP4) {
+ recv_data = g_new0(AutoConfigureData, 1);
+ recv_data->configure_button = GTK_BUTTON(wizard->auto_configure_btn);
+ recv_data->cancel_button = GTK_BUTTON(wizard->auto_configure_cancel_btn);
+ recv_data->info_label = GTK_LABEL(wizard->auto_configure_lbl);
+ recv_data->uid_entry = GTK_ENTRY(wizard->recv_username);
+ recv_data->cancel = recv_cancel;
+ switch(protocol) {
+ case A_POP3:
+ recv_data->ssl_service = "pop3s";
+ recv_data->tls_service = "pop3";
+ recv_data->address = g_strdup(address);
+ recv_data->hostname_entry = GTK_ENTRY(wizard->recv_server);
+ recv_data->set_port = NULL;
+ recv_data->port = NULL;
+ recv_data->tls_checkbtn = GTK_TOGGLE_BUTTON(wizard->recv_use_tls);
+ recv_data->ssl_checkbtn = GTK_TOGGLE_BUTTON(wizard->recv_use_ssl);
+ recv_data->default_port = 110;
+ recv_data->default_ssl_port = 995;
+ break;
+ case A_IMAP4:
+ recv_data->ssl_service = "imaps";
+ recv_data->tls_service = "imap";
+ recv_data->address = g_strdup(address);
+ recv_data->hostname_entry = GTK_ENTRY(wizard->recv_server);
+ recv_data->set_port = NULL;
+ recv_data->port = NULL;
+ recv_data->tls_checkbtn = GTK_TOGGLE_BUTTON(wizard->recv_use_tls);
+ recv_data->ssl_checkbtn = GTK_TOGGLE_BUTTON(wizard->recv_use_ssl);
+ recv_data->default_port = 143;
+ recv_data->default_ssl_port = 993;
+ break;
+ default:
+ cm_return_if_fail(FALSE);
+ }
+ auto_configure_service(recv_data);
+ }
+
+ send_data = g_new0(AutoConfigureData, 1);
+ send_data->configure_button = GTK_BUTTON(wizard->auto_configure_btn);
+ send_data->cancel_button = GTK_BUTTON(wizard->auto_configure_cancel_btn);
+ send_data->info_label = GTK_LABEL(wizard->auto_configure_lbl);
+ send_data->cancel = send_cancel;
+
+ send_data->ssl_service = NULL;
+ send_data->tls_service = "submission";
+ send_data->address = g_strdup(address);
+ send_data->hostname_entry = GTK_ENTRY(wizard->smtp_server);
+ send_data->set_port = NULL;
+ send_data->port = NULL;
+ send_data->tls_checkbtn = GTK_TOGGLE_BUTTON(wizard->smtp_use_tls);
+ send_data->ssl_checkbtn = GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl);
+ send_data->default_port = 25;
+ send_data->default_ssl_port = -1;
+ send_data->auth_checkbtn = GTK_TOGGLE_BUTTON(wizard->smtp_auth);
+
+ auto_configure_service(send_data);
+
+ g_free(address);
+}
+#endif
+
static GtkWidget* recv_page (WizardWindow * wizard)
{
GtkWidget *table = gtk_table_new(1,1, FALSE);
- GtkWidget *menu = gtk_menu_new();
- GtkWidget *menuitem;
- GtkTooltips *tips = gtk_tooltips_new();
GtkWidget *vbox;
GtkWidget *hbox;
+ GtkWidget *hbox_spc;
+ GtkWidget *recv_table;
+ GtkWidget *label;
+#ifdef USE_GNUTLS
+ GtkWidget *button;
+ GtkWidget *recv_cert_table;
+#endif
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+ GtkWidget *auto_configure_btn;
+ GtkWidget *auto_configure_cancel_btn;
+ GtkWidget *auto_configure_lbl;
+#endif
+ GtkListStore *store;
+ GtkTreeIter iter;
gchar *text;
gint index = 0;
gtk_table_attach(GTK_TABLE(table), vbox, 0,1,1,2,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ recv_table = gtk_table_new(4, 2, FALSE);
+
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- wizard->recv_type = gtk_option_menu_new();
-
- MENUITEM_ADD (menu, menuitem, _("POP3"), A_POP3);
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(wizard_protocol_changed),
- wizard);
+ auto_configure_btn = gtk_button_new_with_label(_("Auto-configure"));
+ gtk_box_pack_start(GTK_BOX (hbox), auto_configure_btn, FALSE, FALSE, 0);
+ auto_configure_cancel_btn = gtk_button_new_with_label(_("Cancel"));
+ gtk_box_pack_start(GTK_BOX (hbox), auto_configure_cancel_btn, FALSE, FALSE, 0);
+ auto_configure_lbl = gtk_label_new("");
+ gtk_label_set_justify(GTK_LABEL(auto_configure_lbl), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX (hbox), auto_configure_lbl, FALSE, FALSE, 0);
+ gtk_widget_show(auto_configure_btn);
+ gtk_widget_show(auto_configure_lbl);
+ gtk_widget_show(hbox);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ wizard->auto_configure_lbl = auto_configure_lbl;
+ wizard->auto_configure_btn = auto_configure_btn;
+ wizard->auto_configure_cancel_btn = auto_configure_cancel_btn;
+ g_signal_connect (G_OBJECT (auto_configure_btn), "clicked",
+ G_CALLBACK (auto_configure_cb), wizard);
+ g_signal_connect (G_OBJECT (auto_configure_cancel_btn), "clicked",
+ G_CALLBACK (auto_configure_cb), wizard);
+#endif
+ gtk_box_pack_start(GTK_BOX(vbox), recv_table, FALSE, FALSE, 0);
- MENUITEM_ADD (menu, menuitem, _("IMAP"), A_IMAP4);
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(wizard_protocol_changed),
- wizard);
- MENUITEM_ADD (menu, menuitem, _("Local mbox file"), A_LOCAL);
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(wizard_protocol_changed),
- wizard);
+ label = gtk_label_new(_("<span weight=\"bold\">Server type:</span>"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+ gtk_table_attach(GTK_TABLE(recv_table), label, 0,1,0,1,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
+ wizard->recv_type = gtkut_sc_combobox_create(NULL, FALSE);
+ store = GTK_LIST_STORE(gtk_combo_box_get_model(
+ GTK_COMBO_BOX(wizard->recv_type)));
+
+ COMBOBOX_ADD(store, _("POP3"), A_POP3);
+ COMBOBOX_ADD(store, _("IMAP"), A_IMAP4);
+ COMBOBOX_ADD(store, _("Local mbox file"), A_LOCAL);
- gtk_option_menu_set_menu (GTK_OPTION_MENU (wizard->recv_type), menu);
switch(tmpl.recvtype) {
case A_POP3:
index = 0;
default:
index = 0;
}
- gtk_option_menu_set_history(GTK_OPTION_MENU (wizard->recv_type), index);
- PACK_BOX(hbox, _("<span weight=\"bold\">Server type:</span>"),
- wizard->recv_type);
+ gtk_combo_box_set_active(GTK_COMBO_BOX (wizard->recv_type), index);
+ g_signal_connect(G_OBJECT(wizard->recv_type), "changed",
+ G_CALLBACK(wizard_protocol_changed),
+ wizard);
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_type, 1,2,0,1,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ wizard->recv_label = gtk_label_new(_("<span weight=\"bold\">Server address:</span>"));
+ gtk_misc_set_alignment(GTK_MISC(wizard->recv_label), 1, 0.5);
+ gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_label, 0,1,1,2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->recv_server = gtk_entry_new();
text = get_default_server(wizard, "pop");
gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
g_free(text);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), wizard->recv_server,
+ CLAWS_SET_TIP(wizard->recv_server,
_("You can specify the port number by appending it at the end: "
- "\"mail.example.com:110\""),
- NULL);
-
- wizard->recv_label = gtk_label_new(_("<span weight=\"bold\">Server address:</span>"));
- gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
- if (GTK_IS_MISC(wizard->recv_label))
- gtk_misc_set_alignment(GTK_MISC(wizard->recv_label), 1, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_server, TRUE, TRUE, 0);
+ "\"mail.example.com:110\""));
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_server, 1,2,1,2,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- wizard->recv_username = gtk_entry_new();
wizard->recv_username_label = gtk_label_new(_("<span weight=\"bold\">Username:</span>"));
+ gtk_misc_set_alignment(GTK_MISC(wizard->recv_username_label), 1, 0.5);
gtk_label_set_use_markup(GTK_LABEL(wizard->recv_username_label), TRUE);
- if (GTK_IS_MISC(wizard->recv_username_label))
- gtk_misc_set_alignment(GTK_MISC(wizard->recv_username_label), 1, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_username_label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_username, TRUE, TRUE, 0);
-
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_username_label, 0,1,2,3,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
+ wizard->recv_username = gtk_entry_new();
text = get_default_account(wizard);
gtk_entry_set_text(GTK_ENTRY(wizard->recv_username), text);
g_free(text);
-
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_username, 1,2,2,3,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+ wizard->recv_password_label = gtk_label_new(_("Password:"));
+ gtk_misc_set_alignment(GTK_MISC(wizard->recv_password_label), 1, 0.5);
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_password_label, 0,1,3,4,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->recv_password = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->recv_password), tmpl.recvpass?tmpl.recvpass:"");
- wizard->recv_password_label = gtk_label_new(_("Password:"));
- if (GTK_IS_MISC(wizard->recv_password_label))
- gtk_misc_set_alignment(GTK_MISC(wizard->recv_password_label), 1, 0.5);
gtk_entry_set_visibility(GTK_ENTRY(wizard->recv_password), FALSE);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_password_label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_password, TRUE, TRUE, 0);
-
-#ifdef USE_OPENSSL
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_password, 1,2,3,4,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
+#ifdef USE_GNUTLS
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->recv_use_ssl = gtk_check_button_new_with_label(
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
wizard->recv_use_tls = gtk_check_button_new_with_label(
_("Use SSL via STARTTLS"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->recv_use_tls),
tmpl.recvssl == 2);
gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_use_tls, FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY (wizard->recv_use_ssl, wizard->recv_use_tls);
+
+ recv_cert_table = gtk_table_new(3,3, FALSE);
+ gtk_box_pack_start (GTK_BOX(vbox), recv_cert_table, FALSE, FALSE, 4);
+ hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+ label = gtk_label_new(_("Client SSL certificate (optional)"));
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
+ hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+ label = gtk_label_new(_("File"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 1, 1, 2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
+ wizard->recv_ssl_cert_file = gtk_entry_new();
+ gtk_entry_set_text(GTK_ENTRY(wizard->recv_ssl_cert_file), tmpl.recvssl_cert?tmpl.recvssl_cert:"");
+ gtk_table_attach(GTK_TABLE(recv_cert_table), wizard->recv_ssl_cert_file, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
+ button = gtkut_get_browse_file_btn(_("Browse"));
+ gtk_table_attach(GTK_TABLE(recv_cert_table), button, 2, 3, 1, 2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(cert_browse_cb), wizard->recv_ssl_cert_file);
+
+ hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+ label = gtk_label_new(_("Password"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 1, 2, 3,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
+ wizard->recv_ssl_cert_pass = gtk_entry_new();
+ gtk_entry_set_visibility(GTK_ENTRY(wizard->recv_ssl_cert_pass), FALSE);
+ gtk_entry_set_text(GTK_ENTRY(wizard->recv_ssl_cert_pass), tmpl.recvssl_cert_pass?tmpl.recvssl_cert_pass:"");
+ gtk_table_attach(GTK_TABLE(recv_cert_table), wizard->recv_ssl_cert_pass, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
+ SET_TOGGLE_SENSITIVITY (wizard->recv_use_ssl, recv_cert_table);
+ wizard->recv_cert_table = recv_cert_table;
#endif
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->recv_imap_subdir = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->recv_imap_subdir), tmpl.imapdir?tmpl.imapdir:"");
wizard->recv_imap_label = gtk_label_new(_("IMAP server directory:"));
- if (GTK_IS_MISC(wizard->recv_imap_label))
- gtk_misc_set_alignment(GTK_MISC(wizard->recv_imap_label), 1, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(wizard->recv_imap_label), 1, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_imap_label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_imap_subdir, TRUE, TRUE, 0);
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
wizard->subsonly_checkbtn = gtk_check_button_new_with_label(
_("Show only subscribed folders"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->subsonly_checkbtn),
{
WizardWindow * wizard = (WizardWindow *)data;
int current_page, num_pages;
- GtkWidget *menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(wizard->recv_type));
- GtkWidget *menuitem = gtk_menu_get_active(GTK_MENU(menu));
- gint protocol = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
gboolean skip_mailbox_page = FALSE;
-
+ gint protocol = combobox_get_active_data(GTK_COMBO_BOX(wizard->recv_type));
+
if (protocol == A_IMAP4) {
skip_mailbox_page = TRUE;
}
-
+
num_pages = g_slist_length(wizard->pages);
current_page = gtk_notebook_get_current_page (
GTK_STOCK_SAVE, FINISHED,
GTK_STOCK_CANCEL, CANCEL,
NULL);
+ gtk_widget_set_size_request(wizard->window, -1, 480);
+ gtk_window_set_position(GTK_WINDOW(wizard->window), GTK_WIN_POS_CENTER);
g_signal_connect(wizard->window, "response",
G_CALLBACK(wizard_response_cb), wizard);
wizard->notebook = gtk_notebook_new();
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(wizard->notebook), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(wizard->notebook), FALSE);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(wizard->window)->vbox),
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(wizard->window))),
wizard->notebook, TRUE, TRUE, 0);
wizard->pages = NULL;
"Claws Mail in less than five minutes."));
widget = gtk_label_new(text);
gtk_label_set_line_wrap(GTK_LABEL(widget), TRUE);
-#ifndef MAEMO
gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
-#else
- scrolled_window = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start(GTK_BOX(page), scrolled_window, TRUE, TRUE, 0);
-
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
- widget);
-#endif
g_free(text);
/* user page: 1 */
gtk_widget_hide(wizard->recv_imap_label);
gtk_widget_hide(wizard->recv_imap_subdir);
gtk_widget_hide(wizard->subsonly_checkbtn);
-
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+ gtk_widget_hide(wizard->auto_configure_cancel_btn);
+#endif
wizard_protocol_change(wizard, tmpl.recvtype);
while (!wizard->finished)
projects / claws.git / blobdiff