Author: tthurman
Date: Fri Feb 15 04:37:39 2008
New Revision: 3569
URL: http://svn.gnome.org/viewvc/metacity?rev=3569&view=rev
Log:
2008-02-14 Jim Huang <[EMAIL PROTECTED]>
* src/core/display.c, src/core/util.c: fixups to allow
compilation in non-verbose mode. Closes #515152.
Modified:
trunk/ChangeLog
trunk/src/core/display.c
trunk/src/core/util.c
Modified: trunk/src/core/display.c
==============================================================================
--- trunk/src/core/display.c (original)
+++ trunk/src/core/display.c Fri Feb 15 04:37:39 2008
@@ -1246,7 +1246,9 @@
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 @@
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);
Modified: trunk/src/core/util.c
==============================================================================
--- trunk/src/core/util.c (original)
+++ trunk/src/core/util.c Fri Feb 15 04:37:39 2008
@@ -131,10 +131,10 @@
#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 @@
void
meta_set_debugging (gboolean setting)
{
+#ifdef WITH_VERBOSE_MODE
if (setting)
ensure_logfile ();
-
+#endif
+
is_debugging = setting;
}
@@ -373,8 +375,12 @@
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 @@
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 @@
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);
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
