From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 22 Jan 2013 00:02:34 +0000 (-0500)
Subject: Deprecate e_source_registry_server_load_all().
X-Git-Tag: upstream/3.7.5~164
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc73e1585cf017c079a64fd2f663a6e62506f047;p=platform%2Fupstream%2Fevolution-data-server.git

Deprecate e_source_registry_server_load_all().

It was a mistake to encode this much file location policy directly into
libebackend's API.  Instead, evolution-source-registry.c will implement
its own function that uses e_source_registry_server_load_resource().
---

diff --git a/docs/reference/libebackend/libebackend-sections.txt b/docs/reference/libebackend/libebackend-sections.txt
index 8e55d54..200698e 100644
--- a/docs/reference/libebackend/libebackend-sections.txt
+++ b/docs/reference/libebackend/libebackend-sections.txt
@@ -396,7 +396,6 @@ ESourceRegistryServer
 e_source_registry_server_new
 e_source_registry_server_add_source
 e_source_registry_server_remove_source
-e_source_registry_server_load_all
 ESourcePermissionFlags
 e_source_registry_server_load_directory
 e_source_registry_server_load_resource
@@ -410,6 +409,8 @@ e_source_registry_server_ref_backend_factory
 e_source_registry_server_authenticate_sync
 e_source_registry_server_authenticate
 e_source_registry_server_authenticate_finish
+<SUBSECTION Deprecated>
+e_source_registry_server_load_all
 <SUBSECTION Standard>
 E_SOURCE_REGISTRY_SERVER
 E_IS_SOURCE_REGISTRY_SERVER
diff --git a/libebackend/e-source-registry-server.c b/libebackend/e-source-registry-server.c
index 4aecb22..f3bd2c5 100644
--- a/libebackend/e-source-registry-server.c
+++ b/libebackend/e-source-registry-server.c
@@ -1643,6 +1643,10 @@ e_source_registry_server_remove_source (ESourceRegistryServer *server,
  *          but this does not imply the key files were successfully loaded
  *
  * Since: 3.6
+ *
+ * Deprecated: 3.8: Instead, implement an equivalent function yourself.
+ *                  It was a mistake to encode this much file location
+ *                  policy directly into the library API.
  **/
 gboolean
 e_source_registry_server_load_all (ESourceRegistryServer *server,
diff --git a/libebackend/e-source-registry-server.h b/libebackend/e-source-registry-server.h
index 27d2fd2..725e0d0 100644
--- a/libebackend/e-source-registry-server.h
+++ b/libebackend/e-source-registry-server.h
@@ -108,9 +108,6 @@ void		e_source_registry_server_add_source
 void		e_source_registry_server_remove_source
 						(ESourceRegistryServer *server,
 						 ESource *source);
-gboolean	e_source_registry_server_load_all
-						(ESourceRegistryServer *server,
-						 GError **error);
 gboolean	e_source_registry_server_load_directory
 						(ESourceRegistryServer *server,
 						 const gchar *path,
@@ -165,6 +162,12 @@ gboolean	e_source_registry_server_authenticate_finish
 						 GAsyncResult *result,
 						 GError **error);
 
+#ifndef EDS_DISABLE_DEPRECATED
+gboolean	e_source_registry_server_load_all
+						(ESourceRegistryServer *server,
+						 GError **error);
+#endif /* EDS_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif /* E_SOURCE_REGISTRY_SERVER_H */