+2007-07-17 [paul] 2.10.0cvs35
+
+ * src/prefs_common.c
+ * src/prefs_common.h
+ * src/prefs_logging.c
+ * src/common/log.c
+ add options to stop/enable writing logs to disc
+
2007-07-17 [paul] 2.10.0cvs34
* src/edittags.c
( cvs diff -u -r 1.43.2.75 -r 1.43.2.76 src/toolbar.c; ) > 2.10.0cvs32.patchset
( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/edittags.c; ) > 2.10.0cvs33.patchset
( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/edittags.c; ) > 2.10.0cvs34.patchset
+( cvs diff -u -r 1.204.2.140 -r 1.204.2.141 src/prefs_common.c; cvs diff -u -r 1.103.2.86 -r 1.103.2.87 src/prefs_common.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_logging.c; cvs diff -u -r 1.6.2.13 -r 1.6.2.14 src/common/log.c; ) > 2.10.0cvs35.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=34
+EXTRA_VERSION=35
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
{ DEBUG_FILTERING_APPEND_TEXT_HOOKLIST, NULL, NULL, NULL }
};
+gboolean prefs_common_enable_log_standard(void);
+gboolean prefs_common_enable_log_warning(void);
+gboolean prefs_common_enable_log_error(void);
+gboolean prefs_common_enable_log_status(void);
+
static gboolean invoke_hook_cb (gpointer data)
{
LogText *logtext = (LogText *)data;
logtext->type = LOG_NORMAL;
g_timeout_add(0, invoke_hook_cb, logtext);
-
- if (log_fp[instance]) {
+
+ if (log_fp[instance] && prefs_common_enable_log_standard()) {
fputs(buf, log_fp[instance]);
fflush(log_fp[instance]);
}
g_timeout_add(0, invoke_hook_cb, logtext);
- if (log_fp[instance]) {
+ if (log_fp[instance] && prefs_common_enable_log_standard()) {
fwrite(buf, 1, LOG_TIME_LEN, log_fp[instance]);
fputs("* message: ", log_fp[instance]);
fputs(buf + LOG_TIME_LEN, log_fp[instance]);
g_timeout_add(0, invoke_hook_cb, logtext);
- if (log_fp[instance]) {
+ if (log_fp[instance] && prefs_common_enable_log_warning()) {
fwrite(buf, 1, LOG_TIME_LEN, log_fp[instance]);
fputs("** warning: ", log_fp[instance]);
fputs(buf + LOG_TIME_LEN, log_fp[instance]);
g_timeout_add(0, invoke_hook_cb, logtext);
- if (log_fp[instance]) {
+ if (log_fp[instance] && prefs_common_enable_log_error()) {
fwrite(buf, 1, LOG_TIME_LEN, log_fp[instance]);
fputs("*** error: ", log_fp[instance]);
fputs(buf + LOG_TIME_LEN, log_fp[instance]);
g_timeout_add(0, invoke_hook_cb, logtext);
- if (log_fp[instance]) {
+ if (log_fp[instance] && prefs_common_enable_log_status()) {
fwrite(buf, 1, LOG_TIME_LEN, log_fp[instance]);
fputs("* OK: ", log_fp[instance]);
fputs(buf + LOG_TIME_LEN, log_fp[instance]);
g_timeout_add(0, invoke_hook_cb, logtext);
- if (log_fp[instance]) {
+ if (log_fp[instance] && prefs_common_enable_log_status()) {
fwrite(buf, 1, LOG_TIME_LEN, log_fp[instance]);
fputs("* NOT OK: ", log_fp[instance]);
fputs(buf + LOG_TIME_LEN, log_fp[instance]);
g_timeout_add(0, invoke_hook_cb, logtext);
- if (log_fp[instance]) {
+ if (log_fp[instance] && prefs_common_enable_log_status()) {
fwrite(buf, 1, LOG_TIME_LEN, log_fp[instance]);
fputs("* SKIPPED: ", log_fp[instance]);
fputs(buf + LOG_TIME_LEN, log_fp[instance]);
{"important_score", "1", &prefs_common.important_score, P_INT,
NULL, NULL, NULL},
- {"clip_log", "TRUE", &prefs_common.cliplog, P_BOOL,
+ {"clip_log", "TRUE", &prefs_common.cliplog, P_BOOL,
NULL, NULL, NULL},
{"log_length", "500", &prefs_common.loglength, P_INT,
NULL, NULL, NULL},
-
+#ifndef MAEMO
+ {"enable_log_standard", "TRUE", &prefs_common.enable_log_standard, P_BOOL,
+ NULL, NULL, NULL},
+ {"enable_log_warning", "TRUE", &prefs_common.enable_log_warning, P_BOOL,
+ NULL, NULL, NULL},
+ {"enable_log_error", "TRUE", &prefs_common.enable_log_error, P_BOOL,
+ NULL, NULL, NULL},
+ {"enable_log_status", "TRUE", &prefs_common.enable_log_status, P_BOOL,
+ NULL, NULL, NULL},
+#else
+ {"enable_log_standard", "FALSE", &prefs_common.enable_log_standard, P_BOOL,
+ NULL, NULL, NULL},
+ {"enable_log_warning", "FALSE", &prefs_common.enable_log_warning, P_BOOL,
+ NULL, NULL, NULL},
+ {"enable_log_error", "FALSE", &prefs_common.enable_log_error, P_BOOL,
+ NULL, NULL, NULL},
+ {"enable_log_status", "FALSE", &prefs_common.enable_log_status, P_BOOL,
+ NULL, NULL, NULL},
+#endif
{"log_msg_color", "#00af00", &prefs_common.log_msg_color, P_COLOR,
NULL, NULL, NULL},
{"log_warn_color", "#af0000", &prefs_common.log_warn_color, P_COLOR,
return prefs_common.unsafe_ssl_certs;
}
+gboolean prefs_common_enable_log_standard(void)
+{
+ return prefs_common.enable_log_standard;
+}
+
+gboolean prefs_common_enable_log_warning(void)
+{
+ return prefs_common.enable_log_warning;
+}
+gboolean prefs_common_enable_log_error(void)
+{
+ return prefs_common.enable_log_error;
+}
+gboolean prefs_common_enable_log_status(void)
+{
+ return prefs_common.enable_log_status;
+}
/**
return the translated name of a header, if the translate_header option is
set, otherwise return the untranslated header name (header_name itself).
gchar *print_cmd;
gchar *ext_editor_cmd;
- gboolean cliplog;
- guint loglength;
+ gboolean cliplog;
+ guint loglength;
+ gboolean enable_log_standard;
+ gboolean enable_log_warning;
+ gboolean enable_log_error;
+ gboolean enable_log_status;
gulong log_msg_color;
gulong log_warn_color;
GtkWidget *checkbtn_clip_network_log;
GtkWidget *spinbtn_network_log_length;
+ GtkWidget *checkbtn_log_standard;
+ 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 *spinbtn_network_log_length;
GtkObject *spinbtn_network_log_length_adj;
GtkTooltips *network_log_length_tooltip;
- GtkWidget *label;
GtkWidget *vbox1_filtering_log;
GtkWidget *hbox_clip_filtering_log;
GtkWidget *checkbtn_clip_filtering_log;
GtkWidget *menu;
GtkWidget *menuitem;
GtkTooltips *filtering_log_level_tooltip;
+ GtkWidget *frame_disc_log;
+ GtkWidget *vbox_disc_log;
+ GtkWidget *label;
+ GtkWidget *hbox;
+ GtkWidget *checkbtn_log_standard;
+ GtkWidget *hbox_log_standard;
+ GtkWidget *checkbtn_log_warning;
+ GtkWidget *hbox_log_warning;
+ GtkWidget *checkbtn_log_error;
+ GtkWidget *hbox_log_error;
+ GtkWidget *checkbtn_log_status;
+ GtkWidget *hbox_log_status;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, checkbtn_clip_filtering_log);
SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, label_filtering_log_level);
+ /* disk log */
+ vbox_disc_log = gtkut_get_options_frame(vbox1, &frame_disc_log, _("Disc log"));
+
+ label = gtk_label_new(_("Write the following information to disc..."));
+ gtk_widget_show(label);
+ hbox = gtk_hbox_new (FALSE, 8);
+ gtk_container_add (GTK_CONTAINER (vbox_disc_log), hbox);
+ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+ gtk_widget_show (hbox);
+
+ PACK_CHECK_BUTTON (vbox_disc_log, checkbtn_log_standard,
+ _("Network protocol messages"));
+ hbox_log_standard = gtk_hbox_new (FALSE, 8);
+ gtk_container_add (GTK_CONTAINER (vbox_disc_log), hbox_log_standard);
+ gtk_widget_show (hbox_log_standard);
+
+ PACK_CHECK_BUTTON (vbox_disc_log, checkbtn_log_warning,
+ _("Warning messages"));
+ hbox_log_warning = gtk_hbox_new (FALSE, 8);
+ gtk_container_add (GTK_CONTAINER (vbox_disc_log), hbox_log_warning);
+ gtk_widget_show (hbox_log_warning);
+
+ PACK_CHECK_BUTTON (vbox_disc_log, checkbtn_log_error,
+ _("Error messages"));
+ hbox_log_error = gtk_hbox_new (FALSE, 8);
+ gtk_container_add (GTK_CONTAINER (vbox_disc_log), hbox_log_error);
+ gtk_widget_show (hbox_log_error);
+
+ PACK_CHECK_BUTTON (vbox_disc_log, checkbtn_log_status,
+ _("Status messages for filtering/processing log"));
+ hbox_log_status = gtk_hbox_new (FALSE, 8);
+ gtk_container_add (GTK_CONTAINER (vbox_disc_log), hbox_log_status);
+ gtk_widget_show (hbox_log_status);
+
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_warning);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_log_error),
+ 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_logging->checkbtn_clip_network_log = checkbtn_clip_network_log;
prefs_logging->spinbtn_network_log_length = spinbtn_network_log_length;
+ prefs_logging->checkbtn_log_standard = checkbtn_log_standard;
+ 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;
GTK_TOGGLE_BUTTON(page->checkbtn_clip_network_log));
prefs_common.loglength = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(page->spinbtn_network_log_length));
+ prefs_common.enable_log_standard = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->checkbtn_log_standard));
+ prefs_common.enable_log_warning = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->checkbtn_log_warning));
+ prefs_common.enable_log_error = gtk_toggle_button_get_active(
+ 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(