From 04956ecf1887221492c8d1557e912a032cf33522 Mon Sep 17 00:00:00 2001 From: Jim Huang Date: Fri, 15 Feb 2008 04:37:39 +0000 Subject: [PATCH] fixups to allow compilation in non-verbose mode. Closes #515152. 2008-02-14 Jim Huang * src/core/display.c, src/core/util.c: fixups to allow compilation in non-verbose mode. Closes #515152. svn path=/trunk/; revision=3569 --- ChangeLog | 5 +++++ src/core/display.c | 4 ++++ src/core/util.c | 26 ++++++++++++++++++++------ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b24a1b6ea..24414df95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-02-14 Jim Huang + + * src/core/display.c, src/core/util.c: fixups to allow + compilation in non-verbose mode. Closes #515152. + 2008-02-12 Thomas Thurman * configure.in: Correct help for verbose option name. diff --git a/src/core/display.c b/src/core/display.c index bf4d95362..806366816 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -1246,7 +1246,9 @@ meta_displays_list (void) return all_displays; } +#ifdef WITH_VERBOSE_MODE static gboolean dump_events = TRUE; +#endif static gboolean grab_op_is_mouse_only (MetaGrabOp op) @@ -1607,8 +1609,10 @@ event_callback (XEvent *event, display = data; +#ifdef WITH_VERBOSE_MODE if (dump_events) meta_spew_event (display, event); +#endif #ifdef HAVE_STARTUP_NOTIFICATION sn_display_process_event (display->sn_display, event); diff --git a/src/core/util.c b/src/core/util.c index ca2452f3d..600240b72 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -131,10 +131,10 @@ meta_set_verbose (gboolean setting) #ifndef WITH_VERBOSE_MODE if (setting) meta_fatal (_("Metacity was compiled without support for verbose mode\n")); -#endif - +#else if (setting) ensure_logfile (); +#endif is_verbose = setting; } @@ -148,9 +148,11 @@ meta_is_debugging (void) void meta_set_debugging (gboolean setting) { +#ifdef WITH_VERBOSE_MODE if (setting) ensure_logfile (); - +#endif + is_debugging = setting; } @@ -373,8 +375,12 @@ meta_bug (const char *format, ...) str = g_strdup_vprintf (format, args); va_end (args); +#ifdef WITH_VERBOSE_MODE out = logfile ? logfile : stderr; - +#else + out = stderr; +#endif + if (no_prefix == 0) utf8_fputs (_("Bug in window manager: "), out); utf8_fputs (str, out); @@ -402,8 +408,12 @@ meta_warning (const char *format, ...) str = g_strdup_vprintf (format, args); va_end (args); +#ifdef WITH_VERBOSE_MODE out = logfile ? logfile : stderr; - +#else + out = stderr; +#endif + if (no_prefix == 0) utf8_fputs (_("Window manager warning: "), out); utf8_fputs (str, out); @@ -426,8 +436,12 @@ meta_fatal (const char *format, ...) str = g_strdup_vprintf (format, args); va_end (args); +#ifdef WITH_VERBOSE_MODE out = logfile ? logfile : stderr; - +#else + out = stderr; +#endif + if (no_prefix == 0) utf8_fputs (_("Window manager error: "), out); utf8_fputs (str, out);