#include "folderview.h"
#include "folder.h"
#include "account.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
#include "prefs_account.h"
#include "prefs_folder_item.h"
#include "compose.h"
#include "gtkutils.h"
#include "utils.h"
#include "alertpanel.h"
+#include "procheader.h"
typedef enum
{
gchar buf[PREFSBUFSIZE];
PrefsAccount *ac_prefs;
- debug_print(_("Reading all config for each account...\n"));
+ debug_print("Reading all config for each account...\n");
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACCOUNT_RC, NULL);
if ((fp = fopen(rcpath, "rb")) == NULL) {
strretchomp(buf);
memmove(buf, buf + 1, strlen(buf));
buf[strlen(buf) - 1] = '\0';
- debug_print(_("Found label: %s\n"), buf);
+ debug_print("Found label: %s\n", buf);
ac_label_list = g_slist_append(ac_label_list,
g_strdup(buf));
}
/* read config data from file */
cur_account = NULL;
for (cur = ac_label_list; cur != NULL; cur = cur->next) {
- ac_prefs = g_new0(PrefsAccount, 1);
+ ac_prefs = prefs_account_new();
prefs_account_read_config(ac_prefs, (gchar *)cur->data);
account_list = g_list_append(account_list, ac_prefs);
if (ac_prefs->is_default)
prefs_account_save_config_all(account_list);
}
+/*
+ * account_find_all_from_address:
+ * @ac_list: initial list of accounts. NULL to create a new one.
+ * Accounts found in the @address will be appended to this list.
+ * @address: Email address string.
+ *
+ * Find all the mail (not news) accounts within the specified address.
+ *
+ * Return value: the original accounts list with the found accounts appended.
+ */
+GList *account_find_all_from_address(GList *ac_list, const gchar *address)
+{
+ GList *cur;
+ PrefsAccount *ac;
+
+ if (address == NULL)
+ return ac_list;
+
+ for (cur = account_list; cur != NULL; cur = cur->next) {
+ ac = (PrefsAccount *)cur->data;
+ if (ac->protocol != A_NNTP && ac->address &&
+ strcasestr(address, ac->address) != NULL)
+ ac_list = g_list_append(ac_list, ac);
+ }
+ return ac_list;
+}
+
PrefsAccount *account_find_from_smtp_server(const gchar *address,
const gchar *smtp_server)
{
return NULL;
}
-/*
- * account_find_all_from_address:
- * @ac_list: initial list of accounts. NULL to create a new one.
- * Accounts found in the @address will be appended to this list.
- * @address: Email address string.
- *
- * Find all the mail (not news) accounts within the specified address.
- *
- * Return value: the original accounts list with the found accounts appended.
- */
-GList *account_find_all_from_address(GList *ac_list, const gchar *address)
+PrefsAccount *account_find_from_item(FolderItem *item)
{
- GList *cur;
PrefsAccount *ac;
- if (address == NULL)
- return ac_list;
-
- for (cur = account_list; cur != NULL; cur = cur->next) {
- ac = (PrefsAccount *)cur->data;
- if (ac->protocol != A_NNTP && ac->address &&
- strcasestr(address, ac->address) != NULL)
- ac_list = g_list_append(ac_list, ac);
+ g_return_val_if_fail(item != NULL, NULL);
+
+ ac = item->account;
+ if (!ac) {
+ FolderItem *cur_item = item->parent;
+ while (cur_item != NULL) {
+ if (cur_item->account && cur_item->apply_sub) {
+ ac = cur_item->account;
+ break;
+ }
+ cur_item = cur_item->parent;
+ }
}
- return ac_list;
+ if (!ac)
+ ac = item->folder->account;
+
+ return ac;
}
-
+
void account_set_menu(void)
{
main_window_set_account_menu(account_list);
return;
}
- debug_print(_("Opening account edit window...\n"));
+ debug_print("Opening account edit window...\n");
if (!edit_account.window)
account_edit_create();
Folder *folder;
if (ac_prefs->protocol == A_IMAP4) {
- folder = folder_new(F_IMAP, ac_prefs->account_name,
+ folder = folder_new(folder_get_class_from_string("imap"), ac_prefs->account_name,
ac_prefs->recv_server);
} else {
- folder = folder_new(F_NEWS, ac_prefs->account_name,
+ folder = folder_new(folder_get_class_from_string("news"), ac_prefs->account_name,
ac_prefs->nntp_server);
}
ac_prefs->folder = REMOTE_FOLDER(folder);
folder_add(folder);
if (ac_prefs->protocol == A_IMAP4)
- folder->create_tree(folder);
+ folder->class->create_tree(folder);
folderview_set_all();
}
}
+void account_open(PrefsAccount *ac_prefs)
+{
+ gboolean prev_default;
+ gchar *ac_name;
+
+ g_return_if_fail(ac_prefs != NULL);
+
+ prev_default = ac_prefs->is_default;
+ Xstrdup_a(ac_name, ac_prefs->account_name ? ac_prefs->account_name : "",
+ return);
+
+ prefs_account_open(ac_prefs);
+
+ if (!prev_default && ac_prefs->is_default)
+ account_set_as_default(ac_prefs);
+
+ if (ac_prefs->folder && strcmp2(ac_name, ac_prefs->account_name) != 0) {
+ folder_set_name(FOLDER(ac_prefs->folder),
+ ac_prefs->account_name);
+ folderview_set_all();
+ }
+
+ account_save_config_all();
+ account_set_menu();
+ main_window_reflect_prefs_all();
+}
+
void account_set_as_default(PrefsAccount *ac_prefs)
{
PrefsAccount *ap;
Folder *folder;
if (ap->protocol == A_IMAP4) {
- folder = folder_new(F_IMAP, ap->account_name,
+ folder = folder_new(folder_get_class_from_string("imap"), ap->account_name,
ap->recv_server);
} else {
- folder = folder_new(F_NEWS, ap->account_name,
+ folder = folder_new(folder_get_class_from_string("news"), ap->account_name,
ap->nntp_server);
}
ap->folder = REMOTE_FOLDER(folder);
folder_add(folder);
if (ap->protocol == A_IMAP4)
- folder->create_tree(folder);
+ folder->class->create_tree(folder);
}
}
}
g_return_val_if_fail(ac_prefs != NULL, NULL);
- if (type == F_OUTBOX) {
+ switch (type) {
+ case F_INBOX:
+ if (ac_prefs->folder)
+ item = FOLDER(ac_prefs->folder)->inbox;
+ if (!item)
+ item = folder_get_default_inbox();
+ break;
+ case F_OUTBOX:
if (ac_prefs->set_sent_folder && ac_prefs->sent_folder) {
item = folder_find_item_from_identifier
(ac_prefs->sent_folder);
if (!item)
item = folder_get_default_outbox();
}
- } else if (type == F_DRAFT) {
+ break;
+ case F_DRAFT:
if (ac_prefs->set_draft_folder && ac_prefs->draft_folder) {
item = folder_find_item_from_identifier
(ac_prefs->draft_folder);
if (!item)
item = folder_get_default_draft();
}
- } else if (type == F_QUEUE) {
+ break;
+ case F_QUEUE:
if (ac_prefs->folder)
item = FOLDER(ac_prefs->folder)->queue;
if (!item)
item = folder_get_default_queue();
- } else if (type == F_TRASH) {
+ break;
+ case F_TRASH:
if (ac_prefs->set_trash_folder && ac_prefs->trash_folder) {
item = folder_find_item_from_identifier
(ac_prefs->trash_folder);
if (!item)
item = folder_get_default_trash();
}
+ break;
+ default:
+ break;
}
return item;
{
g_return_if_fail(ac_prefs != NULL);
+ folder_unref_account_all(ac_prefs);
+
prefs_account_free(ac_prefs);
account_list = g_list_remove(account_list, ac_prefs);
GtkWidget *hbbox;
GtkWidget *close_btn;
- debug_print(_("Creating account edit window...\n"));
+ debug_print("Creating account edit window...\n");
window = gtk_window_new (GTK_WINDOW_DIALOG);
gtk_widget_set_usize (window, 500, 320);
gtk_signal_connect (GTK_OBJECT (clist), "select_row",
GTK_SIGNAL_FUNC (account_selected), NULL);
- gtk_signal_connect (GTK_OBJECT (clist), "row_move",
- GTK_SIGNAL_FUNC (account_row_moved), NULL);
+ gtk_signal_connect_after (GTK_OBJECT (clist), "row_move",
+ GTK_SIGNAL_FUNC (account_row_moved), NULL);
vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
GtkCList *clist = GTK_CLIST(edit_account.clist);
PrefsAccount *ac_prefs;
gint row;
- gboolean prev_default;
- gchar *ac_name;
if (!clist->selection) return;
row = GPOINTER_TO_INT(clist->selection->data);
ac_prefs = gtk_clist_get_row_data(clist, row);
- prev_default = ac_prefs->is_default;
- Xstrdup_a(ac_name, ac_prefs->account_name ? ac_prefs->account_name : "",
- return);
-
- prefs_account_open(ac_prefs);
-
- if (!prev_default && ac_prefs->is_default)
- account_set_as_default(ac_prefs);
-
- if ((ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) &&
- ac_prefs->folder && strcmp2(ac_name, ac_prefs->account_name) != 0) {
- folder_set_name(FOLDER(ac_prefs->folder),
- ac_prefs->account_name);
- folderview_rescan_all();
- }
-
+ account_open(ac_prefs);
+
account_clist_set();
}
item->prefs->enable_default_account = FALSE;
item->prefs->default_account = 0;
prefs_folder_item_save_config(item);
+
+ return FALSE;
}
static void account_delete(void)
ac_prefs = gtk_clist_get_row_data(clist, row);
if (ac_prefs->folder) {
folder_destroy(FOLDER(ac_prefs->folder));
- folderview_rescan_all();
+ folderview_set_all();
}
account_destroy(ac_prefs);
account_clist_set();
- debug_print(_("Removing deleted account references for all the folders...\n"));
+ debug_print("Removing deleted account references for all the folders...\n");
list = folder_get_list();
for (; list != NULL; list = list->next) {
folder = FOLDER(list->data);
static void account_row_moved(GtkCList *clist, gint source_row, gint dest_row)
{
account_list_set();
- if (gtk_clist_row_is_visible(clist, dest_row) != GTK_VISIBILITY_FULL) {
- gtk_clist_moveto(clist, dest_row, -1,
- source_row < dest_row ? 1.0 : 0.0, 0.0);
- }
+ if (gtk_clist_row_is_visible(clist, dest_row) != GTK_VISIBILITY_FULL)
+ gtk_clist_moveto(clist, dest_row, -1, 0.5, 0.0);
}
static void account_key_pressed(GtkWidget *widget, GdkEventKey *event,
text[COL_DEFAULT] = "";
text[COL_GETALL] = "";
text[COL_NAME] = ac_prefs->account_name;
-#if USE_SSL
+#if USE_OPENSSL
text[COL_PROTOCOL] = ac_prefs->protocol == A_POP3 ?
(ac_prefs->ssl_pop == SSL_TUNNEL ?
"POP3 (SSL)" :
row++)
account_list = g_list_append(account_list, ac_prefs);
}
+
+/*!
+ *\brief finds the PrefsAccounts which should be used to answer a mail
+ *
+ *\param msginfo The message to be answered
+ *\param reply_autosel Indicates whether reply account autoselection is on
+ *
+ *\return PrefsAccount * the correct account, NULL if not found
+ */
+PrefsAccount *account_get_reply_account(MsgInfo *msginfo, gboolean reply_autosel)
+{
+ PrefsAccount *account = NULL;
+ /* select the account set in folderitem's property (if enabled) */
+ if (msginfo->folder->prefs && msginfo->folder->prefs->enable_default_account)
+ account = account_find_from_id(msginfo->folder->prefs->default_account);
+
+ /* select the account for the whole folder (IMAP / NNTP) */
+ if (!account)
+ /* FIXME: this is not right, because folder may be nested. we should
+ * ascend the tree until we find a parent with proper account
+ * information */
+ account = msginfo->folder->folder->account;
+
+ /* select account by to: and cc: header if enabled */
+ if (reply_autosel) {
+ if (!account && msginfo->to) {
+ gchar *to;
+ Xstrdup_a(to, msginfo->to, return NULL);
+ extract_address(to);
+ account = account_find_from_address(to);
+ }
+ if (!account) {
+ gchar cc[BUFFSIZE];
+ if (!get_header_from_msginfo(msginfo, cc, sizeof(cc), "CC:")) { /* Found a CC header */
+ extract_address(cc);
+ account = account_find_from_address(cc);
+ }
+ }
+ }
+
+ /* select current account */
+ if (!account) account = cur_account;
+
+ return account;
+}
projects / claws.git / blobdiff