brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixups to allow compilation in non-verbose mode. Closes #515152.

Browse Source 
2008-02-14  Jim Huang  <jserv.tw@gmail.com>                                                                      
                                                                                                                 
        * src/core/display.c, src/core/util.c: fixups to allow                                                   
        compilation in non-verbose mode. Closes #515152.   

svn path=/trunk/; revision=3569
This commit is contained in:
Jim Huang 2008-02-15 04:37:39 +00:00 committed by Thomas James Alexander Thurman
parent 2d41d65cf2
commit 04956ecf18
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-02-14 Jim Huang <jserv.tw@gmail.com>
* src/core/display.c, src/core/util.c: fixups to allow
compilation in non-verbose mode. Closes #515152.
2008-02-12 Thomas Thurman <tthurman@gnome.org> 2008-02-12 Thomas Thurman <tthurman@gnome.org>
* configure.in: Correct help for verbose option name. * configure.in: Correct help for verbose option name.

4
src/core/display.c
View File

@ -1246,7 +1246,9 @@ meta_displays_list (void)
return all_displays; return all_displays;
} }
#ifdef WITH_VERBOSE_MODE
static gboolean dump_events = TRUE; static gboolean dump_events = TRUE;
#endif
static gboolean static gboolean
grab_op_is_mouse_only (MetaGrabOp op) grab_op_is_mouse_only (MetaGrabOp op)
@ -1607,8 +1609,10 @@ event_callback (XEvent *event,
display = data; display = data;
#ifdef WITH_VERBOSE_MODE
if (dump_events) if (dump_events)
meta_spew_event (display, event); meta_spew_event (display, event);
#endif
#ifdef HAVE_STARTUP_NOTIFICATION #ifdef HAVE_STARTUP_NOTIFICATION
sn_display_process_event (display->sn_display, event); sn_display_process_event (display->sn_display, event);

26
src/core/util.c
View File

@ -131,10 +131,10 @@ meta_set_verbose (gboolean setting)
#ifndef WITH_VERBOSE_MODE #ifndef WITH_VERBOSE_MODE
if (setting) if (setting)
meta_fatal (_("Metacity was compiled without support for verbose mode\n")); meta_fatal (_("Metacity was compiled without support for verbose mode\n"));
#endif #else
if (setting) if (setting)
ensure_logfile (); ensure_logfile ();
#endif
is_verbose = setting; is_verbose = setting;
} }
@ -148,9 +148,11 @@ meta_is_debugging (void)
void void
meta_set_debugging (gboolean setting) meta_set_debugging (gboolean setting)
{ {
#ifdef WITH_VERBOSE_MODE
if (setting) if (setting)
ensure_logfile (); ensure_logfile ();
#endif
is_debugging = setting; is_debugging = setting;
} }
@ -373,8 +375,12 @@ meta_bug (const char *format, ...)
str = g_strdup_vprintf (format, args); str = g_strdup_vprintf (format, args);
va_end (args); va_end (args);
#ifdef WITH_VERBOSE_MODE
out = logfile ? logfile : stderr; out = logfile ? logfile : stderr;
#else
out = stderr;
#endif
if (no_prefix == 0) if (no_prefix == 0)
utf8_fputs (_("Bug in window manager: "), out); utf8_fputs (_("Bug in window manager: "), out);
utf8_fputs (str, out); utf8_fputs (str, out);
@ -402,8 +408,12 @@ meta_warning (const char *format, ...)
str = g_strdup_vprintf (format, args); str = g_strdup_vprintf (format, args);
va_end (args); va_end (args);
#ifdef WITH_VERBOSE_MODE
out = logfile ? logfile : stderr; out = logfile ? logfile : stderr;
#else
out = stderr;
#endif
if (no_prefix == 0) if (no_prefix == 0)
utf8_fputs (_("Window manager warning: "), out); utf8_fputs (_("Window manager warning: "), out);
utf8_fputs (str, out); utf8_fputs (str, out);
@ -426,8 +436,12 @@ meta_fatal (const char *format, ...)
str = g_strdup_vprintf (format, args); str = g_strdup_vprintf (format, args);
va_end (args); va_end (args);
#ifdef WITH_VERBOSE_MODE
out = logfile ? logfile : stderr; out = logfile ? logfile : stderr;
#else
out = stderr;
#endif
if (no_prefix == 0) if (no_prefix == 0)
utf8_fputs (_("Window manager error: "), out); utf8_fputs (_("Window manager error: "), out);
utf8_fputs (str, out); utf8_fputs (str, out);