2002-11-21 Havoc Pennington <hp@redhat.com>

	* dbus/Makefile.am (INCLUDES): define DBUS_COMPILATION
	so we can allow ourselves to include files directly,
	instead of having to use dbus.h

	* dbus/dbus.h: fill in

	* dbus/dbus-message.h: sketch out a sample header file.
	Include griping if you include it directly instead of
	via dbus.h

	* dbus/dbus-macros.h: new file with macros for extern "C",
	TRUE/FALSE, NULL, etc.

	* doc/file-boilerplate.c: put include guards in here

7 files changed, 193 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 51b8b699..ee7d4da6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2002-11-21  Havoc Pennington  <hp@redhat.com>
 
+	* dbus/Makefile.am (INCLUDES): define DBUS_COMPILATION 
+	so we can allow ourselves to include files directly, 
+	instead of having to use dbus.h
+
+	* dbus/dbus.h: fill in
+
+	* dbus/dbus-message.h: sketch out a sample header file.
+	Include griping if you include it directly instead of 
+	via dbus.h
+
+	* dbus/dbus-macros.h: new file with macros for extern "C", 
+	TRUE/FALSE, NULL, etc.
+
+	* doc/file-boilerplate.c: put include guards in here
+
+2002-11-21  Havoc Pennington  <hp@redhat.com>
+
 	* doc/file-boilerplate.c: include both AFL and GPL boilerplate.
 
 	* COPYING: include the GPL as well, and license code 
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 09dd84f8..c233c766 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -1,12 +1,14 @@
 
-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS)
+INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION
 
 dbusincludedir=$(includedir)/dbus-1.0/dbus
 
 lib_LTLIBRARIES=libdbus-1.la
 
 dbusinclude_HEADERS=				\
-	dbus.h
+	dbus.h					\
+	dbus-macros.h				\
+	dbus-message.h
 
 libdbus_1_la_SOURCES=				\
 	dbus-message.c
diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h
new file mode 100644
index 00000000..413eca5d
--- /dev/null
+++ b/dbus/dbus-macros.h
@@ -0,0 +1,53 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* dbus-macros.h  generic macros
+ *
+ * Copyright (C) 2002  Red Hat Inc.
+ *
+ * Licensed under the Academic Free License version 1.2
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
+#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
+#endif
+
+#ifndef DBUS_MACROS_H
+#define DBUS_MACROS_H
+
+#ifdef  __cplusplus
+#  define DBUS_BEGIN_DECLS  extern "C" {
+#  define DBUS_END_DECLS    }
+#else
+#  define DBUS_BEGIN_DECLS
+#  define DBUS_END_DECLS
+#endif
+
+#ifndef TRUE
+#  define TRUE 1
+#endif
+#ifndef FALSE
+#  define FALSE 0
+#endif
+
+#ifndef NULL
+#  ifdef __cplusplus
+#    define NULL        (0L)
+#  else /* !__cplusplus */
+#    define NULL        ((void*) 0)
+#  endif /* !__cplusplus */
+#endif
+
+#endif /* DBUS_MACROS_H */
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index e69de29b..08a5c9d3 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -0,0 +1,37 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* dbus-message.c  DBusMessage object
+ *
+ * Copyright (C) 2002  Red Hat Inc.
+ *
+ * Licensed under the Academic Free License version 1.2
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include "dbus-message.h"
+
+struct DBusMessage
+{
+  int refcount;
+
+};
+
+DBusMessage*
+dbus_message_new (void)
+{
+  
+  return NULL;
+}
diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h
new file mode 100644
index 00000000..7dd7170b
--- /dev/null
+++ b/dbus/dbus-message.h
@@ -0,0 +1,44 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* dbus-message.h  DBusMessage object
+ *
+ * Copyright (C) 2002  Red Hat Inc.
+ *
+ * Licensed under the Academic Free License version 1.2
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
+#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
+#endif
+
+#ifndef DBUS_MESSAGE_H
+#define DBUS_MESSAGE_H
+
+#include <dbus/dbus-macros.h>
+
+DBUS_BEGIN_DECLS
+
+typedef struct DBusMessage DBusMessage;
+
+DBusMessage* dbus_message_new   (void);
+void         dbus_message_ref   (DBusMessage *message);
+void         dbus_message_unref (DBusMessage *message);
+
+
+
+DBUS_END_DECLS
+
+#endif /* DBUS_MESSAGE_H */
diff --git a/dbus/dbus.h b/dbus/dbus.h
index e69de29b..7c46ce15 100644
--- a/dbus/dbus.h
+++ b/dbus/dbus.h
@@ -0,0 +1,34 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* dbus.h  Convenience header including all other headers
+ *
+ * Copyright (C) 2002  Red Hat Inc.
+ *
+ * Licensed under the Academic Free License version 1.2
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef DBUS_H
+#define DBUS_H
+
+#define DBUS_INSIDE_DBUS_H 1
+
+#include <dbus/dbus-macros.h>
+#include <dbus/dbus-message.h>
+
+#undef DBUS_INSIDE_DBUS_H
+
+#endif /* DBUS_H
diff --git a/doc/file-boilerplate.c b/doc/file-boilerplate.c
index 5a1b513a..b296c8a6 100644
--- a/doc/file-boilerplate.c
+++ b/doc/file-boilerplate.c
@@ -21,3 +21,7 @@
  *
  */
 
+#ifndef DBUS_FOO_H
+#define DBUS_FOO_H
+
+#endif /* DBUS_FOO_H */