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)
{
for (cur = account_list; cur != NULL; cur = cur->next) {
ac = (PrefsAccount *)cur->data;
if (ac->protocol != A_NNTP && ac->address &&
- strcasestr(address, ac->address))
+ strcasestr(address, ac->address) != NULL)
return ac;
}
return NULL;
}
+PrefsAccount *account_find_from_item(FolderItem *item)
+{
+ PrefsAccount *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;
+ }
+ }
+ 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();
}
}
+FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
+ SpecialFolderItemType type)
+{
+ FolderItem *item = NULL;
+
+ g_return_val_if_fail(ac_prefs != NULL, NULL);
+
+ if (type == F_OUTBOX) {
+ if (ac_prefs->set_sent_folder && ac_prefs->sent_folder) {
+ item = folder_find_item_from_identifier
+ (ac_prefs->sent_folder);
+ }
+ if (!item) {
+ if (ac_prefs->folder)
+ item = FOLDER(ac_prefs->folder)->outbox;
+ if (!item)
+ item = folder_get_default_outbox();
+ }
+ } else if (type == F_DRAFT) {
+ if (ac_prefs->set_draft_folder && ac_prefs->draft_folder) {
+ item = folder_find_item_from_identifier
+ (ac_prefs->draft_folder);
+ }
+ if (!item) {
+ if (ac_prefs->folder)
+ item = FOLDER(ac_prefs->folder)->draft;
+ if (!item)
+ item = folder_get_default_draft();
+ }
+ } else if (type == F_QUEUE) {
+ if (ac_prefs->folder)
+ item = FOLDER(ac_prefs->folder)->queue;
+ if (!item)
+ item = folder_get_default_queue();
+ } else if (type == F_TRASH) {
+ if (ac_prefs->set_trash_folder && ac_prefs->trash_folder) {
+ item = folder_find_item_from_identifier
+ (ac_prefs->trash_folder);
+ }
+ if (!item) {
+ if (ac_prefs->folder)
+ item = FOLDER(ac_prefs->folder)->trash;
+ if (!item)
+ item = folder_get_default_trash();
+ }
+ }
+
+ return item;
+}
+
void account_destroy(PrefsAccount *ac_prefs)
{
g_return_if_fail(ac_prefs != NULL);
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);
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, return);
+ Xstrdup_a(ac_name, ac_prefs->account_name ? ac_prefs->account_name : "",
+ return);
prefs_account_open(ac_prefs);
account_set_as_default(ac_prefs);
if ((ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) &&
- ac_prefs->folder && strcmp(ac_name, ac_prefs->account_name) != 0) {
+ 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();
+ folderview_set_all();
}
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);
text[COL_NAME] = ac_prefs->account_name;
#if USE_SSL
text[COL_PROTOCOL] = ac_prefs->protocol == A_POP3 ?
- (ac_prefs->ssl_pop ? "POP3 (SSL)" : "POP3") :
+ (ac_prefs->ssl_pop == SSL_TUNNEL ?
+ "POP3 (SSL)" :
+ ac_prefs->ssl_pop == SSL_STARTTLS ?
+ "POP3 (TLS)" : "POP3") :
ac_prefs->protocol == A_APOP ?
- (ac_prefs->ssl_pop ?
- "POP3 (APOP, SSL)" : "POP3 (APOP)") :
+ (ac_prefs->ssl_pop == SSL_TUNNEL ?
+ "POP3 (APOP, SSL)" :
+ ac_prefs->ssl_pop == SSL_STARTTLS ?
+ "POP3 (APOP, TLS)" : "POP3 (APOP)") :
ac_prefs->protocol == A_IMAP4 ?
- (ac_prefs->ssl_imap ? "IMAP4 (SSL)" : "IMAP4") :
- ac_prefs->protocol == A_LOCAL ? "Local" :
- ac_prefs->protocol == A_NNTP ?
- (ac_prefs->ssl_nntp ? "NNTP (SSL)" : "NNTP") : "";
+ (ac_prefs->ssl_imap == SSL_TUNNEL ?
+ "IMAP4 (SSL)" :
+ ac_prefs->ssl_imap == SSL_STARTTLS ?
+ "IMAP4 (TLS)" : "IMAP4") :
+ ac_prefs->protocol == A_NNTP ?
+ (ac_prefs->ssl_nntp == SSL_TUNNEL ?
+ "NNTP (SSL)" : "NNTP") :
+ "";
#else
text[COL_PROTOCOL] = ac_prefs->protocol == A_POP3 ? "POP3" :
ac_prefs->protocol == A_APOP ? "POP3 (APOP)" :
projects / claws.git / blobdiff