#include "gtkutils.h"
#include "prefs_common.h"
#include "prefs_account.h"
-#include "prefs_filter.h"
#include "prefs_filtering.h"
#include "prefs_scoring.h"
#include "prefs_folder_item.h"
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Check for new messages"),
NULL, folderview_update_tree_cb, 0, NULL},
- {N_("/R_escan folder tree"), NULL, folderview_update_tree_cb, 1, NULL},
+ {N_("/R_ebuild folder tree"), NULL, folderview_update_tree_cb, 1, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Remove _mailbox"), NULL, folderview_remove_mailbox_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Check for new messages"),
NULL, folderview_update_tree_cb, 0, NULL},
- {N_("/R_escan folder tree"), NULL, folderview_update_tree_cb, 1, NULL},
+ {N_("/R_ebuild folder tree"), NULL, folderview_update_tree_cb, 1, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Remove _IMAP4 account"), NULL, folderview_rm_imap_server_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
if (!normalfont)
- normalfont = gdk_fontset_load(NORMAL_FONT);
+ normalfont = gtkut_font_load(NORMAL_FONT);
if (!boldfont)
- boldfont = gdk_fontset_load(BOLD_FONT);
+ boldfont = gtkut_font_load(BOLD_FONT);
if (!bold_style) {
bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
if (!folder->scan_tree) return;
inc_lock();
- window = label_window_create(_("Rescanning folder tree..."));
+ window = label_window_create(_("Rebuilding folder tree..."));
folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
folder_scan_tree(folder);
item->path &&
!strcmp2(item->name, item->path) &&
prefs_common.ng_abbrev_len < strlen(item->path))
- name = get_abbrev_newsgroup_name(item->path);
+ name = get_abbrev_newsgroup_name(item->path, prefs_common.ng_abbrev_len);
else
name = g_strdup(item->name);
}
SET_SENS(mail_factory, "/Rename folder...", rename_folder);
SET_SENS(mail_factory, "/Delete folder", delete_folder);
SET_SENS(mail_factory, "/Check for new messages", update_tree);
- SET_SENS(mail_factory, "/Rescan folder tree", rescan_tree);
+ SET_SENS(mail_factory, "/Rebuild folder tree", rescan_tree);
SET_SENS(mail_factory, "/Remove mailbox", remove_tree);
SET_SENS(mail_factory, "/Search folder...", search_folder);
SET_SENS(mail_factory, "/Property...", folder_property);
SET_SENS(imap_factory, "/Rename folder...", rename_folder);
SET_SENS(imap_factory, "/Delete folder", delete_folder);
SET_SENS(imap_factory, "/Check for new messages", update_tree);
- SET_SENS(imap_factory, "/Rescan folder tree", rescan_tree);
+ SET_SENS(imap_factory, "/Rebuild folder tree", rescan_tree);
SET_SENS(imap_factory, "/Remove IMAP4 account", remove_tree);
SET_SENS(imap_factory, "/Search folder...", search_folder);
SET_SENS(imap_factory, "/Property...", folder_property);
}
g_free(new_folder);
- if (prefs_common.fltlist) {
- if (folder_get_default_folder() == item->folder)
- prefs_filter_rename_path(old_path, item->path);
- new_id = folder_item_get_identifier(item);
- prefs_filter_rename_path(old_id, new_id);
- } else {
- if (FOLDER_TYPE(item->folder) == F_MH)
- prefs_filtering_rename_path(old_path, item->path);
- new_id = folder_item_get_identifier(item);
- prefs_filtering_rename_path(old_id, new_id);
- }
+ if (FOLDER_TYPE(item->folder) == F_MH)
+ prefs_filtering_rename_path(old_path, item->path);
+ new_id = folder_item_get_identifier(item);
+ prefs_filtering_rename_path(old_id, new_id);
+
g_free(old_id);
g_free(new_id);
return;
}
- if (prefs_common.fltlist) {
- if (folder_get_default_folder() == item->folder)
- prefs_filter_delete_path(old_path);
- prefs_filter_delete_path(old_id);
- g_free(old_id);
- } else {
- if (FOLDER_TYPE(item->folder) == F_MH)
- prefs_filtering_delete_path(old_path);
- prefs_filtering_delete_path(old_id);
- g_free(old_id);
- }
+ if (FOLDER_TYPE(item->folder) == F_MH)
+ prefs_filtering_delete_path(old_path);
+ prefs_filtering_delete_path(old_id);
+ g_free(old_id);
+
if (folderview->opened == folderview->selected ||
gtk_ctree_is_ancestor(ctree,
folderview->selected,