+2006-03-07 [colin] 2.0.0cvs116
+
+ * src/imap.c
+ Return immediately when password dialog was
+ cancelled
+ * src/gtk/inputdialog.c
+ Allow empty strings for passwords
+
+
2006-03-06 [colin] 2.0.0cvs115
* src/imap.c
( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_msg_colors.h; ) > 2.0.0cvs113.patchset
( cvs diff -u -r 1.179.2.96 -r 1.179.2.97 src/imap.c; ) > 2.0.0cvs114.patchset
( cvs diff -u -r 1.179.2.97 -r 1.179.2.98 src/imap.c; ) > 2.0.0cvs115.patchset
+( cvs diff -u -r 1.179.2.98 -r 1.179.2.99 src/imap.c; cvs diff -u -r 1.2.2.15 -r 1.2.2.16 src/gtk/inputdialog.c; ) > 2.0.0cvs116.patchset
static GtkWidget *combo;
static GtkWidget *ok_button;
static GtkWidget *icon_q, *icon_p;
-
+static gboolean is_pass = FALSE;
static void input_dialog_create (gboolean is_password);
static gchar *input_dialog_open (const gchar *title,
const gchar *message,
gtk_widget_show(icon_q);
gtk_widget_hide(icon_p);
+ is_pass = FALSE;
gtk_entry_set_visibility(GTK_ENTRY(entry), TRUE);
return input_dialog_open(title, message, default_string);
gtk_widget_hide(icon_q);
gtk_widget_show(icon_p);
+ is_pass = TRUE;
gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
return input_dialog_open(title, message, default_string);
gtk_widget_show(icon_q);
gtk_widget_hide(icon_p);
+ is_pass = FALSE;
if (!list) {
GList empty_list;
else
gtk_widget_hide(icon_p);
+ is_pass = is_password;
+
gtk_widget_grab_default(ok_button);
g_signal_connect(G_OBJECT(ok_button), "clicked",
editable = GTK_EDITABLE(entry);
str = gtk_editable_get_chars(editable, 0, -1);
- if (str && *str == '\0') {
+ if (str && *str == '\0' && !is_pass) {
g_free(str);
str = NULL;
}
if (!IMAP_SESSION(session)->authenticated) {
session_destroy(SESSION(session));
rfolder->session = NULL;
+ last_failure = time(NULL);
return NULL;
}
gchar *tmp_pass;
tmp_pass = input_dialog_query_password(account->recv_server, account->userid);
if (!tmp_pass)
- tmp_pass = g_strdup(""); /* allow empty password */
+ return;
Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return;});
g_free(tmp_pass);
}