[evolution-data-server/treitter-client-gdbus] Factor out gdbus binding code common to both the addressbook and calendar.

[Travis Reitter <treitter src gnome org>]

commit 305abdd9bc7c9caa5986a1e46d705e2b213270bc
Author: Travis Reitter <treitter gmail com>
Date:   Wed Dec 16 15:00:44 2009 -0800

    Factor out gdbus binding code common to both the addressbook and calendar.

 addressbook/libebook/Makefile.am                   |    1 +
 .../libebook/e-data-book-factory-gdbus-bindings.h  |    2 +-
 .../libebook/e-data-book-gdbus-bindings-common.h   |  206 --------------------
 addressbook/libebook/e-data-book-gdbus-bindings.h  |    2 +-
 .../libebook/e-data-book-view-gdbus-bindings.h     |    2 +-
 calendar/libecal/Makefile.am                       |   13 +-
 .../libecal/e-data-cal-factory-gdbus-bindings.h    |    4 +-
 .../e-data-gdbus-bindings-common.h                 |    6 +-
 8 files changed, 15 insertions(+), 221 deletions(-)
---
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 2694d06..d3a2133 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -14,6 +14,7 @@ libebook_1_2_la_CPPFLAGS = \
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_builddir)/addressbook			\
 	-I$(top_builddir)/addressbook/libebook		\
+	-I$(top_srcdir)/libedata-gdbus-bindings		\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 libebook_1_2_la_SOURCES =				\
diff --git a/addressbook/libebook/e-data-book-factory-gdbus-bindings.h b/addressbook/libebook/e-data-book-factory-gdbus-bindings.h
index a890732..b1d437a 100644
--- a/addressbook/libebook/e-data-book-factory-gdbus-bindings.h
+++ b/addressbook/libebook/e-data-book-factory-gdbus-bindings.h
@@ -22,7 +22,7 @@
 #include <glib.h>
 #include <gdbus/gdbus.h>
 
-#include "e-data-book-gdbus-bindings-common.h"
+#include <libedata-gdbus-bindings/e-data-gdbus-bindings-common.h>
 
 G_BEGIN_DECLS
 
diff --git a/addressbook/libebook/e-data-book-gdbus-bindings.h b/addressbook/libebook/e-data-book-gdbus-bindings.h
index 385b258..59d85d5 100644
--- a/addressbook/libebook/e-data-book-gdbus-bindings.h
+++ b/addressbook/libebook/e-data-book-gdbus-bindings.h
@@ -22,7 +22,7 @@
 #include <glib.h>
 #include <gdbus/gdbus.h>
 
-#include "e-data-book-gdbus-bindings-common.h"
+#include <libedata-gdbus-bindings/e-data-gdbus-bindings-common.h>
 
 G_BEGIN_DECLS
 
diff --git a/addressbook/libebook/e-data-book-view-gdbus-bindings.h b/addressbook/libebook/e-data-book-view-gdbus-bindings.h
index f7348b8..3e10094 100644
--- a/addressbook/libebook/e-data-book-view-gdbus-bindings.h
+++ b/addressbook/libebook/e-data-book-view-gdbus-bindings.h
@@ -22,7 +22,7 @@
 #include <glib.h>
 #include <gdbus/gdbus.h>
 
-#include "e-data-book-gdbus-bindings-common.h"
+#include <libedata-gdbus-bindings/e-data-gdbus-bindings-common.h>
 
 G_BEGIN_DECLS
 
diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index c593595..9254ed7 100644
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -6,13 +6,14 @@ MARSHAL_GENERATED = e-cal-marshal.c e-cal-marshal.h
 lib_LTLIBRARIES = libecal-1.2.la
 
 libecal_1_2_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)							\
-	-DG_LOG_DOMAIN=\"libecal\"				\
-	-I$(top_srcdir) 						\
-	-I$(top_srcdir)/calendar				\
-	-I$(top_builddir)						\
+	$(AM_CPPFLAGS)					\
+	-DG_LOG_DOMAIN=\"libecal\"			\
+	-I$(top_srcdir) 				\
+	-I$(top_srcdir)/calendar			\
+	-I$(top_builddir)				\
 	-I$(top_builddir)/calendar/libecal		\
-	$(LIBICAL_CFLAGS)						\
+	-I$(top_srcdir)/libedata-gdbus-bindings		\
+	$(LIBICAL_CFLAGS)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 libecal_1_2_la_SOURCES =	             \
diff --git a/calendar/libecal/e-data-cal-factory-gdbus-bindings.h b/calendar/libecal/e-data-cal-factory-gdbus-bindings.h
index d4abe67..dcd7008 100644
--- a/calendar/libecal/e-data-cal-factory-gdbus-bindings.h
+++ b/calendar/libecal/e-data-cal-factory-gdbus-bindings.h
@@ -22,9 +22,7 @@
 #include <glib.h>
 #include <gdbus/gdbus.h>
 
-/* FIXME: move this file to a place where both sets of bindings can include it
- */
-#include "e-data-cal-gdbus-bindings-common.h"
+#include <libedata-gdbus-bindings/e-data-gdbus-bindings-common.h>
 
 G_BEGIN_DECLS
 
diff --git a/calendar/libecal/e-data-cal-gdbus-bindings-common.h b/libedata-gdbus-bindings/e-data-gdbus-bindings-common.h
similarity index 97%
rename from calendar/libecal/e-data-cal-gdbus-bindings-common.h
rename to libedata-gdbus-bindings/e-data-gdbus-bindings-common.h
index 31e487c..28abfeb 100644
--- a/calendar/libecal/e-data-cal-gdbus-bindings-common.h
+++ b/libedata-gdbus-bindings/e-data-gdbus-bindings-common.h
@@ -19,8 +19,8 @@
  * Author: Travis Reitter (travis reitter collabora co uk)
  */
 
-#ifndef _E_DATA_CAL_GDBUS_BINDINGS_COMMON_H
-#define _E_DATA_CAL_GDBUS_BINDINGS_COMMON_H
+#ifndef _E_DATA_GDBUS_BINDINGS_COMMON_H
+#define _E_DATA_GDBUS_BINDINGS_COMMON_H
 
 #include <glib.h>
 
@@ -203,4 +203,4 @@ typedef void (*reply__GPTRARRAY_with_GVALUEARRAY_with_UINT_STRING_endwith_endwit
     GError     *error,
     gpointer    user_data);
 
-#endif /* _E_DATA_CAL_GDBUS_BINDINGS_COMMON_H */
+#endif /* _E_DATA_GDBUS_BINDINGS_COMMON_H */