[Commits] [SCM] claws branch, master, updated. 3.15.0-178-gb262ad5
ticho at claws-mail.org
ticho at claws-mail.org
Fri Nov 24 09:36:19 CET 2017
The branch, master has been updated
via b262ad59f68c298f075ca249c95683e6121fd04c (commit)
from 84589f6e5c39b34633cf8985fcdab5845e381a69 (commit)
Summary of changes:
src/filtering.c | 6 ++----
src/mainwindow.c | 4 ----
src/prefs_logging.c | 23 +++--------------------
3 files changed, 5 insertions(+), 28 deletions(-)
- Log -----------------------------------------------------------------
commit b262ad59f68c298f075ca249c95683e6121fd04c
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Thu Nov 23 00:31:26 2017 +0100
Reenable filtering log on Windows, as it is no longer crashy.
It was previously disabled in 83eaf78e3.
diff --git a/src/filtering.c b/src/filtering.c
index 05cef1d..8d57f09 100644
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -872,7 +872,7 @@ gboolean filter_message_by_msginfo(GSList *flist, MsgInfo *info, PrefsAccount* a
if (prefs_common.enable_filtering_debug) {
gchar *tmp = _("undetermined");
-#ifndef G_OS_WIN32
+
switch (context) {
case FILTERING_INCORPORATION:
tmp = _("incorporation");
@@ -898,9 +898,7 @@ gboolean filter_message_by_msginfo(GSList *flist, MsgInfo *info, PrefsAccount* a
debug_filtering_session = FALSE;
break;
}
-#else
- debug_filtering_session = FALSE;
-#endif
+
if (debug_filtering_session) {
gchar *file = procmsg_get_message_file_path(info);
gchar *spc = g_strnfill(LOG_TIME_LEN + 1, ' ');
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 3d58e7c..04e4c45 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -776,9 +776,7 @@ static GtkActionEntry mainwin_entries[] =
{"Tools/SSLCertificates", NULL, N_("SSL/TLS cer_tificates"), NULL, NULL, G_CALLBACK(ssl_manager_open_cb) },
#endif
/* {"Tools/---", NULL, "---", NULL, NULL, NULL }, */
-#ifndef G_OS_WIN32
{"Tools/FilteringLog", NULL, N_("Filtering Lo_g"), NULL, NULL, G_CALLBACK(filtering_debug_window_show_cb) },
-#endif
{"Tools/NetworkLog", NULL, N_("Network _Log"), "<shift><control>L", NULL, G_CALLBACK(log_window_show_cb) },
/* {"Tools/---", NULL, "---", NULL, NULL, NULL }, */
{"Tools/ForgetSessionPasswords", NULL, N_("_Forget all session passwords"), NULL, NULL, G_CALLBACK(forget_session_passwords_cb) },
@@ -1854,9 +1852,7 @@ MainWindow *main_window_create()
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "SSLCertificates", "Tools/SSLCertificates", GTK_UI_MANAGER_MENUITEM)
#endif
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator7", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
-#ifndef G_OS_WIN32
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "FilteringLog", "Tools/FilteringLog", GTK_UI_MANAGER_MENUITEM)
-#endif
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "NetworkLog", "Tools/NetworkLog", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator8", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "ForgetSessionPasswords", "Tools/ForgetSessionPasswords", GTK_UI_MANAGER_MENUITEM)
diff --git a/src/prefs_logging.c b/src/prefs_logging.c
index 23782b2..99b6567 100644
--- a/src/prefs_logging.c
+++ b/src/prefs_logging.c
@@ -56,7 +56,6 @@ typedef struct _LoggingPage
GtkWidget *checkbtn_log_warning;
GtkWidget *checkbtn_log_error;
GtkWidget *checkbtn_log_status;
-#ifndef G_OS_WIN32
GtkWidget *checkbtn_clip_filtering_log;
GtkWidget *spinbtn_filtering_log_length;
GtkWidget *checkbtn_filtering_log;
@@ -66,7 +65,6 @@ typedef struct _LoggingPage
GtkWidget *checkbtn_filtering_log_pre_proc;
GtkWidget *checkbtn_filtering_log_post_proc;
GtkWidget *optmenu_filtering_log_level;
-#endif
} LoggingPage;
static GtkWidget *prefs_logging_create_check_buttons(GtkWidget **checkbtn1,
@@ -100,7 +98,6 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
GtkWidget *spinbtn_network_log_length;
GtkAdjustment *spinbtn_network_log_length_adj;
GtkWidget *hbox_checkbtn;
-#ifndef G_OS_WIN32
GtkWidget *vbox1_filtering_log;
GtkWidget *hbox_clip_filtering_log;
GtkWidget *checkbtn_clip_filtering_log;
@@ -121,7 +118,6 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
GtkSizeGroup *filter_size_group;
GtkListStore *menu;
GtkTreeIter iter;
-#endif
GtkWidget *frame_disk_log;
GtkWidget *vbox_disk_log;
GtkWidget *label;
@@ -165,7 +161,6 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
SET_TOGGLE_SENSITIVITY(checkbtn_clip_network_log, spinbtn_network_log_length);
SET_TOGGLE_SENSITIVITY(checkbtn_clip_network_log, label);
-#ifndef G_OS_WIN32
/* Filtering/processing debug log */
vbox1_filtering_log = gtkut_get_options_frame(vbox1,
&frame_logging, _("Filtering/processing log"));
@@ -276,7 +271,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
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);
-#endif
+
/* disk log */
vbox_disk_log = gtkut_get_options_frame(vbox1, &frame_disk_log, _("Disk log"));
@@ -304,10 +299,8 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_clip_network_log),
prefs_common.cliplog);
-#ifndef G_OS_WIN32
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_clip_filtering_log),
prefs_common.filtering_debug_cliplog);
-#endif
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),
@@ -316,7 +309,6 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
prefs_common.enable_log_error);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_log_status),
prefs_common.enable_log_status);
-#ifndef G_OS_WIN32
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),
@@ -329,15 +321,13 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
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);
-#endif
+
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_network_log_length),
prefs_common.loglength);
-#ifndef G_OS_WIN32
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);
-#endif
prefs_logging->checkbtn_clip_network_log = checkbtn_clip_network_log;
prefs_logging->spinbtn_network_log_length = spinbtn_network_log_length;
@@ -345,7 +335,6 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
prefs_logging->checkbtn_log_warning = checkbtn_log_warning;
prefs_logging->checkbtn_log_error = checkbtn_log_error;
prefs_logging->checkbtn_log_status = checkbtn_log_status;
-#ifndef G_OS_WIN32
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;
@@ -355,7 +344,6 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
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;
-#endif
prefs_logging->page.widget = vbox1;
}
@@ -363,11 +351,10 @@ static void prefs_logging_save(PrefsPage *_page)
{
LoggingPage *page = (LoggingPage *) _page;
MainWindow *mainwindow;
-#ifndef G_OS_WIN32
+
gboolean filtering_debug_enabled;
prefs_common.filtering_debug_level =
combobox_get_active_data(GTK_COMBO_BOX(page->optmenu_filtering_log_level));
-#endif
prefs_common.cliplog = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_clip_network_log));
@@ -381,7 +368,6 @@ static void prefs_logging_save(PrefsPage *_page)
GTK_TOGGLE_BUTTON(page->checkbtn_log_error));
prefs_common.enable_log_status = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_log_status));
-#ifndef G_OS_WIN32
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(
@@ -405,14 +391,11 @@ static void prefs_logging_save(PrefsPage *_page)
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));
-#endif
mainwindow = mainwindow_get_mainwindow();
log_window_set_clipping(mainwindow->logwin, prefs_common.cliplog,
prefs_common.loglength);
-#ifndef G_OS_WIN32
log_window_set_clipping(mainwindow->filtering_debugwin, prefs_common.filtering_debug_cliplog,
prefs_common.filtering_debug_loglength);
-#endif
}
static void prefs_logging_destroy_widget(PrefsPage *_page)
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list