item->no_select = FALSE;
item->collapsed = FALSE;
item->threaded = FALSE;
+ item->ret_rcpt = FALSE;
item->parent = NULL;
item->folder = NULL;
item->data = NULL;
const gchar *name = NULL;
const gchar *path = NULL;
PrefsAccount *account = NULL;
- gboolean no_sub = FALSE, no_select = FALSE, collapsed = FALSE, threaded = FALSE;
+ gboolean no_sub = FALSE, no_select = FALSE, collapsed = FALSE,
+ threaded = FALSE, ret_rcpt = FALSE;
gint mtime = 0, new = 0, unread = 0, total = 0;
g_return_val_if_fail(node->data != NULL, FALSE);
collapsed = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "threaded"))
threaded = *attr->value == '1' ? TRUE : FALSE;
+ else if (!strcmp(attr->name, "reqretrcpt"))
+ ret_rcpt = *attr->value == '1' ? TRUE : FALSE;
}
item = folder_item_new(name, path);
item->no_select = no_select;
item->collapsed = collapsed;
item->threaded = threaded;
+ item->ret_rcpt = ret_rcpt;
item->parent = FOLDER_ITEM(node->parent->data);
item->folder = folder;
switch (stype) {
const gchar *name = NULL;
const gchar *path = NULL;
PrefsAccount *account = NULL;
- gboolean collapsed = FALSE, threaded = FALSE;
+ gboolean collapsed = FALSE, threaded = FALSE, ret_rcpt = FALSE;
if (g_node_depth(node) != 2) return FALSE;
g_return_val_if_fail(node->data != NULL, FALSE);
collapsed = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "threaded"))
threaded = *attr->value == '1' ? TRUE : FALSE;
+ else if (!strcmp(attr->name, "reqretrcpt"))
+ ret_rcpt = *attr->value == '1' ? TRUE : FALSE;
}
folder = folder_new(type, name, path);
folder_add(folder);
FOLDER_ITEM(node->data)->collapsed = collapsed;
FOLDER_ITEM(node->data)->threaded = threaded;
+ FOLDER_ITEM(node->data)->ret_rcpt = ret_rcpt;
g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
folder_build_tree, folder);
fputs(" collapsed=\"1\"", fp);
if (item->threaded)
fputs(" threaded=\"1\"", fp);
+ if (item->ret_rcpt)
+ fputs(" reqretrcpt=\"1\"", fp);
} else {
fprintf(fp, "<folderitem type=\"%s\"",
folder_item_stype_str[item->stype]);
fputs(" collapsed=\"1\"", fp);
if (item->threaded)
fputs(" threaded=\"1\"", fp);
+ if (item->ret_rcpt)
+ fputs(" reqretrcpt=\"1\"", fp);
fprintf(fp,
" mtime=\"%ld\" new=\"%d\" unread=\"%d\" total=\"%d\"",
item->mtime, item->new, item->unread, item->total);
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+/* alfons - all folder item specific settings should migrate into
+ * folderlist.xml!!! the old folderitemrc file will only serve for a few
+ * versions (for compatibility) */
+
#include "intl.h"
#include "defs.h"
#include "folder.h"
NULL, NULL, NULL},
{"important_score", "1", &tmp_prefs.important_score, P_INT,
NULL, NULL, NULL},
+ /* MIGRATION */
{"request_return_receipt", "", &tmp_prefs.request_return_receipt, P_BOOL,
NULL, NULL, NULL},
{"enable_default_to", "", &tmp_prefs.enable_default_to, P_BOOL,
prefs_read_config(param, id, FOLDERITEM_RC);
g_free(id);
- * item->prefs = tmp_prefs;
+ *item->prefs = tmp_prefs;
+
+ /* MIGRATION */
+ item->ret_rcpt = tmp_prefs.request_return_receipt ? TRUE : FALSE;
}
void prefs_folder_item_save_config(FolderItem * item)
prefs_save_config(param, id, FOLDERITEM_RC);
g_free(id);
+
+ /* MIGRATION: make sure migrated items are not saved
+ */
}
void prefs_folder_item_set_config(FolderItem * item,
PACK_CHECK_BUTTON(vbox, checkbtn_request_return_receipt,
_("Request Return Receipt"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_request_return_receipt),
- item->prefs->request_return_receipt);
+ item->ret_rcpt);
/* Default To */
hbox = gtk_hbox_new(FALSE, 8);
prefs->request_return_receipt =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_request_return_receipt));
+ /* MIGRATION */
+ dialog->item->ret_rcpt = prefs->request_return_receipt;
+
prefs->enable_default_to =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_default_to));
g_free(prefs->default_to);