Add dbus-compat.h.

ChangeLog

@@ -1,3 +1,9 @@
+Mon Jun 20 02:49:27 PDT 2005  Christian Hammond <chipx86@gnupdate.org>
+
+	* libnotify/Makefile.am:
+	A libnotify/dbus-compat.h:
+	  - Add dbus-compat.h.
+
 Mon Jun 20 02:43:26 PDT 2005  Christian Hammond <chipx86@gnupdate.org>
 
 	* libnotify/notify.c:

libnotify/Makefile.am

@@ -6,6 +6,7 @@ notifyinc_HEADERS = \
 	notify.h
 
 libnotify_la_SOURCES = \
+	dbus-compat.h \
 	notify.c
 
 libnotify_la_LIBADD = \

libnotify/dbus-compat.h

@@ -0,0 +1,144 @@
+/**
+ * @file libnotify/dbus-compat.h Private D-BUS Compatibility API
+ *
+ * @Copyright (C) 2005 Christian Hammond.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA  02111-1307, USA.
+ */
+#ifndef _NOTIFY_DBUS_COMPAT_H_
+#define _NOTIFY_DBUS_COMPAT_H_
+
+#define NOTIFY_CHECK_DBUS_VERSION(major, minor) \
+	(DBUS_MAJOR_VER > (major) || \
+	 (DBUS_MAJOR_VER == (major) && DBUS_MINOR_VER >= (minor)))
+
+#if NOTIFY_CHECK_DBUS_VERSION(0, 30)
+# define _notify_dbus_message_iter_append_byte(iter, val) \
+	dbus_message_iter_append_basic((iter), DBUS_TYPE_BYTE, &(val))
+# define _notify_dbus_message_iter_append_boolean(iter, val) \
+	dbus_message_iter_append_basic((iter), DBUS_TYPE_BOOLEAN, &(val))
+# define _notify_dbus_message_iter_append_string(iter, val) \
+	dbus_message_iter_append_basic((iter), DBUS_TYPE_STRING, &(val))
+# define _notify_dbus_message_iter_append_int32(iter, val) \
+	dbus_message_iter_append_basic((iter), DBUS_TYPE_INT32, &(val))
+# define _notify_dbus_message_iter_append_uint32(iter, val) \
+	dbus_message_iter_append_basic((iter), DBUS_TYPE_UINT32, &(val))
+# define _notify_dbus_message_iter_append_double(iter, val) \
+	dbus_message_iter_append_basic((iter), DBUS_TYPE_DOUBLE, &(val))
+
+# define _notify_dbus_message_iter_append_byte_array(iter, data, len) \
+	dbus_message_iter_append_fixed_array((iter), DBUS_TYPE_BYTE, &(data), \
+										 (len))
+# define _notify_dbus_message_iter_append_boolean_array(iter, data, len) \
+	dbus_message_iter_append_fixed_array((iter), DBUS_TYPE_BOOLEAN, &(data), \
+										 (len))
+# define _notify_dbus_message_iter_append_int32_array(iter, data, len) \
+	dbus_message_iter_append_fixed_array((iter), DBUS_TYPE_INT32, &(data), \
+										 (len))
+# define _notify_dbus_message_iter_append_uint32_array(iter, data, len) \
+	dbus_message_iter_append_fixed_array((iter), DBUS_TYPE_UINT32, &(data), \
+										 (len))
+# define _notify_dbus_message_iter_append_string_array(iter, data, len) \
+	dbus_message_iter_append_fixed_array((iter), DBUS_TYPE_STRING, \
+										 &(data), (len))
+
+# define _notify_dbus_message_iter_get_byte(iter, retvar) \
+	dbus_message_iter_get_basic((iter), &(retvar))
+# define _notify_dbus_message_iter_get_boolean(iter, retvar) \
+	dbus_message_iter_get_basic((iter), &(retvar))
+# define _notify_dbus_message_iter_get_string(iter, retvar) \
+	dbus_message_iter_get_basic((iter), &(retvar))
+# define _notify_dbus_message_iter_get_int32(iter, retvar) \
+	dbus_message_iter_get_basic((iter), &(retvar))
+# define _notify_dbus_message_iter_get_uint32(iter, retvar) \
+	dbus_message_iter_get_basic((iter), &(retvar))
+# define _notify_dbus_message_iter_get_double(iter, retvar) \
+	dbus_message_iter_get_basic((iter), &(retvar))
+
+# define _notify_dbus_message_iter_get_byte_array \
+	dbus_message_iter_get_fixed_array
+# define _notify_dbus_message_iter_get_boolean_array \
+	dbus_message_iter_get_fixed_array
+# define _notify_dbus_message_iter_get_int32_array \
+	dbus_message_iter_get_fixed_array
+# define _notify_dbus_message_iter_get_uint32_array \
+	dbus_message_iter_get_fixed_array
+# define _notify_dbus_message_iter_get_string_array(iter, array, num_items) \
+	dbus_message_iter_get_fixed_array((iter), (array), (num_items))
+
+#else /* D-BUS < 0.30 */
+# define DBUS_INTERFACE_DBUS        DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS
+# define DBUS_SERVICE_DBUS          DBUS_SERVICE_ORG_FREEDESKTOP_DBUS
+# define DBUS_PATH_DBUS             DBUS_PATH_ORG_FREEDESKTOP_DBUS
+# define DBUS_ERROR_SERVICE_UNKNOWN DBUS_ERROR_SERVICE_DOES_NOT_EXIST
+
+# define dbus_bus_start_service_by_name dbus_bus_activate_service
+
+# define dbus_message_iter_close_container(iter, container_iter)
+
+# define dbus_message_iter_init_append(msg, iter) \
+	dbus_message_iter_init(msg, iter)
+
+# define _notify_dbus_message_iter_append_byte(iter, val) \
+	dbus_message_iter_append_byte((iter), (val))
+# define _notify_dbus_message_iter_append_boolean(iter, val) \
+	dbus_message_iter_append_boolean((iter), (val))
+# define _notify_dbus_message_iter_append_string(iter, val) \
+	dbus_message_iter_append_string((iter), (val))
+# define _notify_dbus_message_iter_append_int32(iter, val) \
+	dbus_message_iter_append_int32((iter), (val))
+# define _notify_dbus_message_iter_append_uint32(iter, val) \
+	dbus_message_iter_append_uint32((iter), (val))
+# define _notify_dbus_message_iter_append_double(iter, val) \
+	dbus_message_iter_append_double((iter), (val))
+
+# define _notify_dbus_message_iter_append_byte_array(iter, data, len) \
+	dbus_message_iter_append_byte_array((iter), (data), (len))
+# define _notify_dbus_message_iter_append_boolean_array(iter, data, len) \
+	dbus_message_iter_append_boolean_array((iter), (data), (len))
+# define _notify_dbus_message_iter_append_int32_array(iter, data, len) \
+	dbus_message_iter_append_int32_array((iter), (data), (len))
+# define _notify_dbus_message_iter_append_uint32_array(iter, data, len) \
+	dbus_message_iter_append_uint32_array((iter), (data), (len))
+# define _notify_dbus_message_iter_append_string_array(iter, data, len) \
+	dbus_message_iter_append_string_array((iter), (const char **)(data), (len))
+
+# define _notify_dbus_message_iter_get_byte(iter, retvar) \
+	retvar = dbus_message_iter_get_byte((iter))
+# define _notify_dbus_message_iter_get_boolean(iter, retvar) \
+	retvar = dbus_message_iter_get_boolean((iter))
+# define _notify_dbus_message_iter_get_string(iter, retvar) \
+	retvar = dbus_message_iter_get_string((iter))
+# define _notify_dbus_message_iter_get_int32(iter, retvar) \
+	retvar = dbus_message_iter_get_int32((iter))
+# define _notify_dbus_message_iter_get_uint32(iter, retvar) \
+	retvar = dbus_message_iter_get_uint32((iter))
+# define _notify_dbus_message_iter_get_double(iter, retvar) \
+	retvar = dbus_message_iter_get_double((iter))
+
+# define _notify_dbus_message_iter_get_byte_array(iter, data, len) \
+	dbus_message_iter_get_byte_array((iter), (data), (len))
+# define _notify_dbus_message_iter_get_boolean_array(iter, data, len) \
+	dbus_message_iter_get_boolean_array((iter), (data), (len))
+# define _notify_dbus_message_iter_get_int32_array(iter, data, len) \
+	dbus_message_iter_get_int32_array((iter), (data), (len))
+# define _notify_dbus_message_iter_get_uint32_array(iter, data, len) \
+	dbus_message_iter_get_uint32_array((iter), (data), (len))
+# define _notify_dbus_message_iter_get_string_array(iter, data, len) \
+	dbus_message_iter_get_string_array((iter), (data), (len))
+#endif
+
+#endif /* NOTIFY_DBUS_COMPAT_H_ */