commit - 9876f5c928084f0fb34d70055f2aca8930156349
commit + ae27debd60f27b29810b6fe92373bb4064c8ee0d
blob - 82a8dac92320f3a660339c6640c61e357a9f2718
blob + 7b9c29982a46c0eee25b2b33b8e1f48391beefbf
--- src/mh.c
+++ src/mh.c
folder_path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
cm_return_val_if_fail(folder_path != NULL, NULL);
- /* FIXME: [W32] The code below does not correctly merge
- relative filenames; there should be a function to handle
- this. */
if ( !is_relative_filename (folder_path) ) {
if (item->path)
path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
blob - 83f06df55dfc118e9b761d16664d5737bacaa555
blob + b4bed8b705904eee200464e6bcbe380a503ec9ba
--- src/prefs_common.c
+++ src/prefs_common.c
{"log_status_skip_color", "#aa00aa", &prefs_common.color[COL_LOG_STATUS_SKIP],
P_COLOR, NULL, NULL, NULL},
- {"enable_filtering_debug", "FALSE", &prefs_common.enable_filtering_debug, P_BOOL,
- NULL, NULL, NULL},
- {"filtering_debug_level", "1", &prefs_common.filtering_debug_level, P_INT,
- NULL, NULL, NULL},
- {"enable_filtering_debug_inc", "TRUE", &prefs_common.enable_filtering_debug_inc, P_BOOL,
- NULL, NULL, NULL},
- {"enable_filtering_debug_manual", "TRUE", &prefs_common.enable_filtering_debug_manual, P_BOOL,
- NULL, NULL, NULL},
- {"enable_filtering_debug_folder_proc", "FALSE", &prefs_common.enable_filtering_debug_folder_proc, P_BOOL,
- NULL, NULL, NULL},
- {"enable_filtering_debug_pre_proc", "FALSE", &prefs_common.enable_filtering_debug_pre_proc, P_BOOL,
- NULL, NULL, NULL},
- {"enable_filtering_debug_post_proc", "FALSE", &prefs_common.enable_filtering_debug_post_proc, P_BOOL,
- NULL, NULL, NULL},
- {"filtering_debug_clip_log", "TRUE", &prefs_common.filtering_debug_cliplog, P_BOOL,
- NULL, NULL, NULL},
- {"filtering_debug_log_length", "500", &prefs_common.filtering_debug_loglength, P_INT,
- NULL, NULL, NULL},
-
{"gtk_enable_accels", "TRUE", &prefs_common.gtk_enable_accels, P_BOOL,
NULL, NULL, NULL},
blob - a0b3145887e02706050fba38419df0a345a96907
blob + a6afab69f71de9ec6ae35e413bfe840b52b3cc48
--- src/prefs_common.h
+++ src/prefs_common.h
gboolean enable_log_error;
gboolean enable_log_status;
- gboolean enable_filtering_debug;
- gint filtering_debug_level;
- gboolean enable_filtering_debug_inc;
- gboolean enable_filtering_debug_manual;
- gboolean enable_filtering_debug_folder_proc;
- gboolean enable_filtering_debug_pre_proc;
- gboolean enable_filtering_debug_post_proc;
- gboolean filtering_debug_cliplog;
- guint filtering_debug_loglength;
-
gboolean confirm_on_exit;
gboolean session_passwords;
gboolean clean_on_exit;
blob - 3ebad43b62115bded491c24776a36eb9bb8281a5
blob + 56de0800d29b75eb006e2e353d2ac002f7184acf
--- src/prefs_logging.c
+++ src/prefs_logging.c
GtkWidget *checkbtn_log_warning;
GtkWidget *checkbtn_log_error;
GtkWidget *checkbtn_log_status;
- GtkWidget *checkbtn_clip_filtering_log;
- GtkWidget *spinbtn_filtering_log_length;
- GtkWidget *checkbtn_filtering_log;
- GtkWidget *checkbtn_filtering_log_inc;
- GtkWidget *checkbtn_filtering_log_manual;
- GtkWidget *checkbtn_filtering_log_folder_proc;
- GtkWidget *checkbtn_filtering_log_pre_proc;
- GtkWidget *checkbtn_filtering_log_post_proc;
- GtkWidget *optmenu_filtering_log_level;
} LoggingPage;
static GtkWidget *prefs_logging_create_check_buttons(GtkWidget **checkbtn1,
GtkWidget *spinbtn_network_log_length;
GtkAdjustment *spinbtn_network_log_length_adj;
GtkWidget *hbox_checkbtn;
- GtkWidget *vbox1_filtering_log;
- GtkWidget *hbox_clip_filtering_log;
- GtkWidget *checkbtn_clip_filtering_log;
- GtkWidget *spinbtn_filtering_log_length;
- GtkAdjustment *spinbtn_filtering_log_length_adj;
- GtkWidget *hbox_filtering_log;
- GtkWidget *checkbtn_filtering_log;
- GtkWidget *frame_filtering_log;
- GtkWidget *vbox2_filtering_log;
- GtkWidget *checkbtn_filtering_log_inc;
- GtkWidget *checkbtn_filtering_log_manual;
- GtkWidget *checkbtn_filtering_log_folder_proc;
- GtkWidget *checkbtn_filtering_log_pre_proc;
- GtkWidget *checkbtn_filtering_log_post_proc;
- GtkWidget *hbox_filtering_log_level;
- GtkWidget *label_filtering_log_level;
- GtkWidget *optmenu_filtering_log_level;
- GtkSizeGroup *filter_size_group;
- GtkListStore *menu;
- GtkTreeIter iter;
GtkWidget *frame_disk_log;
GtkWidget *vbox_disk_log;
GtkWidget *label;
SET_TOGGLE_SENSITIVITY(checkbtn_clip_network_log, spinbtn_network_log_length);
SET_TOGGLE_SENSITIVITY(checkbtn_clip_network_log, label);
- /* Filtering/processing debug log */
- vbox1_filtering_log = gtkut_get_options_frame(vbox1,
- &frame_logging, _("Filtering/processing log"));
-
- PACK_CHECK_BUTTON (vbox1_filtering_log, checkbtn_filtering_log,
- _("Enable logging of filtering/processing rules"));
- hbox_filtering_log = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
- gtk_container_add (GTK_CONTAINER (vbox1_filtering_log), hbox_filtering_log);
- gtk_widget_show (hbox_filtering_log);
-
- CLAWS_SET_TIP(checkbtn_filtering_log,
- _("If checked, turns on logging of filtering and processing rules.\n"
- "The log is accessible from '/Tools/Filtering log'.\n"
- "Caution: enabling this option will slow down the filtering/processing, "
- "this might be critical when applying many rules upon thousands of "
- "messages"));
-
- vbox2_filtering_log = gtkut_get_options_frame(vbox1_filtering_log, &frame_filtering_log,
- _("Log filtering/processing when..."));
-
- hbox_checkbtn = prefs_logging_create_check_buttons(
- &checkbtn_filtering_log_inc,
- _("filtering on receiving"),
- &checkbtn_filtering_log_pre_proc,
- _("pre-processing folders"));
- gtk_box_pack_start(GTK_BOX(vbox2_filtering_log), hbox_checkbtn, FALSE, FALSE, 0);
-
- hbox_checkbtn = prefs_logging_create_check_buttons(
- &checkbtn_filtering_log_manual,
- _("manually filtering"),
- &checkbtn_filtering_log_post_proc,
- _("post-processing folders"));
- gtk_box_pack_start(GTK_BOX(vbox2_filtering_log), hbox_checkbtn, FALSE, FALSE, 0);
-
- hbox_checkbtn = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
- gtk_widget_show(hbox_checkbtn);
- gtk_box_pack_start(GTK_BOX(vbox2_filtering_log), hbox_checkbtn, FALSE, FALSE, 0);
- PACK_CHECK_BUTTON (hbox_checkbtn, checkbtn_filtering_log_folder_proc,
- _("processing folders"));
- gtk_box_pack_start(GTK_BOX(hbox_checkbtn), gtk_label_new(""),
- FALSE, TRUE, 0);
-
- filter_size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
- gtk_size_group_add_widget(filter_size_group, checkbtn_filtering_log_inc);
- gtk_size_group_add_widget(filter_size_group, checkbtn_filtering_log_manual);
- gtk_size_group_add_widget(filter_size_group, checkbtn_filtering_log_folder_proc);
- g_object_unref(G_OBJECT(filter_size_group));
-
- SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, frame_filtering_log);
-
- hbox_filtering_log_level = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
- gtk_widget_show (hbox_filtering_log_level);
- gtk_box_pack_start(GTK_BOX (vbox1_filtering_log), hbox_filtering_log_level, FALSE, FALSE, 0);
-
- label_filtering_log_level = gtk_label_new (_("Log level"));
- gtk_widget_show (label_filtering_log_level);
- gtk_box_pack_start(GTK_BOX(hbox_filtering_log_level), label_filtering_log_level, FALSE, FALSE, 0);
-
- optmenu_filtering_log_level = gtkut_sc_combobox_create(NULL, FALSE);
- gtk_widget_show (optmenu_filtering_log_level);
-
- menu = GTK_LIST_STORE(gtk_combo_box_get_model(
- GTK_COMBO_BOX(optmenu_filtering_log_level)));
- COMBOBOX_ADD (menu, _("Low"), 0);
- COMBOBOX_ADD (menu, _("Medium"), 1);
- COMBOBOX_ADD (menu, _("High"), 2);
-
- gtk_box_pack_start(GTK_BOX(hbox_filtering_log_level), optmenu_filtering_log_level, FALSE, FALSE, 0);
-
- CLAWS_SET_TIP(optmenu_filtering_log_level,
- _("Select the level of detail of the logging.\n"
- "Choose Low to see when rules are applied, which "
- "conditions match or don't match and what actions are "
- "performed.\n"
- "Choose Medium to see more details about the message "
- "that is being processed, and why rules are skipped.\n"
- "Choose High to explicitly show the reason why all "
- "rules are processed or skipped, and why all conditions "
- "are matched or not matched.\n"
- "Caution: the higher the level, the greater the "
- "impact on performance"));
-
- hbox_clip_filtering_log = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
- gtk_container_add (GTK_CONTAINER (vbox1_filtering_log), hbox_clip_filtering_log);
- gtk_widget_show (hbox_clip_filtering_log);
- PACK_CHECK_BUTTON (hbox_clip_filtering_log, checkbtn_clip_filtering_log,
- _("Restrict the log window to"));
-
- spinbtn_filtering_log_length_adj = GTK_ADJUSTMENT(gtk_adjustment_new (500, 0, G_MAXINT, 1, 10, 0));
- spinbtn_filtering_log_length = gtk_spin_button_new
- (GTK_ADJUSTMENT (spinbtn_filtering_log_length_adj), 1, 0);
- gtk_widget_show (spinbtn_filtering_log_length);
- gtk_box_pack_start (GTK_BOX (hbox_clip_filtering_log), spinbtn_filtering_log_length,
- FALSE, FALSE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_filtering_log_length), TRUE);
-
- CLAWS_SET_TIP(spinbtn_filtering_log_length,
- _("0 to stop logging in the log window"));
-
- label = gtk_label_new(_("lines"));
- gtk_widget_show (label);
- gtk_box_pack_start(GTK_BOX(hbox_clip_filtering_log), label, FALSE, FALSE, 0);
-
- SET_TOGGLE_SENSITIVITY(checkbtn_clip_filtering_log, spinbtn_filtering_log_length);
- SET_TOGGLE_SENSITIVITY(checkbtn_clip_filtering_log, label);
- SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, hbox_clip_filtering_log);
- SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, optmenu_filtering_log_level);
- SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, checkbtn_clip_filtering_log);
- SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, label_filtering_log_level);
-
/* disk log */
vbox_disk_log = gtkut_get_options_frame(vbox1, &frame_disk_log, _("Disk log"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_clip_network_log),
prefs_common.cliplog);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_clip_filtering_log),
- prefs_common.filtering_debug_cliplog);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_log_standard),
prefs_common.enable_log_standard);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_log_warning),
prefs_common.enable_log_error);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_log_status),
prefs_common.enable_log_status);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log),
- prefs_common.enable_filtering_debug);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_inc),
- prefs_common.enable_filtering_debug_inc);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_manual),
- prefs_common.enable_filtering_debug_manual);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_folder_proc),
- prefs_common.enable_filtering_debug_folder_proc);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_pre_proc),
- prefs_common.enable_filtering_debug_pre_proc);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_post_proc),
- prefs_common.enable_filtering_debug_post_proc);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_network_log_length),
prefs_common.loglength);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_filtering_log_length),
- prefs_common.filtering_debug_loglength);
- combobox_select_by_data(GTK_COMBO_BOX(optmenu_filtering_log_level),
- prefs_common.filtering_debug_level);
prefs_logging->checkbtn_clip_network_log = checkbtn_clip_network_log;
prefs_logging->spinbtn_network_log_length = spinbtn_network_log_length;
prefs_logging->checkbtn_log_warning = checkbtn_log_warning;
prefs_logging->checkbtn_log_error = checkbtn_log_error;
prefs_logging->checkbtn_log_status = checkbtn_log_status;
- prefs_logging->checkbtn_clip_filtering_log = checkbtn_clip_filtering_log;
- prefs_logging->spinbtn_filtering_log_length = spinbtn_filtering_log_length;
- prefs_logging->checkbtn_filtering_log = checkbtn_filtering_log;
- prefs_logging->checkbtn_filtering_log_inc = checkbtn_filtering_log_inc;
- prefs_logging->checkbtn_filtering_log_manual = checkbtn_filtering_log_manual;
- prefs_logging->checkbtn_filtering_log_folder_proc = checkbtn_filtering_log_folder_proc;
- prefs_logging->checkbtn_filtering_log_pre_proc = checkbtn_filtering_log_pre_proc;
- prefs_logging->checkbtn_filtering_log_post_proc = checkbtn_filtering_log_post_proc;
- prefs_logging->optmenu_filtering_log_level = optmenu_filtering_log_level;
prefs_logging->page.widget = vbox1;
}
LoggingPage *page = (LoggingPage *) _page;
MainWindow *mainwindow;
- gboolean filtering_debug_enabled;
- prefs_common.filtering_debug_level =
- combobox_get_active_data(GTK_COMBO_BOX(page->optmenu_filtering_log_level));
-
prefs_common.cliplog = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_clip_network_log));
prefs_common.loglength = gtk_spin_button_get_value_as_int(
GTK_TOGGLE_BUTTON(page->checkbtn_log_error));
prefs_common.enable_log_status = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_log_status));
- prefs_common.filtering_debug_cliplog = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->checkbtn_clip_filtering_log));
- prefs_common.filtering_debug_loglength = gtk_spin_button_get_value_as_int(
- GTK_SPIN_BUTTON(page->spinbtn_filtering_log_length));
- filtering_debug_enabled = prefs_common.enable_filtering_debug;
- prefs_common.enable_filtering_debug = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->checkbtn_filtering_log));
- if (filtering_debug_enabled != prefs_common.enable_filtering_debug) {
- if (prefs_common.enable_filtering_debug)
- log_message(LOG_DEBUG_FILTERING, _("filtering log enabled\n"));
- else
- log_message(LOG_DEBUG_FILTERING, _("filtering log disabled\n"));
- }
- prefs_common.enable_filtering_debug_inc = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->checkbtn_filtering_log_inc));
- prefs_common.enable_filtering_debug_manual = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->checkbtn_filtering_log_manual));
- prefs_common.enable_filtering_debug_folder_proc = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->checkbtn_filtering_log_folder_proc));
- prefs_common.enable_filtering_debug_pre_proc = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->checkbtn_filtering_log_pre_proc));
- prefs_common.enable_filtering_debug_post_proc = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->checkbtn_filtering_log_post_proc));
mainwindow = mainwindow_get_mainwindow();
- log_window_set_clipping(mainwindow->logwin, prefs_common.cliplog,
- prefs_common.loglength);
- log_window_set_clipping(mainwindow->filtering_debugwin, prefs_common.filtering_debug_cliplog,
- prefs_common.filtering_debug_loglength);
+ log_window_set_clipping(mainwindow->logwin, prefs_common.cliplog, prefs_common.loglength);
}
static void prefs_logging_destroy_widget(PrefsPage *_page)
