changeset 11884:b1099e09eb33

[gaim-migrate @ 14175] I *think* this will make sure we distribute the right pieces for dbus support, but I don't currently have a sensible way of testing. Also, I suspect we may want some of the code generation to happen at dist time instead of build time. Something to think about. committer: Tailor Script <[e-mail]>

--- a/src/Makefile.am	Sat Oct 29 02:03:24 2005 +0000
+++ b/src/Makefile.am	Sat Oct 29 02:06:36 2005 +0000
@@ -1,4 +1,6 @@
 EXTRA_DIST = \
+		dbus-analyze-functions.py \
+		dbus-analyze-types.py \
 		getopt.c \
 		getopt.h \
 		getopt1.c \
@@ -111,6 +113,7 @@
 	connection.h \
 	conversation.h \
 	core.h \
+	dbus-maybe.h \
 	debug.h \
 	desktopitem.h \
 	eventloop.h \
@@ -157,12 +160,12 @@
 	dbus-client-binding.h \
 	gaim.service \
 	dbus-types.c \
-	dbus-types.h 
+	dbus-types.h
 
 # gaim dbus server
 
 dbus_sources  = dbus-server.c dbus-useful.c
-dbus_headers  = dbus-server.h dbus-useful.h dbus-maybe.h
+dbus_headers  = dbus-bindings.h dbus-gaim.h dbus-server.h dbus-useful.h
 
 dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h connection.h conversation.h core.h roomlist.h status.h server.h
 

--- a/src/dbus-bindings.h	Sat Oct 29 02:03:24 2005 +0000
+++ b/src/dbus-bindings.h	Sat Oct 29 02:06:36 2005 +0000
@@ -31,6 +31,10 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <glib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 gint gaim_dbus_pointer_to_id(gpointer node);
 gpointer gaim_dbus_id_to_pointer(gint id, GaimDBusType *type);
 gint  gaim_dbus_pointer_to_id_error(gpointer ptr, DBusError *error);
@@ -47,7 +51,6 @@
 	    (id, GAIM_DBUS_TYPE(type), #type, error);			\
 	CHECK_ERROR(error);						\
     } G_STMT_END
-	       
 
 
 #define GAIM_DBUS_POINTER_TO_ID(id, ptr, error)				\
@@ -103,4 +106,8 @@
 
 DBusConnection *gaim_dbus_get_connection(void);
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif