[evolution-kolab] Move CamelKolabIMAPXSettings to libekolab.



commit a3e861c099a14413b021f03263d4787a44645f01
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Jun 29 20:54:12 2012 -0400

    Move CamelKolabIMAPXSettings to libekolab.
    
    CamelKolabIMAPXSettings needs libekolab/kolab-enumtypes.[ch] and I got
    the library dependencies backwards.  libekolabutil is the lowest level,
    not libekolab.

 src/addressbook/e-book-backend-kolab.c             |    2 +-
 src/calendar/e-cal-backend-kolab.c                 |    2 +-
 src/camel/camel-kolab-imapx-store.c                |    2 +-
 src/libekolab/Makefile.am                          |    2 ++
 .../camel-kolab-imapx-settings.c                   |    0
 .../camel-kolab-imapx-settings.h                   |    0
 src/libekolabutil/Makefile.am                      |    2 --
 7 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-kolab.c b/src/addressbook/e-book-backend-kolab.c
index cc0bd53..e1b1fd2 100644
--- a/src/addressbook/e-book-backend-kolab.c
+++ b/src/addressbook/e-book-backend-kolab.c
@@ -29,12 +29,12 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libekolabutil/camel-kolab-imapx-settings.h>
 #include <libekolabutil/camel-system-headers.h>
 #include <libekolabutil/kolab-util-camel.h>
 #include <libekolabutil/kolab-util-http.h>
 #include <libekolabutil/kolab-util-glib.h>
 
+#include <libekolab/camel-kolab-imapx-settings.h>
 #include <libekolab/kolab-types.h>
 #include <libekolab/kolab-mail-access.h>
 #include <libekolab/kolab-settings-handler.h>
diff --git a/src/calendar/e-cal-backend-kolab.c b/src/calendar/e-cal-backend-kolab.c
index 7adf446..31f5d8c 100644
--- a/src/calendar/e-cal-backend-kolab.c
+++ b/src/calendar/e-cal-backend-kolab.c
@@ -33,10 +33,10 @@
 
 #include <libical/ical.h>
 
+#include <libekolab/camel-kolab-imapx-settings.h>
 #include <libekolab/kolab-mail-access.h>
 #include <libekolab/kolab-settings-handler.h>
 #include <libekolab/kolab-mail-handle.h>
-#include <libekolabutil/camel-kolab-imapx-settings.h>
 #include <libekolabutil/kolab-util-http.h>
 #include <libekolabutil/kolab-util-glib.h>
 #include <libekolabutil/kolab-util-camel.h>
diff --git a/src/camel/camel-kolab-imapx-store.c b/src/camel/camel-kolab-imapx-store.c
index 33a37d2..33e209c 100644
--- a/src/camel/camel-kolab-imapx-store.c
+++ b/src/camel/camel-kolab-imapx-store.c
@@ -31,7 +31,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <libekolabutil/camel-kolab-imapx-settings.h>
+#include <libekolab/camel-kolab-imapx-settings.h>
 #include <libekolabutil/camel-system-headers.h>
 #include <libekolabutil/kolab-util-error.h>
 
diff --git a/src/libekolab/Makefile.am b/src/libekolab/Makefile.am
index d2d09a6..fe59572 100644
--- a/src/libekolab/Makefile.am
+++ b/src/libekolab/Makefile.am
@@ -41,6 +41,7 @@ ENUM_GENERATED =			\
 	kolab-enumtypes.c
 
 libekolab_la_SOURCES =			\
+	camel-kolab-imapx-settings.c	\
 	kolab-enumtypes.c		\
 	kolab-data-folder-metadata.c	\
 	kolab-data-folder-permissions.c	\
@@ -48,6 +49,7 @@ libekolab_la_SOURCES =			\
 	kolab-settings-handler.c
 
 noinst_HEADERS =			\
+	camel-kolab-imapx-settings.h	\
 	kolab-backend-types.h		\
 	kolab-data-folder-metadata.h	\
 	kolab-data-folder-permissions.h	\
diff --git a/src/libekolabutil/camel-kolab-imapx-settings.c b/src/libekolab/camel-kolab-imapx-settings.c
similarity index 100%
rename from src/libekolabutil/camel-kolab-imapx-settings.c
rename to src/libekolab/camel-kolab-imapx-settings.c
diff --git a/src/libekolabutil/camel-kolab-imapx-settings.h b/src/libekolab/camel-kolab-imapx-settings.h
similarity index 100%
rename from src/libekolabutil/camel-kolab-imapx-settings.h
rename to src/libekolab/camel-kolab-imapx-settings.h
diff --git a/src/libekolabutil/Makefile.am b/src/libekolabutil/Makefile.am
index 3657ed8..a5a2cbc 100644
--- a/src/libekolabutil/Makefile.am
+++ b/src/libekolabutil/Makefile.am
@@ -19,7 +19,6 @@ AM_CPPFLAGS =				\
 	$(KOLAB_INCLUDE)
 
 libekolabutil_la_SOURCES =		\
-	camel-kolab-imapx-settings.c	\
 	kolab-util-cal-freebusy.c	\
 	kolab-util-camel.c		\
 	kolab-util-glib.c		\
@@ -31,7 +30,6 @@ libekolabutil_la_SOURCES =		\
 	kolab-util-sqlite.c
 
 noinst_HEADERS =			\
-	camel-kolab-imapx-settings.h	\
 	kolab-util-cal-freebusy.h	\
 	kolab-util-camel.h		\
 	kolab-util-glib.h		\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]