2002-11-25 Havoc Pennington <hp@pobox.com>

	* dbus/dbus-internals.c (_dbus_verbose): fix to not
	always print the first verbose message.

2 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index e659c748..dce9ece7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-25  Havoc Pennington  <hp@pobox.com>
+
+	* dbus/dbus-internals.c (_dbus_verbose): fix to not 
+	always print the first verbose message.
+
 2002-11-24  Havoc Pennington  <hp@pobox.com>
 
         * test/echo-client.c, test/echo-server.c: cheesy test 
diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
index e90703e4..0fd01c29 100644
--- a/dbus/dbus-internals.c
+++ b/dbus/dbus-internals.c
@@ -155,6 +155,10 @@ _dbus_verbose (const char *format,
   static dbus_bool_t verbose = TRUE;
   static dbus_bool_t initted = FALSE;
 
+  /* things are written a bit oddly here so that
+   * in the non-verbose case we just have the one
+   * conditional and return immediately.
+   */
   if (!verbose)
     return;
   
@@ -162,6 +166,8 @@ _dbus_verbose (const char *format,
     {
       verbose = getenv ("DBUS_VERBOSE") != NULL;
       initted = TRUE;
+      if (!verbose)
+        return;
     }
   
   va_start (args, format);