[evolution/wip/webkit2] Bug 744718 - Provide backend specific extensions as public

[Tomas Popela <tpopela src gnome org>]

commit 2513cd41fe75479c8ad8aeb9350e8385c19f38f8
Author: Milan Crha <mcrha redhat com>
Date:   Tue Mar 24 07:26:51 2015 +0100

    Bug 744718 - Provide backend specific extensions as public

 modules/book-config-ldap/Makefile.am               |    4 +-
 modules/book-config-ldap/e-source-ldap.c           |  688 --------------------
 modules/book-config-ldap/e-source-ldap.h           |  122 ----
 .../book-config-ldap/evolution-book-config-ldap.c  |    4 +-
 modules/cal-config-contacts/Makefile.am            |    4 +-
 modules/cal-config-contacts/e-contacts-selector.c  |    8 +-
 modules/cal-config-contacts/e-source-contacts.c    |  171 -----
 modules/cal-config-contacts/e-source-contacts.h    |   69 --
 .../evolution-cal-config-contacts.c                |    3 +-
 modules/cal-config-local/Makefile.am               |    4 +-
 modules/cal-config-local/e-source-local.c          |  202 ------
 modules/cal-config-local/e-source-local.h          |   68 --
 .../cal-config-local/evolution-cal-config-local.c  |    4 +-
 modules/cal-config-weather/Makefile.am             |    4 +-
 modules/cal-config-weather/e-source-weather.c      |  260 --------
 modules/cal-config-weather/e-source-weather.h      |   83 ---
 .../evolution-cal-config-weather.c                 |    4 +-
 17 files changed, 14 insertions(+), 1688 deletions(-)
---
diff --git a/modules/book-config-ldap/Makefile.am b/modules/book-config-ldap/Makefile.am
index 7f73e4c..8251c73 100644
--- a/modules/book-config-ldap/Makefile.am
+++ b/modules/book-config-ldap/Makefile.am
@@ -11,9 +11,7 @@ module_book_config_ldap_la_CPPFLAGS = \
        $(NULL)
 
 module_book_config_ldap_la_SOURCES = \
-       evolution-book-config-ldap.c                            \
-       e-source-ldap.c                                         \
-       e-source-ldap.h
+       evolution-book-config-ldap.c
 
 module_book_config_ldap_la_LIBADD = \
        $(top_builddir)/e-util/libevolution-util.la             \
diff --git a/modules/book-config-ldap/evolution-book-config-ldap.c 
b/modules/book-config-ldap/evolution-book-config-ldap.c
index e780702..f67fd82 100644
--- a/modules/book-config-ldap/evolution-book-config-ldap.c
+++ b/modules/book-config-ldap/evolution-book-config-ldap.c
@@ -20,11 +20,10 @@
 #include <glib/gi18n-lib.h>
 
 #include <libebackend/libebackend.h>
+#include <libedataserver/libedataserver.h>
 
 #include <e-util/e-util.h>
 
-#include "e-source-ldap.h"
-
 #include <ldap.h>
 #ifndef SUNLDAP
 #include <ldap_schema.h>
@@ -992,7 +991,6 @@ e_book_config_ldap_init (ESourceConfigBackend *backend)
 G_MODULE_EXPORT void
 e_module_load (GTypeModule *type_module)
 {
-       e_source_ldap_type_register (type_module);
        e_book_config_ldap_register_type (type_module);
 }
 
diff --git a/modules/cal-config-contacts/Makefile.am b/modules/cal-config-contacts/Makefile.am
index 2c3cc4f..4f0ea48 100644
--- a/modules/cal-config-contacts/Makefile.am
+++ b/modules/cal-config-contacts/Makefile.am
@@ -12,9 +12,7 @@ module_cal_config_contacts_la_CPPFLAGS = \
 module_cal_config_contacts_la_SOURCES = \
        evolution-cal-config-contacts.c                         \
        e-contacts-selector.c                                   \
-       e-contacts-selector.h                                   \
-       e-source-contacts.c                                     \
-       e-source-contacts.h
+       e-contacts-selector.h
 
 module_cal_config_contacts_la_LIBADD = \
        $(top_builddir)/e-util/libevolution-util.la             \
diff --git a/modules/cal-config-contacts/e-contacts-selector.c 
b/modules/cal-config-contacts/e-contacts-selector.c
index 95468b5..5972d45 100644
--- a/modules/cal-config-contacts/e-contacts-selector.c
+++ b/modules/cal-config-contacts/e-contacts-selector.c
@@ -15,9 +15,13 @@
  *
  */
 
-#include "e-contacts-selector.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <libedataserver/libedataserver.h>
 
-#include "e-source-contacts.h"
+#include "e-contacts-selector.h"
 
 G_DEFINE_DYNAMIC_TYPE (
        EContactsSelector,
diff --git a/modules/cal-config-contacts/evolution-cal-config-contacts.c 
b/modules/cal-config-contacts/evolution-cal-config-contacts.c
index 032b6fc..290d421 100644
--- a/modules/cal-config-contacts/evolution-cal-config-contacts.c
+++ b/modules/cal-config-contacts/evolution-cal-config-contacts.c
@@ -19,11 +19,11 @@
 #include <glib/gi18n-lib.h>
 
 #include <libebackend/libebackend.h>
+#include <libedataserver/libedataserver.h>
 
 #include <e-util/e-util.h>
 
 #include "e-contacts-selector.h"
-#include "e-source-contacts.h"
 
 /* This file contains two extension classes: an ESourceConfigBackend
  * for "contacts" calendars and an EExtension for EBookSourceConfig. */
@@ -243,7 +243,6 @@ void e_module_unload (GTypeModule *type_module);
 G_MODULE_EXPORT void
 e_module_load (GTypeModule *type_module)
 {
-       e_source_contacts_type_register (type_module);
        e_contacts_selector_type_register (type_module);
 
        e_cal_config_contacts_register_type (type_module);
diff --git a/modules/cal-config-local/Makefile.am b/modules/cal-config-local/Makefile.am
index c503a02..a9a7615 100644
--- a/modules/cal-config-local/Makefile.am
+++ b/modules/cal-config-local/Makefile.am
@@ -10,9 +10,7 @@ module_cal_config_local_la_CPPFLAGS = \
        $(NULL)
 
 module_cal_config_local_la_SOURCES = \
-       evolution-cal-config-local.c                            \
-       e-source-local.c                                        \
-       e-source-local.h
+       evolution-cal-config-local.c
 
 module_cal_config_local_la_LIBADD = \
        $(top_builddir)/e-util/libevolution-util.la             \
diff --git a/modules/cal-config-local/evolution-cal-config-local.c 
b/modules/cal-config-local/evolution-cal-config-local.c
index ecfcb41..eb9edf7 100644
--- a/modules/cal-config-local/evolution-cal-config-local.c
+++ b/modules/cal-config-local/evolution-cal-config-local.c
@@ -19,11 +19,10 @@
 #include <glib/gi18n-lib.h>
 
 #include <libebackend/libebackend.h>
+#include <libedataserver/libedataserver.h>
 
 #include <e-util/e-util.h>
 
-#include "e-source-local.h"
-
 typedef ESourceConfigBackend ECalConfigLocal;
 typedef ESourceConfigBackendClass ECalConfigLocalClass;
 
@@ -294,7 +293,6 @@ e_cal_config_local_init (ESourceConfigBackend *backend)
 G_MODULE_EXPORT void
 e_module_load (GTypeModule *type_module)
 {
-       e_source_local_type_register (type_module);
        e_cal_config_local_register_type (type_module);
 }
 
diff --git a/modules/cal-config-weather/Makefile.am b/modules/cal-config-weather/Makefile.am
index 54c4850..7f93b38 100644
--- a/modules/cal-config-weather/Makefile.am
+++ b/modules/cal-config-weather/Makefile.am
@@ -11,9 +11,7 @@ module_cal_config_weather_la_CPPFLAGS = \
        $(NULL)
 
 module_cal_config_weather_la_SOURCES = \
-       evolution-cal-config-weather.c                          \
-       e-source-weather.c                                      \
-       e-source-weather.h
+       evolution-cal-config-weather.c
 
 module_cal_config_weather_la_LIBADD = \
        $(top_builddir)/e-util/libevolution-util.la             \
diff --git a/modules/cal-config-weather/evolution-cal-config-weather.c 
b/modules/cal-config-weather/evolution-cal-config-weather.c
index 12a4925..89b6d2a 100644
--- a/modules/cal-config-weather/evolution-cal-config-weather.c
+++ b/modules/cal-config-weather/evolution-cal-config-weather.c
@@ -19,6 +19,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <libebackend/libebackend.h>
+#include <libedataserver/libedataserver.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 #include <libgweather/location-entry.h>
@@ -26,8 +27,6 @@
 
 #include <e-util/e-util.h>
 
-#include "e-source-weather.h"
-
 #if HAVE_NL_LANGINFO
 #include <langinfo.h>
 #endif
@@ -345,7 +344,6 @@ e_cal_config_weather_init (ESourceConfigBackend *backend)
 G_MODULE_EXPORT void
 e_module_load (GTypeModule *type_module)
 {
-       e_source_weather_type_register (type_module);
        e_cal_config_weather_register_type (type_module);
 }