2003-04-29 Havoc Pennington <hp@redhat.com>

	* dbus/dbus.h: add "you have to define DBUS_API_SUBJECT_TO_CHANGE
	to use this library" to be sure people have the right
	expectations.

diff --git a/ChangeLog b/ChangeLog
index 386c1ca80bc2a0d7e148496c8bedec975cac2aba..a6257d8f2cf7939e9d08655aa8f60790431269cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-29  Havoc Pennington  <hp@redhat.com>
+
+       * dbus/dbus.h: add "you have to define DBUS_API_SUBJECT_TO_CHANGE
+       to use this library" to be sure people have the right
+       expectations.
+       
 2003-04-28  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: add --enable-docs which by default is auto yes if

diff --git a/configure.in b/configure.in
index abb309c5c4c8a300994610ec6d6b206c20b92aca..07830d9011b130847a7c544e6ee77b1ae0b0ff31 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -132,8 +132,14 @@ else
   fi
 fi
 
-# compress spaces in cflags
+changequote(,)dnl
+# let ourselves use our own unstable API
+CPPFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE=1 $CPPFLAGS"
+# compress spaces in flags
 CFLAGS=`echo "$CFLAGS" | sed -e 's/ +/ /g'`
+CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ +/ /g'`
+CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/ +/ /g'`
+changequote([,])dnl
 
 if test x$enable_gcov = xyes; then
      ## so that config.h changes when you toggle gcov support
@@ -607,6 +613,8 @@ echo "
        source code location:     ${srcdir}
        compiler:                 ${CC}
        cflags:                   ${CFLAGS}
+       cppflags:                 ${CPPFLAGS}
+       cxxflags:                 ${CXXFLAGS}
         Doxygen:                  ${DOXYGEN}
         db2html:                  ${DB2HTML}
 

diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c
index 43e0788dba98734b4491299d612327e0fe3862d5..04c8f1de4a4fd80c60097851d2a97eca79fbfe4e 100644 (file)
--- a/dbus/dbus-mainloop.c
+++ b/dbus/dbus-mainloop.c
@@ -636,7 +636,7 @@ _dbus_loop_iterate (DBusLoop     *loop,
                 timeout = MIN (msecs_remaining, timeout);
 
 #if MAINLOOP_SPEW
-              _dbus_verbose ("  timeout added, %d remaining, aggregate timeout %d\n",
+              _dbus_verbose ("  timeout added, %d remaining, aggregate timeout %ld\n",
                              msecs_remaining, timeout);
 #endif
               

diff --git a/dbus/dbus.h b/dbus/dbus.h
index 4285b395051ac3f9defe8079acd0a52e50148b2f..d7fec9b9a6c3df84969dd488f9b588abc447a965 100644 (file)
--- a/dbus/dbus.h
+++ b/dbus/dbus.h
@@ -26,6 +26,10 @@
 
 #define DBUS_INSIDE_DBUS_H 1
 
+#ifndef DBUS_API_SUBJECT_TO_CHANGE
+#error "Please define DBUS_API_SUBJECT_TO_CHANGE to acknowledge your understanding that D-BUS hasn't reached 1.0 and is subject to protocol and API churn. That said, you are encouraged to use it and we are actively fixing bugs and believe it to be functional."
+#endif
+
 #include <dbus/dbus-arch-deps.h>
 #include <dbus/dbus-address.h>
 #include <dbus/dbus-bus.h>