From 3d0ed3b0db29ae44e9492d680bc2c347ee1d2664 Mon Sep 17 00:00:00 2001 From: Eric Koegel Date: Sat, 28 Mar 2015 12:24:02 +0300 Subject: [PATCH] Make Verbose logging conditonal (Bug #11698) This patch makes disable verbose logging if the environment variable isn't set. --- xfce4-session/main.c | 6 +++++- xfce4-session/xfsm-global.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/xfce4-session/main.c b/xfce4-session/main.c index 0c27a55..58af11b 100644 --- a/xfce4-session/main.c +++ b/xfce4-session/main.c @@ -83,6 +83,7 @@ setup_environment (void) { const gchar *lang; const gchar *sm; + const gchar *verbose; gchar *authfile; int fd; @@ -95,8 +96,11 @@ setup_environment (void) } /* check if running in verbose mode */ - if (g_getenv ("XFSM_VERBOSE") != NULL) + verbose = g_getenv ("XFSM_VERBOSE"); + if (verbose != NULL && strlen (verbose) > 0) + { xfsm_enable_verbose (); + } /* pass correct DISPLAY to children, in case of --display in argv */ g_setenv ("DISPLAY", gdk_display_get_name (gdk_display_get_default ()), TRUE); diff --git a/xfce4-session/xfsm-global.c b/xfce4-session/xfsm-global.c index 6368a9a..b4f408c 100644 --- a/xfce4-session/xfsm-global.c +++ b/xfce4-session/xfsm-global.c @@ -90,6 +90,9 @@ xfsm_verbose_real (const char *func, gchar *logfile; va_list valist; + if (!verbose) + return; + if (G_UNLIKELY (fp == NULL)) { logfile = xfce_get_homefile (".xfce4-session.verbose-log", NULL); -- 2.3.4