X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Faccount.c;h=94bf40ec34e0acd54b539ee14f9e5fcf518bebf3;hp=5446c59c2831f3d56cb723022b7fbc4960d2178f;hb=405f99f7794f91c835de749a48a0bf39fd35a931;hpb=b436090cd406fd4685e7c7e3d2d5bcd0683cd55c

diff --git a/src/account.c b/src/account.c
index 5446c59c2..94bf40ec3 100644
--- a/src/account.c
+++ b/src/account.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,19 +39,23 @@
 #include "prefs_account.h"
 #include "compose.h"
 #include "manage_window.h"
+#include "inc.h"
 #include "gtkutils.h"
 #include "utils.h"
 #include "alertpanel.h"
 
+#include "pixmaps/mark.xpm"
+
 typedef enum
 {
 	COL_DEFAULT	= 0,
-	COL_NAME	= 1,
-	COL_PROTOCOL	= 2,
-	COL_SERVER	= 3
+	COL_GETALL	= 1,
+	COL_NAME	= 2,
+	COL_PROTOCOL	= 3,
+	COL_SERVER	= 4
 } EditAccountColumnPos;
 
-# define N_EDIT_ACCOUNT_COLS	4
+# define N_EDIT_ACCOUNT_COLS	5
 
 #define PREFSBUFSIZE		1024
 
@@ -65,6 +69,9 @@ static struct EditAccount {
 	GtkWidget *close_btn;
 } edit_account;
 
+static GdkPixmap *markxpm;
+static GdkBitmap *markxpmmask;
+
 static void account_edit_create		(void);
 
 static void account_edit_prefs		(void);
@@ -75,7 +82,17 @@ static void account_down		(void);
 
 static void account_set_default		(void);
 
+static void account_set_recv_at_get_all	(void);
+
 static void account_edit_close		(void);
+static gint account_delete_event	(GtkWidget	*widget,
+					 GdkEventAny	*event,
+					 gpointer	 data);
+static void account_selected		(GtkCList	*clist,
+					 gint		 row,
+					 gint		 column,
+					 GdkEvent	*event,
+					 gpointer	 data);
 static void account_key_pressed		(GtkWidget	*widget,
 					 GdkEventKey	*event,
 					 gpointer	 data);
@@ -163,6 +180,28 @@ PrefsAccount *account_find_from_smtp_server(const gchar *address,
 	return NULL;
 }
 
+/*
+ * account_find_from_address:
+ * @address: Email address string.
+ *
+ * Find a mail (not news) account with the specified email address.
+ *
+ * Return value: The found account, or NULL if not found.
+ */
+PrefsAccount *account_find_from_address(const gchar *address)
+{
+	GList *cur;
+	PrefsAccount *ac;
+
+	for (cur = account_list; cur != NULL; cur = cur->next) {
+		ac = (PrefsAccount *)cur->data;
+		if (ac->protocol != A_NNTP && !strcmp2(address, ac->address))
+			return ac;
+	}
+
+	return NULL;
+}
+
 PrefsAccount *account_find_from_id(gint id)
 {
 	GList *cur;
@@ -198,9 +237,12 @@ GList *account_get_list(void)
 
 void account_edit_open(void)
 {
+	inc_autocheck_timer_remove();
+
 	if (compose_get_compose_list()) {
 		alertpanel_notice(_("Some composing windows are open.\n"
 				    "Please close all the composing windows before editing the accounts."));
+		inc_autocheck_timer_set();
 		return;
 	}
 
@@ -223,6 +265,7 @@ void account_add(void)
 	PrefsAccount *ac_prefs;
 
 	ac_prefs = prefs_account_open(NULL);
+	inc_autocheck_timer_remove();
 
 	if (!ac_prefs) return;
 
@@ -231,6 +274,9 @@ void account_add(void)
 	if (ac_prefs->is_default)
 		account_set_as_default(ac_prefs);
 
+	if (ac_prefs->recv_at_getall)
+		account_set_as_recv_at_get_all(ac_prefs);
+
 	account_clist_set();
 
 	if (ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) {
@@ -243,10 +289,13 @@ void account_add(void)
 			folder = folder_new(F_NEWS, ac_prefs->account_name,
 					    ac_prefs->nntp_server);
 		}
+
 		folder->account = ac_prefs;
 		ac_prefs->folder = REMOTE_FOLDER(folder);
 		folder_add(folder);
-		folderview_update_all();
+		if (ac_prefs->protocol == A_IMAP4)
+			folder->create_tree(folder);
+		folderview_set_all();
 	}
 }
 
@@ -278,6 +327,24 @@ PrefsAccount *account_get_default(void)
 	return NULL;
 }
 
+void account_set_as_recv_at_get_all(PrefsAccount *ac_prefs)
+{
+	PrefsAccount *ap;
+	GList *cur;
+
+	for (cur = account_list; cur != NULL; cur = cur->next) {
+ 		ap = (PrefsAccount *)cur->data;
+ 		if (ap->account_name == ac_prefs->account_name) {
+			if (ap->recv_at_getall == 0)
+				ap->recv_at_getall = 1;
+			else
+				ap->recv_at_getall = 0;
+		}
+        }
+
+}
+
+
 void account_set_missing_folder(void)
 {
 	PrefsAccount *ap;
@@ -296,9 +363,12 @@ void account_set_missing_folder(void)
 				folder = folder_new(F_NEWS, ap->account_name,
 						    ap->nntp_server);
 			}
+
 			folder->account = ap;
 			ap->folder = REMOTE_FOLDER(folder);
 			folder_add(folder);
+			if (ap->protocol == A_IMAP4)
+				folder->create_tree(folder);
 		}
 	}
 }
@@ -341,6 +411,8 @@ static void account_edit_create(void)
 
 	GtkWidget *default_btn;
 
+        GtkWidget *recvatgetall_btn;
+
 	GtkWidget *hbbox;
 	GtkWidget *close_btn;
 
@@ -352,13 +424,14 @@ static void account_edit_create(void)
 	gtk_window_set_title (GTK_WINDOW (window), _("Edit accounts"));
 	gtk_window_set_modal (GTK_WINDOW (window), TRUE);
 	gtk_signal_connect (GTK_OBJECT (window), "delete_event",
-			    GTK_SIGNAL_FUNC (account_edit_close), NULL);
+			    GTK_SIGNAL_FUNC (account_delete_event), NULL);
 	gtk_signal_connect (GTK_OBJECT (window), "key_press_event",
 			    GTK_SIGNAL_FUNC (account_key_pressed), NULL);
 	gtk_signal_connect (GTK_OBJECT (window), "focus_in_event",
 			    GTK_SIGNAL_FUNC (manage_window_focus_in), NULL);
 	gtk_signal_connect (GTK_OBJECT (window), "focus_out_event",
 			    GTK_SIGNAL_FUNC (manage_window_focus_out), NULL);
+	gtk_widget_realize(window);
 
 	vbox = gtk_vbox_new (FALSE, 12);
 	gtk_widget_show (vbox);
@@ -376,7 +449,8 @@ static void account_edit_create(void)
 					GTK_POLICY_AUTOMATIC,
 					GTK_POLICY_AUTOMATIC);
 
-	titles[COL_DEFAULT]  = "";
+	titles[COL_DEFAULT]  = "D";
+	titles[COL_GETALL]   = "G";
 	titles[COL_NAME]     = _("Name");
 	titles[COL_PROTOCOL] = _("Protocol");
 	titles[COL_SERVER]   = _("Server");
@@ -384,7 +458,8 @@ static void account_edit_create(void)
 	clist = gtk_clist_new_with_titles (N_EDIT_ACCOUNT_COLS, titles);
 	gtk_widget_show (clist);
 	gtk_container_add (GTK_CONTAINER (scrolledwin), clist);
-	gtk_clist_set_column_width (GTK_CLIST(clist), COL_DEFAULT , 16);
+	gtk_clist_set_column_width (GTK_CLIST(clist), COL_DEFAULT , 10);
+	gtk_clist_set_column_width (GTK_CLIST(clist), COL_GETALL  , 10);
 	gtk_clist_set_column_width (GTK_CLIST(clist), COL_NAME    , 100);
 	gtk_clist_set_column_width (GTK_CLIST(clist), COL_PROTOCOL, 70);
 	gtk_clist_set_column_width (GTK_CLIST(clist), COL_SERVER  , 100);
@@ -394,6 +469,9 @@ static void account_edit_create(void)
 		GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
 				       GTK_CAN_FOCUS);
 
+	gtk_signal_connect (GTK_OBJECT (clist), "select_row",
+			    GTK_SIGNAL_FUNC (account_selected), NULL);
+
 	vbox2 = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
@@ -436,13 +514,19 @@ static void account_edit_create(void)
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
 
-	default_btn = gtk_button_new_with_label (_(" Set as usually used account "));
+	default_btn = gtk_button_new_with_label (_(" Set as default account "));
 	gtk_widget_show (default_btn);
 	gtk_box_pack_start (GTK_BOX (vbox2), default_btn, TRUE, FALSE, 0);
 	gtk_signal_connect (GTK_OBJECT(default_btn), "clicked",
 			    GTK_SIGNAL_FUNC (account_set_default), NULL);
 
-	gtkut_button_set_create(&hbbox, &close_btn, _("Close"),
+	recvatgetall_btn = gtk_button_new_with_label (_(" Enable/Disable 'Receive at Get all' "));
+	gtk_widget_show (recvatgetall_btn);
+	gtk_box_pack_start (GTK_BOX (vbox2), recvatgetall_btn, TRUE, FALSE, 0);
+	gtk_signal_connect (GTK_OBJECT(recvatgetall_btn), "clicked",
+			    GTK_SIGNAL_FUNC (account_set_recv_at_get_all), NULL);
+
+        gtkut_button_set_create(&hbbox, &close_btn, _("Close"),
 				NULL, NULL, NULL, NULL);
 	gtk_widget_show(hbbox);
 	gtk_box_pack_end (GTK_BOX (hbox), hbbox, FALSE, FALSE, 0);
@@ -452,6 +536,8 @@ static void account_edit_create(void)
 			    GTK_SIGNAL_FUNC (account_edit_close),
 			    NULL);
 
+	PIXMAP_CREATE(clist, markxpm, markxpmmask, mark_xpm);
+
 	edit_account.window    = window;
 	edit_account.clist     = clist;
 	edit_account.close_btn = close_btn;
@@ -473,6 +559,7 @@ static void account_edit_prefs(void)
 	Xstrdup_a(ac_name, ac_prefs->account_name, return);
 
 	prefs_account_open(ac_prefs);
+	inc_autocheck_timer_remove();
 
 	if (!prev_default && ac_prefs->is_default)
 		account_set_as_default(ac_prefs);
@@ -556,6 +643,23 @@ static void account_set_default(void)
 	main_window_reflect_prefs_all();
 }
 
+static void account_set_recv_at_get_all(void)
+{
+	GtkCList *clist = GTK_CLIST(edit_account.clist);
+	gint row;
+	PrefsAccount *ac_prefs;
+
+	if (!clist->selection) return;
+
+	row = GPOINTER_TO_INT(clist->selection->data);
+	ac_prefs = gtk_clist_get_row_data(clist, row);
+
+  	if ((ac_prefs->protocol != A_POP3) && (ac_prefs->protocol != A_APOP)) return;
+	
+	account_set_as_recv_at_get_all(ac_prefs);
+	account_clist_set();
+}
+
 static void account_edit_close(void)
 {
 	account_list_set();
@@ -571,6 +675,22 @@ static void account_edit_close(void)
 	main_window_reflect_prefs_all();
 
 	gtk_widget_hide(edit_account.window);
+
+	inc_autocheck_timer_set();
+}
+
+static gint account_delete_event(GtkWidget *widget, GdkEventAny *event,
+				 gpointer data)
+{
+	account_edit_close();
+	return TRUE;
+}
+
+static void account_selected(GtkCList *clist, gint row, gint column,
+			     GdkEvent *event, gpointer data)
+{
+	if (event && event->type == GDK_2BUTTON_PRESS)
+		account_edit_prefs();
 }
 
 static void account_key_pressed(GtkWidget *widget, GdkEventKey *event,
@@ -587,12 +707,23 @@ static gint account_clist_set_row(PrefsAccount *ac_prefs, gint row)
 	gchar *text[N_EDIT_ACCOUNT_COLS];
 
 	text[COL_DEFAULT] = ac_prefs->is_default ? "*" : "";
+	text[COL_GETALL] = (ac_prefs->protocol == A_POP3 ||
+			    ac_prefs->protocol == A_APOP) &&
+			    ac_prefs->recv_at_getall ? "*" : "";
 	text[COL_NAME] = ac_prefs->account_name;
+#if !USE_SSL
 	text[COL_PROTOCOL] = ac_prefs->protocol == A_POP3  ? "POP3"  :
 			     ac_prefs->protocol == A_APOP  ? "APOP"  :
 			     ac_prefs->protocol == A_IMAP4 ? "IMAP4" :
 			     ac_prefs->protocol == A_LOCAL ? "Local" :
 			     ac_prefs->protocol == A_NNTP  ? "NNTP"  :  "";
+#else
+	text[COL_PROTOCOL] = ac_prefs->protocol == A_POP3  ? (!ac_prefs->ssl_pop ? "POP3" : "POP3 (SSL)") :
+			     ac_prefs->protocol == A_APOP  ? (!ac_prefs->ssl_pop ? "APOP" : "APOP (SSL)") :
+			     ac_prefs->protocol == A_IMAP4 ? (!ac_prefs->ssl_imap ? "IMAP4" : "IMAP4 (SSL)") :
+			     ac_prefs->protocol == A_LOCAL ? "Local" :
+			     ac_prefs->protocol == A_NNTP  ? "NNTP"  :  "";
+#endif
 	text[COL_SERVER] = ac_prefs->protocol == A_NNTP
 		? ac_prefs->nntp_server : ac_prefs->recv_server;
 
@@ -600,11 +731,19 @@ static gint account_clist_set_row(PrefsAccount *ac_prefs, gint row)
 		row = gtk_clist_append(clist, text);
 	else {
 		gtk_clist_set_text(clist, row, COL_DEFAULT, text[COL_DEFAULT]);
+		gtk_clist_set_text(clist, row, COL_GETALL, text[COL_GETALL]);
 		gtk_clist_set_text(clist, row, COL_NAME, text[COL_NAME]);
 		gtk_clist_set_text(clist, row, COL_PROTOCOL, text[COL_PROTOCOL]);
 		gtk_clist_set_text(clist, row, COL_SERVER, text[COL_SERVER]);
 	}
 
+	if (*text[COL_DEFAULT])
+		gtk_clist_set_pixmap(clist, row, COL_DEFAULT,
+				     markxpm, markxpmmask);
+	if (*text[COL_GETALL])
+		gtk_clist_set_pixmap(clist, row, COL_GETALL,
+				     markxpm, markxpmmask);
+
 	gtk_clist_set_row_data(clist, row, ac_prefs);
 
 	return row;
@@ -629,12 +768,16 @@ static void account_clist_set(void)
 		gint row;
 
 		row = account_clist_set_row((PrefsAccount *)cur->data, -1);
-		if ((PrefsAccount *)cur->data == cur_account)
+		if ((PrefsAccount *)cur->data == cur_account) {
 			gtk_clist_select_row(clist, row, -1);
+			gtkut_clist_set_focus_row(clist, row);
+		}
 	}
 
-	if (prev_row >= 0)
+	if (prev_row >= 0) {
 		gtk_clist_select_row(clist, prev_row, -1);
+		gtkut_clist_set_focus_row(clist, prev_row);
+	}
 
 	gtk_clist_thaw(clist);
 }