[evolution-data-server] Split ENamedParameters into its own file
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Split ENamedParameters into its own file
- Date: Fri, 24 Jun 2022 10:12:43 +0000 (UTC)
commit 508aaff9c932e1d12c59747473edc3187970e318
Author: Milan Crha <mcrha redhat com>
Date: Fri Jun 24 12:11:14 2022 +0200
Split ENamedParameters into its own file
It's large enough that it should be better in its own file, than to
share the file with the common utility functions.
.../evolution-data-server-docs.sgml.in | 1 +
src/libedataserver/CMakeLists.txt | 2 +
src/libedataserver/e-data-server-util.c | 522 -------------------
src/libedataserver/e-data-server-util.h | 44 --
src/libedataserver/e-gdata-oauth2-authorizer.h | 2 +-
src/libedataserver/e-named-parameters.c | 553 +++++++++++++++++++++
src/libedataserver/e-named-parameters.h | 74 +++
src/libedataserver/e-oauth2-service-google.c | 1 +
src/libedataserver/e-oauth2-service-outlook.c | 1 +
src/libedataserver/e-oauth2-service-yahoo.c | 1 +
src/libedataserver/e-oauth2-service.c | 1 +
src/libedataserver/e-soup-session.c | 1 +
src/libedataserver/e-soup-session.h | 2 +-
src/libedataserver/e-source-autoconfig.c | 4 +
.../e-source-credentials-provider-impl.h | 1 +
src/libedataserver/e-source-credentials-provider.h | 2 +-
src/libedataserver/e-source-ldap.c | 1 +
src/libedataserver/e-source-local.c | 2 +
src/libedataserver/e-source-weather.c | 1 +
src/libedataserver/e-source-webdav.h | 4 -
src/libedataserver/e-source.h | 3 +-
src/libedataserver/e-webdav-discover.h | 1 +
src/libedataserver/libedataserver.h | 1 +
23 files changed, 651 insertions(+), 574 deletions(-)
---
diff --git a/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in
b/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in
index f2ec1e403..6b1e6b3eb 100644
--- a/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in
+++ b/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in
@@ -245,6 +245,7 @@
<xi:include href="xml/e-free-form-exp.xml"/>
<xi:include href="xml/e-gdata-oauth2-authorizer.xml"/>
<xi:include href="xml/e-memory.xml"/>
+ <xi:include href="xml/e-named-parameters.xml"/>
<xi:include href="xml/e-network-monitor.xml"/>
<xi:include href="xml/e-operation-pool.xml"/>
<xi:include href="xml/e-secret-store.xml"/>
diff --git a/src/libedataserver/CMakeLists.txt b/src/libedataserver/CMakeLists.txt
index 66e932795..89f251f09 100644
--- a/src/libedataserver/CMakeLists.txt
+++ b/src/libedataserver/CMakeLists.txt
@@ -63,6 +63,7 @@ set(SOURCES
e-list-iterator.c
e-memory.c
e-module.c
+ e-named-parameters.c
e-network-monitor.c
e-oauth2-service.c
e-oauth2-service-base.c
@@ -153,6 +154,7 @@ set(HEADERS
e-list-iterator.h
e-memory.h
e-module.h
+ e-named-parameters.h
e-network-monitor.h
e-oauth2-service.h
e-oauth2-service-base.h
diff --git a/src/libedataserver/e-data-server-util.c b/src/libedataserver/e-data-server-util.c
index 0851118c7..d2261d1d2 100644
--- a/src/libedataserver/e-data-server-util.c
+++ b/src/libedataserver/e-data-server-util.c
@@ -2196,528 +2196,6 @@ e_data_server_util_get_dbus_call_timeout (void)
return default_dbus_timeout;
}
-/**
- * e_named_parameters_new:
- *
- * Creates a new instance of an #ENamedParameters. This should be freed
- * with e_named_parameters_free(), when no longer needed. Names are
- * compared case insensitively.
- *
- * The structure is not thread safe, if the caller requires thread safety,
- * then it should provide it on its own.
- *
- * Returns: newly allocated #ENamedParameters
- *
- * Since: 3.8
- **/
-ENamedParameters *
-e_named_parameters_new (void)
-{
- return (ENamedParameters *) g_ptr_array_new_with_free_func ((GDestroyNotify) e_util_safe_free_string);
-}
-
-/**
- * e_named_parameters_new_strv:
- * @strv: NULL-terminated string array to be used as a content of a newly
- * created #ENamedParameters
- *
- * Creates a new instance of an #ENamedParameters, with initial content
- * being taken from @strv. This should be freed with e_named_parameters_free(),
- * when no longer needed. Names are compared case insensitively.
- *
- * The structure is not thread safe, if the caller requires thread safety,
- * then it should provide it on its own.
- *
- * Returns: newly allocated #ENamedParameters
- *
- * Since: 3.8
- **/
-ENamedParameters *
-e_named_parameters_new_strv (const gchar * const *strv)
-{
- ENamedParameters *parameters;
- gint ii;
-
- g_return_val_if_fail (strv != NULL, NULL);
-
- parameters = e_named_parameters_new ();
- for (ii = 0; strv[ii]; ii++) {
- g_ptr_array_add ((GPtrArray *) parameters, g_strdup (strv[ii]));
- }
-
- return parameters;
-}
-
-/**
- * e_named_parameters_new_string:
- * @str: a string to be used as a content of a newly created #ENamedParameters
- *
- * Creates a new instance of an #ENamedParameters, with initial content being
- * taken from @str. This should be freed with e_named_parameters_free(),
- * when no longer needed. Names are compared case insensitively.
- *
- * The @str should be created with e_named_parameters_to_string(), to be
- * properly encoded.
- *
- * The structure is not thread safe, if the caller requires thread safety,
- * then it should provide it on its own.
- *
- * Returns: (transfer full): newly allocated #ENamedParameters
- *
- * Since: 3.18
- **/
-ENamedParameters *
-e_named_parameters_new_string (const gchar *str)
-{
- ENamedParameters *parameters;
- gchar **split;
- gint ii;
-
- g_return_val_if_fail (str != NULL, NULL);
-
- split = g_strsplit (str, "\n", -1);
-
- parameters = e_named_parameters_new ();
- for (ii = 0; split && split[ii]; ii++) {
- g_ptr_array_add ((GPtrArray *) parameters, g_strcompress (split[ii]));
- }
-
- g_strfreev (split);
-
- return parameters;
-}
-
-/**
- * e_named_parameters_new_clone:
- * @parameters: an #ENamedParameters to be used as a content of a newly
- * created #ENamedParameters
- *
- * Creates a new instance of an #ENamedParameters, with initial content
- * being taken from @parameters. This should be freed with e_named_parameters_free(),
- * when no longer needed. Names are compared case insensitively.
- *
- * The structure is not thread safe, if the caller requires thread safety,
- * then it should provide it on its own.
- *
- * Returns: newly allocated #ENamedParameters
- *
- * Since: 3.16
- **/
-ENamedParameters *
-e_named_parameters_new_clone (const ENamedParameters *parameters)
-{
- ENamedParameters *clone;
-
- clone = e_named_parameters_new ();
- if (parameters)
- e_named_parameters_assign (clone, parameters);
-
- return clone;
-}
-
-/**
- * e_named_parameters_free:
- * @parameters: (nullable): an #ENamedParameters
- *
- * Frees an instance of #ENamedParameters, previously allocated
- * with e_named_parameters_new(). Function does nothing, if
- * @parameters is %NULL.
- *
- * Since: 3.8
- **/
-void
-e_named_parameters_free (ENamedParameters *parameters)
-{
- if (!parameters)
- return;
-
- g_ptr_array_unref ((GPtrArray *) parameters);
-}
-
-/**
- * e_named_parameters_clear:
- * @parameters: an #ENamedParameters
- *
- * Removes all stored parameters from @parameters.
- *
- * Since: 3.8
- **/
-void
-e_named_parameters_clear (ENamedParameters *parameters)
-{
- GPtrArray *array;
- g_return_if_fail (parameters != NULL);
-
- array = (GPtrArray *) parameters;
-
- if (array->len)
- g_ptr_array_remove_range (array, 0, array->len);
-}
-
-/**
- * e_named_parameters_assign:
- * @parameters: an #ENamedParameters to assign values to
- * @from: (nullable): an #ENamedParameters to get values from, or %NULL
- *
- * Makes content of the @parameters the same as @from.
- * Functions clears content of @parameters if @from is %NULL.
- *
- * Since: 3.8
- **/
-void
-e_named_parameters_assign (ENamedParameters *parameters,
- const ENamedParameters *from)
-{
- g_return_if_fail (parameters != NULL);
-
- e_named_parameters_clear (parameters);
-
- if (from) {
- gint ii;
- GPtrArray *from_array = (GPtrArray *) from;
-
- for (ii = 0; ii < from_array->len; ii++) {
- g_ptr_array_add (
- (GPtrArray *) parameters,
- g_strdup (from_array->pdata[ii]));
- }
- }
-}
-
-static gint
-get_parameter_index (const ENamedParameters *parameters,
- const gchar *name)
-{
- GPtrArray *array;
- gint ii, name_len;
-
- g_return_val_if_fail (parameters != NULL, -1);
- g_return_val_if_fail (name != NULL, -1);
-
- name_len = strlen (name);
-
- array = (GPtrArray *) parameters;
-
- for (ii = 0; ii < array->len; ii++) {
- const gchar *name_and_value = g_ptr_array_index (array, ii);
-
- if (name_and_value == NULL || strlen (name_and_value) <= name_len)
- continue;
-
- if (name_and_value[name_len] != ':')
- continue;
-
- if (g_ascii_strncasecmp (name_and_value, name, name_len) == 0)
- return ii;
- }
-
- return -1;
-}
-
-/**
- * e_named_parameters_set:
- * @parameters: an #ENamedParameters
- * @name: name of a parameter to set
- * @value: (nullable): value to set, or %NULL to unset
- *
- * Sets parameter named @name to value @value. If @value is NULL,
- * then the parameter is removed. @value can be an empty string.
- *
- * Note: There is a restriction on parameter names, it cannot be empty or
- * contain a colon character (':'), otherwise it can be pretty much anything.
- *
- * Since: 3.8
- **/
-void
-e_named_parameters_set (ENamedParameters *parameters,
- const gchar *name,
- const gchar *value)
-{
- GPtrArray *array;
- gint index;
- gchar *name_and_value;
-
- g_return_if_fail (parameters != NULL);
- g_return_if_fail (name != NULL);
- g_return_if_fail (strchr (name, ':') == NULL);
- g_return_if_fail (*name != '\0');
-
- array = (GPtrArray *) parameters;
-
- index = get_parameter_index (parameters, name);
- if (!value) {
- if (index != -1)
- g_ptr_array_remove_index (array, index);
- return;
- }
-
- name_and_value = g_strconcat (name, ":", value, NULL);
- if (index != -1) {
- g_free (array->pdata[index]);
- array->pdata[index] = name_and_value;
- } else {
- g_ptr_array_add (array, name_and_value);
- }
-}
-
-/**
- * e_named_parameters_get:
- * @parameters: an #ENamedParameters
- * @name: name of a parameter to get
- *
- * Returns current value of a parameter with name @name. If not such
- * exists, then returns %NULL.
- *
- * Returns: (nullable): value of a parameter named @name, or %NULL.
- *
- * Since: 3.8
- **/
-const gchar *
-e_named_parameters_get (const ENamedParameters *parameters,
- const gchar *name)
-{
- gint index;
- const gchar *name_and_value;
-
- g_return_val_if_fail (parameters != NULL, NULL);
- g_return_val_if_fail (name != NULL, NULL);
-
- index = get_parameter_index (parameters, name);
- if (index == -1)
- return NULL;
-
- name_and_value = g_ptr_array_index ((GPtrArray *) parameters, index);
-
- return name_and_value + strlen (name) + 1;
-}
-
-/**
- * e_named_parameters_test:
- * @parameters: an #ENamedParameters
- * @name: name of a parameter to test
- * @value: value to test
- * @case_sensitively: whether to compare case sensitively
- *
- * Compares current value of parameter named @name with given @value
- * and returns whether they are equal, either case sensitively or
- * insensitively, based on @case_sensitively argument. Function
- * returns %FALSE, if no such parameter exists.
- *
- * Returns: Whether parameter of given name has stored value of given value.
- *
- * Since: 3.8
- **/
-gboolean
-e_named_parameters_test (const ENamedParameters *parameters,
- const gchar *name,
- const gchar *value,
- gboolean case_sensitively)
-{
- const gchar *stored_value;
-
- g_return_val_if_fail (parameters != NULL, FALSE);
- g_return_val_if_fail (name != NULL, FALSE);
- g_return_val_if_fail (value != NULL, FALSE);
-
- stored_value = e_named_parameters_get (parameters, name);
- if (!stored_value)
- return FALSE;
-
- if (case_sensitively)
- return strcmp (stored_value, value) == 0;
-
- return g_ascii_strcasecmp (stored_value, value) == 0;
-}
-
-/**
- * e_named_parameters_to_strv:
- * @parameters: an #ENamedParameters
- *
- * Returns: (transfer full): Contents of @parameters as a null-terminated strv
- *
- * Since: 3.8
- */
-gchar **
-e_named_parameters_to_strv (const ENamedParameters *parameters)
-{
- GPtrArray *array = (GPtrArray *) parameters;
- GPtrArray *ret = g_ptr_array_new ();
-
- if (array) {
- guint i;
- for (i = 0; i < array->len; i++) {
- g_ptr_array_add (ret, g_strdup (array->pdata[i]));
- }
- }
-
- g_ptr_array_add (ret, NULL);
-
- return (gchar **) g_ptr_array_free (ret, FALSE);
-}
-
-/**
- * e_named_parameters_to_string:
- * @parameters: an #ENamedParameters
- *
- * Returns: (transfer full) (nullable): Contents of @parameters as a string
- *
- * Since: 3.18
- */
-gchar *
-e_named_parameters_to_string (const ENamedParameters *parameters)
-{
- gchar **strv, *str;
- gint ii;
-
- strv = e_named_parameters_to_strv (parameters);
- if (!strv)
- return NULL;
-
- for (ii = 0; strv[ii]; ii++) {
- gchar *name_and_value = strv[ii];
-
- strv[ii] = g_strescape (name_and_value, "");
- g_free (name_and_value);
- }
-
- str = g_strjoinv ("\n", strv);
-
- g_strfreev (strv);
-
- return str;
-}
-
-/**
- * e_named_parameters_exists:
- * @parameters: an #ENamedParameters
- * @name: name of the parameter whose existence to check
- *
- * Returns: Whether @parameters holds a parameter named @name
- *
- * Since: 3.18
- **/
-gboolean
-e_named_parameters_exists (const ENamedParameters *parameters,
- const gchar *name)
-{
- g_return_val_if_fail (parameters != NULL, FALSE);
- g_return_val_if_fail (name != NULL, FALSE);
-
- return get_parameter_index (parameters, name) != -1;
-}
-
-/**
- * e_named_parameters_count:
- * @parameters: an #ENamedParameters
- *
- * Returns: The number of stored named parameters in @parameters
- *
- * Since: 3.18
- **/
-guint
-e_named_parameters_count (const ENamedParameters *parameters)
-{
- g_return_val_if_fail (parameters != NULL, 0);
-
- return ((GPtrArray *) parameters)->len;
-}
-
-/**
- * e_named_parameters_get_name:
- * @parameters: an #ENamedParameters
- * @index: an index of the parameter whose name to retrieve
- *
- * Returns: (transfer full) (nullable): The name of the parameters at index @index,
- * or %NULL, of the @index is out of bounds or other error. The returned
- * string should be freed with g_free() when done with it.
- *
- * Since: 3.18
- **/
-gchar *
-e_named_parameters_get_name (const ENamedParameters *parameters,
- gint index)
-{
- const gchar *name_and_value, *colon;
-
- g_return_val_if_fail (parameters != NULL, NULL);
- g_return_val_if_fail (index >= 0 && index < e_named_parameters_count (parameters), NULL);
-
- name_and_value = g_ptr_array_index ((GPtrArray *) parameters, index);
- colon = name_and_value ? strchr (name_and_value, ':') : NULL;
-
- if (!colon || colon == name_and_value)
- return NULL;
-
- return g_strndup (name_and_value, colon - name_and_value);
-}
-
-/**
- * e_named_parameters_equal:
- * @parameters1: the first #ENamedParameters
- * @parameters2: the second #ENamedParameters
- *
- * Compares the two parameters objects and returns whether they equal.
- * Note a %NULL and empty parameters are also considered equal.
- *
- * Returns: whether the two parameters are equal
- *
- * Since: 3.46
- **/
-gboolean
-e_named_parameters_equal (const ENamedParameters *parameters1,
- const ENamedParameters *parameters2)
-{
- GPtrArray *arr1, *arr2;
- guint ii, jj;
-
- if (parameters1 == parameters2 ||
- (!parameters1 && e_named_parameters_count (parameters2) == 0) ||
- (!parameters2 && e_named_parameters_count (parameters1) == 0))
- return TRUE;
-
- if (!parameters1 || !parameters2 ||
- e_named_parameters_count (parameters1) != e_named_parameters_count (parameters1))
- return FALSE;
-
- arr1 = (GPtrArray *) parameters1;
- arr2 = (GPtrArray *) parameters2;
-
- for (ii = 0; ii < arr1->len; ii++) {
- const gchar *name_and_value1 = g_ptr_array_index (arr1, ii);
-
- for (jj = 0; jj < arr2->len; jj++) {
- const gchar *name_and_value2 = g_ptr_array_index (arr2, jj);
-
- if (g_strcmp0 (name_and_value1, name_and_value2) == 0)
- break;
- }
-
- /* went through all the items, none matched */
- if (jj == arr2->len)
- return FALSE;
- }
-
- return TRUE;
-}
-
-static ENamedParameters *
-e_named_parameters_ref (ENamedParameters *params)
-{
- return (ENamedParameters *) g_ptr_array_ref ((GPtrArray *) params);
-}
-
-static void
-e_named_parameters_unref (ENamedParameters *params)
-{
- g_ptr_array_unref ((GPtrArray *) params);
-}
-
-G_DEFINE_BOXED_TYPE (
- ENamedParameters,
- e_named_parameters,
- e_named_parameters_ref,
- e_named_parameters_unref);
-
/**
* e_named_timeout_add:
* @interval: the time between calls to the function, in milliseconds
diff --git a/src/libedataserver/e-data-server-util.h b/src/libedataserver/e-data-server-util.h
index 2842438d6..b9fc1ddb0 100644
--- a/src/libedataserver/e-data-server-util.h
+++ b/src/libedataserver/e-data-server-util.h
@@ -164,50 +164,6 @@ gchar * e_util_replace_prefix (const gchar *configure_time_prefix,
void e_util_win32_initialize (void);
#endif
-/* utility functions for easier processing of named parameters */
-
-/**
- * ENamedParameters:
- *
- * Since: 3.8
- **/
-struct _ENamedParameters;
-typedef struct _ENamedParameters ENamedParameters;
-
-#define E_TYPE_NAMED_PARAMETERS (e_named_parameters_get_type ())
-
-GType e_named_parameters_get_type (void) G_GNUC_CONST;
-ENamedParameters *
- e_named_parameters_new (void);
-ENamedParameters *
- e_named_parameters_new_strv (const gchar * const *strv);
-ENamedParameters *
- e_named_parameters_new_string (const gchar *str);
-ENamedParameters *
- e_named_parameters_new_clone (const ENamedParameters *parameters);
-void e_named_parameters_free (ENamedParameters *parameters);
-void e_named_parameters_clear (ENamedParameters *parameters);
-void e_named_parameters_assign (ENamedParameters *parameters,
- const ENamedParameters *from);
-void e_named_parameters_set (ENamedParameters *parameters,
- const gchar *name,
- const gchar *value);
-const gchar * e_named_parameters_get (const ENamedParameters *parameters,
- const gchar *name);
-gchar ** e_named_parameters_to_strv (const ENamedParameters *parameters);
-gchar * e_named_parameters_to_string (const ENamedParameters *parameters);
-gboolean e_named_parameters_test (const ENamedParameters *parameters,
- const gchar *name,
- const gchar *value,
- gboolean case_sensitively);
-gboolean e_named_parameters_exists (const ENamedParameters *parameters,
- const gchar *name);
-guint e_named_parameters_count (const ENamedParameters *parameters);
-gchar * e_named_parameters_get_name (const ENamedParameters *parameters,
- gint index);
-gboolean e_named_parameters_equal (const ENamedParameters *parameters1,
- const ENamedParameters *parameters2);
-
#define e_named_timeout_add(interval, function, data) \
(e_timeout_add_with_name ( \
G_PRIORITY_DEFAULT, (interval), \
diff --git a/src/libedataserver/e-gdata-oauth2-authorizer.h b/src/libedataserver/e-gdata-oauth2-authorizer.h
index eef8078a9..408be33ff 100644
--- a/src/libedataserver/e-gdata-oauth2-authorizer.h
+++ b/src/libedataserver/e-gdata-oauth2-authorizer.h
@@ -22,8 +22,8 @@
#ifndef E_GDATA_OAUTH2_AUTHORIZER_H
#define E_GDATA_OAUTH2_AUTHORIZER_H
+#include <libedataserver/e-named-parameters.h>
#include <libedataserver/e-source.h>
-#include <libedataserver/e-data-server-util.h>
/* Standard GObject macros */
#define E_TYPE_GDATA_OAUTH2_AUTHORIZER \
diff --git a/src/libedataserver/e-named-parameters.c b/src/libedataserver/e-named-parameters.c
new file mode 100644
index 000000000..45ffbf6ce
--- /dev/null
+++ b/src/libedataserver/e-named-parameters.c
@@ -0,0 +1,553 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 2012 Intel Corporation
+ *
+ * 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.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "evolution-data-server-config.h"
+
+#include <string.h>
+#include <glib-object.h>
+
+#include "e-data-server-util.h"
+
+#include "e-named-parameters.h"
+
+/**
+ * SECTION: e-named-parameters
+ * @include: libedataserver/libedataserver.h
+ * @short_description: A structure to hold named parameters
+ *
+ * The #ENamedParameters is a structure, which holds a name~>value
+ * pairs. It's usually used to pass credentials between callers.
+ **/
+
+static ENamedParameters *
+e_named_parameters_ref (ENamedParameters *params)
+{
+ return (ENamedParameters *) g_ptr_array_ref ((GPtrArray *) params);
+}
+
+static void
+e_named_parameters_unref (ENamedParameters *params)
+{
+ g_ptr_array_unref ((GPtrArray *) params);
+}
+
+G_DEFINE_BOXED_TYPE (ENamedParameters, e_named_parameters, e_named_parameters_ref, e_named_parameters_unref)
+
+/**
+ * e_named_parameters_new:
+ *
+ * Creates a new instance of an #ENamedParameters. This should be freed
+ * with e_named_parameters_free(), when no longer needed. Names are
+ * compared case insensitively.
+ *
+ * The structure is not thread safe, if the caller requires thread safety,
+ * then it should provide it on its own.
+ *
+ * Returns: newly allocated #ENamedParameters
+ *
+ * Since: 3.8
+ **/
+ENamedParameters *
+e_named_parameters_new (void)
+{
+ return (ENamedParameters *) g_ptr_array_new_with_free_func ((GDestroyNotify) e_util_safe_free_string);
+}
+
+/**
+ * e_named_parameters_new_strv:
+ * @strv: NULL-terminated string array to be used as a content of a newly
+ * created #ENamedParameters
+ *
+ * Creates a new instance of an #ENamedParameters, with initial content
+ * being taken from @strv. This should be freed with e_named_parameters_free(),
+ * when no longer needed. Names are compared case insensitively.
+ *
+ * The structure is not thread safe, if the caller requires thread safety,
+ * then it should provide it on its own.
+ *
+ * Returns: newly allocated #ENamedParameters
+ *
+ * Since: 3.8
+ **/
+ENamedParameters *
+e_named_parameters_new_strv (const gchar * const *strv)
+{
+ ENamedParameters *parameters;
+ gint ii;
+
+ g_return_val_if_fail (strv != NULL, NULL);
+
+ parameters = e_named_parameters_new ();
+ for (ii = 0; strv[ii]; ii++) {
+ g_ptr_array_add ((GPtrArray *) parameters, g_strdup (strv[ii]));
+ }
+
+ return parameters;
+}
+
+/**
+ * e_named_parameters_new_string:
+ * @str: a string to be used as a content of a newly created #ENamedParameters
+ *
+ * Creates a new instance of an #ENamedParameters, with initial content being
+ * taken from @str. This should be freed with e_named_parameters_free(),
+ * when no longer needed. Names are compared case insensitively.
+ *
+ * The @str should be created with e_named_parameters_to_string(), to be
+ * properly encoded.
+ *
+ * The structure is not thread safe, if the caller requires thread safety,
+ * then it should provide it on its own.
+ *
+ * Returns: (transfer full): newly allocated #ENamedParameters
+ *
+ * Since: 3.18
+ **/
+ENamedParameters *
+e_named_parameters_new_string (const gchar *str)
+{
+ ENamedParameters *parameters;
+ gchar **split;
+ gint ii;
+
+ g_return_val_if_fail (str != NULL, NULL);
+
+ split = g_strsplit (str, "\n", -1);
+
+ parameters = e_named_parameters_new ();
+ for (ii = 0; split && split[ii]; ii++) {
+ g_ptr_array_add ((GPtrArray *) parameters, g_strcompress (split[ii]));
+ }
+
+ g_strfreev (split);
+
+ return parameters;
+}
+
+/**
+ * e_named_parameters_new_clone:
+ * @parameters: an #ENamedParameters to be used as a content of a newly
+ * created #ENamedParameters
+ *
+ * Creates a new instance of an #ENamedParameters, with initial content
+ * being taken from @parameters. This should be freed with e_named_parameters_free(),
+ * when no longer needed. Names are compared case insensitively.
+ *
+ * The structure is not thread safe, if the caller requires thread safety,
+ * then it should provide it on its own.
+ *
+ * Returns: newly allocated #ENamedParameters
+ *
+ * Since: 3.16
+ **/
+ENamedParameters *
+e_named_parameters_new_clone (const ENamedParameters *parameters)
+{
+ ENamedParameters *clone;
+
+ clone = e_named_parameters_new ();
+ if (parameters)
+ e_named_parameters_assign (clone, parameters);
+
+ return clone;
+}
+
+/**
+ * e_named_parameters_free:
+ * @parameters: (nullable): an #ENamedParameters
+ *
+ * Frees an instance of #ENamedParameters, previously allocated
+ * with e_named_parameters_new(). Function does nothing, if
+ * @parameters is %NULL.
+ *
+ * Since: 3.8
+ **/
+void
+e_named_parameters_free (ENamedParameters *parameters)
+{
+ if (!parameters)
+ return;
+
+ g_ptr_array_unref ((GPtrArray *) parameters);
+}
+
+/**
+ * e_named_parameters_clear:
+ * @parameters: an #ENamedParameters
+ *
+ * Removes all stored parameters from @parameters.
+ *
+ * Since: 3.8
+ **/
+void
+e_named_parameters_clear (ENamedParameters *parameters)
+{
+ GPtrArray *array;
+ g_return_if_fail (parameters != NULL);
+
+ array = (GPtrArray *) parameters;
+
+ if (array->len)
+ g_ptr_array_remove_range (array, 0, array->len);
+}
+
+/**
+ * e_named_parameters_assign:
+ * @parameters: an #ENamedParameters to assign values to
+ * @from: (nullable): an #ENamedParameters to get values from, or %NULL
+ *
+ * Makes content of the @parameters the same as @from.
+ * Functions clears content of @parameters if @from is %NULL.
+ *
+ * Since: 3.8
+ **/
+void
+e_named_parameters_assign (ENamedParameters *parameters,
+ const ENamedParameters *from)
+{
+ g_return_if_fail (parameters != NULL);
+
+ e_named_parameters_clear (parameters);
+
+ if (from) {
+ gint ii;
+ GPtrArray *from_array = (GPtrArray *) from;
+
+ for (ii = 0; ii < from_array->len; ii++) {
+ g_ptr_array_add (
+ (GPtrArray *) parameters,
+ g_strdup (from_array->pdata[ii]));
+ }
+ }
+}
+
+static gint
+get_parameter_index (const ENamedParameters *parameters,
+ const gchar *name)
+{
+ GPtrArray *array;
+ gint ii, name_len;
+
+ g_return_val_if_fail (parameters != NULL, -1);
+ g_return_val_if_fail (name != NULL, -1);
+
+ name_len = strlen (name);
+
+ array = (GPtrArray *) parameters;
+
+ for (ii = 0; ii < array->len; ii++) {
+ const gchar *name_and_value = g_ptr_array_index (array, ii);
+
+ if (name_and_value == NULL || strlen (name_and_value) <= name_len)
+ continue;
+
+ if (name_and_value[name_len] != ':')
+ continue;
+
+ if (g_ascii_strncasecmp (name_and_value, name, name_len) == 0)
+ return ii;
+ }
+
+ return -1;
+}
+
+/**
+ * e_named_parameters_set:
+ * @parameters: an #ENamedParameters
+ * @name: name of a parameter to set
+ * @value: (nullable): value to set, or %NULL to unset
+ *
+ * Sets parameter named @name to value @value. If @value is NULL,
+ * then the parameter is removed. @value can be an empty string.
+ *
+ * Note: There is a restriction on parameter names, it cannot be empty or
+ * contain a colon character (':'), otherwise it can be pretty much anything.
+ *
+ * Since: 3.8
+ **/
+void
+e_named_parameters_set (ENamedParameters *parameters,
+ const gchar *name,
+ const gchar *value)
+{
+ GPtrArray *array;
+ gint index;
+ gchar *name_and_value;
+
+ g_return_if_fail (parameters != NULL);
+ g_return_if_fail (name != NULL);
+ g_return_if_fail (strchr (name, ':') == NULL);
+ g_return_if_fail (*name != '\0');
+
+ array = (GPtrArray *) parameters;
+
+ index = get_parameter_index (parameters, name);
+ if (!value) {
+ if (index != -1)
+ g_ptr_array_remove_index (array, index);
+ return;
+ }
+
+ name_and_value = g_strconcat (name, ":", value, NULL);
+ if (index != -1) {
+ g_free (array->pdata[index]);
+ array->pdata[index] = name_and_value;
+ } else {
+ g_ptr_array_add (array, name_and_value);
+ }
+}
+
+/**
+ * e_named_parameters_get:
+ * @parameters: an #ENamedParameters
+ * @name: name of a parameter to get
+ *
+ * Returns current value of a parameter with name @name. If not such
+ * exists, then returns %NULL.
+ *
+ * Returns: (nullable): value of a parameter named @name, or %NULL.
+ *
+ * Since: 3.8
+ **/
+const gchar *
+e_named_parameters_get (const ENamedParameters *parameters,
+ const gchar *name)
+{
+ gint index;
+ const gchar *name_and_value;
+
+ g_return_val_if_fail (parameters != NULL, NULL);
+ g_return_val_if_fail (name != NULL, NULL);
+
+ index = get_parameter_index (parameters, name);
+ if (index == -1)
+ return NULL;
+
+ name_and_value = g_ptr_array_index ((GPtrArray *) parameters, index);
+
+ return name_and_value + strlen (name) + 1;
+}
+
+/**
+ * e_named_parameters_test:
+ * @parameters: an #ENamedParameters
+ * @name: name of a parameter to test
+ * @value: value to test
+ * @case_sensitively: whether to compare case sensitively
+ *
+ * Compares current value of parameter named @name with given @value
+ * and returns whether they are equal, either case sensitively or
+ * insensitively, based on @case_sensitively argument. Function
+ * returns %FALSE, if no such parameter exists.
+ *
+ * Returns: Whether parameter of given name has stored value of given value.
+ *
+ * Since: 3.8
+ **/
+gboolean
+e_named_parameters_test (const ENamedParameters *parameters,
+ const gchar *name,
+ const gchar *value,
+ gboolean case_sensitively)
+{
+ const gchar *stored_value;
+
+ g_return_val_if_fail (parameters != NULL, FALSE);
+ g_return_val_if_fail (name != NULL, FALSE);
+ g_return_val_if_fail (value != NULL, FALSE);
+
+ stored_value = e_named_parameters_get (parameters, name);
+ if (!stored_value)
+ return FALSE;
+
+ if (case_sensitively)
+ return strcmp (stored_value, value) == 0;
+
+ return g_ascii_strcasecmp (stored_value, value) == 0;
+}
+
+/**
+ * e_named_parameters_to_strv:
+ * @parameters: an #ENamedParameters
+ *
+ * Returns: (transfer full): Contents of @parameters as a null-terminated strv
+ *
+ * Since: 3.8
+ */
+gchar **
+e_named_parameters_to_strv (const ENamedParameters *parameters)
+{
+ GPtrArray *array = (GPtrArray *) parameters;
+ GPtrArray *ret = g_ptr_array_new ();
+
+ if (array) {
+ guint i;
+ for (i = 0; i < array->len; i++) {
+ g_ptr_array_add (ret, g_strdup (array->pdata[i]));
+ }
+ }
+
+ g_ptr_array_add (ret, NULL);
+
+ return (gchar **) g_ptr_array_free (ret, FALSE);
+}
+
+/**
+ * e_named_parameters_to_string:
+ * @parameters: an #ENamedParameters
+ *
+ * Returns: (transfer full) (nullable): Contents of @parameters as a string
+ *
+ * Since: 3.18
+ */
+gchar *
+e_named_parameters_to_string (const ENamedParameters *parameters)
+{
+ gchar **strv, *str;
+ gint ii;
+
+ strv = e_named_parameters_to_strv (parameters);
+ if (!strv)
+ return NULL;
+
+ for (ii = 0; strv[ii]; ii++) {
+ gchar *name_and_value = strv[ii];
+
+ strv[ii] = g_strescape (name_and_value, "");
+ g_free (name_and_value);
+ }
+
+ str = g_strjoinv ("\n", strv);
+
+ g_strfreev (strv);
+
+ return str;
+}
+
+/**
+ * e_named_parameters_exists:
+ * @parameters: an #ENamedParameters
+ * @name: name of the parameter whose existence to check
+ *
+ * Returns: Whether @parameters holds a parameter named @name
+ *
+ * Since: 3.18
+ **/
+gboolean
+e_named_parameters_exists (const ENamedParameters *parameters,
+ const gchar *name)
+{
+ g_return_val_if_fail (parameters != NULL, FALSE);
+ g_return_val_if_fail (name != NULL, FALSE);
+
+ return get_parameter_index (parameters, name) != -1;
+}
+
+/**
+ * e_named_parameters_count:
+ * @parameters: an #ENamedParameters
+ *
+ * Returns: The number of stored named parameters in @parameters
+ *
+ * Since: 3.18
+ **/
+guint
+e_named_parameters_count (const ENamedParameters *parameters)
+{
+ g_return_val_if_fail (parameters != NULL, 0);
+
+ return ((GPtrArray *) parameters)->len;
+}
+
+/**
+ * e_named_parameters_get_name:
+ * @parameters: an #ENamedParameters
+ * @index: an index of the parameter whose name to retrieve
+ *
+ * Returns: (transfer full) (nullable): The name of the parameters at index @index,
+ * or %NULL, of the @index is out of bounds or other error. The returned
+ * string should be freed with g_free() when done with it.
+ *
+ * Since: 3.18
+ **/
+gchar *
+e_named_parameters_get_name (const ENamedParameters *parameters,
+ gint index)
+{
+ const gchar *name_and_value, *colon;
+
+ g_return_val_if_fail (parameters != NULL, NULL);
+ g_return_val_if_fail (index >= 0 && index < e_named_parameters_count (parameters), NULL);
+
+ name_and_value = g_ptr_array_index ((GPtrArray *) parameters, index);
+ colon = name_and_value ? strchr (name_and_value, ':') : NULL;
+
+ if (!colon || colon == name_and_value)
+ return NULL;
+
+ return g_strndup (name_and_value, colon - name_and_value);
+}
+
+/**
+ * e_named_parameters_equal:
+ * @parameters1: the first #ENamedParameters
+ * @parameters2: the second #ENamedParameters
+ *
+ * Compares the two parameters objects and returns whether they equal.
+ * Note a %NULL and empty parameters are also considered equal.
+ *
+ * Returns: whether the two parameters are equal
+ *
+ * Since: 3.46
+ **/
+gboolean
+e_named_parameters_equal (const ENamedParameters *parameters1,
+ const ENamedParameters *parameters2)
+{
+ GPtrArray *arr1, *arr2;
+ guint ii, jj;
+
+ if (parameters1 == parameters2 ||
+ (!parameters1 && e_named_parameters_count (parameters2) == 0) ||
+ (!parameters2 && e_named_parameters_count (parameters1) == 0))
+ return TRUE;
+
+ if (!parameters1 || !parameters2 ||
+ e_named_parameters_count (parameters1) != e_named_parameters_count (parameters1))
+ return FALSE;
+
+ arr1 = (GPtrArray *) parameters1;
+ arr2 = (GPtrArray *) parameters2;
+
+ for (ii = 0; ii < arr1->len; ii++) {
+ const gchar *name_and_value1 = g_ptr_array_index (arr1, ii);
+
+ for (jj = 0; jj < arr2->len; jj++) {
+ const gchar *name_and_value2 = g_ptr_array_index (arr2, jj);
+
+ if (g_strcmp0 (name_and_value1, name_and_value2) == 0)
+ break;
+ }
+
+ /* went through all the items, none matched */
+ if (jj == arr2->len)
+ return FALSE;
+ }
+
+ return TRUE;
+}
diff --git a/src/libedataserver/e-named-parameters.h b/src/libedataserver/e-named-parameters.h
new file mode 100644
index 000000000..3b5f0b2b1
--- /dev/null
+++ b/src/libedataserver/e-named-parameters.h
@@ -0,0 +1,74 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 2012 Intel Corporation
+ *
+ * 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.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
+#ifndef E_NAMED_PARAMETERS_H
+#define E_NAMED_PARAMETERS_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/**
+ * ENamedParameters:
+ *
+ * Since: 3.8
+ **/
+struct _ENamedParameters;
+typedef struct _ENamedParameters ENamedParameters;
+
+#define E_TYPE_NAMED_PARAMETERS (e_named_parameters_get_type ())
+
+GType e_named_parameters_get_type (void) G_GNUC_CONST;
+ENamedParameters *
+ e_named_parameters_new (void);
+ENamedParameters *
+ e_named_parameters_new_strv (const gchar * const *strv);
+ENamedParameters *
+ e_named_parameters_new_string (const gchar *str);
+ENamedParameters *
+ e_named_parameters_new_clone (const ENamedParameters *parameters);
+void e_named_parameters_free (ENamedParameters *parameters);
+void e_named_parameters_clear (ENamedParameters *parameters);
+void e_named_parameters_assign (ENamedParameters *parameters,
+ const ENamedParameters *from);
+void e_named_parameters_set (ENamedParameters *parameters,
+ const gchar *name,
+ const gchar *value);
+const gchar * e_named_parameters_get (const ENamedParameters *parameters,
+ const gchar *name);
+gchar ** e_named_parameters_to_strv (const ENamedParameters *parameters);
+gchar * e_named_parameters_to_string (const ENamedParameters *parameters);
+gboolean e_named_parameters_test (const ENamedParameters *parameters,
+ const gchar *name,
+ const gchar *value,
+ gboolean case_sensitively);
+gboolean e_named_parameters_exists (const ENamedParameters *parameters,
+ const gchar *name);
+guint e_named_parameters_count (const ENamedParameters *parameters);
+gchar * e_named_parameters_get_name (const ENamedParameters *parameters,
+ gint index);
+gboolean e_named_parameters_equal (const ENamedParameters *parameters1,
+ const ENamedParameters *parameters2);
+
+G_END_DECLS
+
+#endif /* E_NAMED_PARAMETERS_H */
diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c
index 5cdc68c21..f2153880f 100644
--- a/src/libedataserver/e-oauth2-service-google.c
+++ b/src/libedataserver/e-oauth2-service-google.c
@@ -18,6 +18,7 @@
#include <glib/gi18n-lib.h>
+#include "e-data-server-util.h"
#include "e-oauth2-service.h"
#include "e-oauth2-service-base.h"
diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c
index 758aa7dd8..9cff0d059 100644
--- a/src/libedataserver/e-oauth2-service-outlook.c
+++ b/src/libedataserver/e-oauth2-service-outlook.c
@@ -18,6 +18,7 @@
#include <glib/gi18n-lib.h>
+#include "e-data-server-util.h"
#include "e-oauth2-service.h"
#include "e-oauth2-service-base.h"
diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c
index cd750fa7e..8e4ee8145 100644
--- a/src/libedataserver/e-oauth2-service-yahoo.c
+++ b/src/libedataserver/e-oauth2-service-yahoo.c
@@ -18,6 +18,7 @@
#include <glib/gi18n-lib.h>
+#include "e-data-server-util.h"
#include "e-oauth2-service.h"
#include "e-oauth2-service-base.h"
diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c
index 8f6990f95..290534dfb 100644
--- a/src/libedataserver/e-oauth2-service.c
+++ b/src/libedataserver/e-oauth2-service.c
@@ -34,6 +34,7 @@
#ifndef BUILDING_VALUE_HELPER
#include <json-glib/json-glib.h>
+#include "e-data-server-util.h"
#include "e-secret-store.h"
#include "e-soup-session.h"
#include "e-soup-ssl-trust.h"
diff --git a/src/libedataserver/e-soup-session.c b/src/libedataserver/e-soup-session.c
index d5c1b4f6f..2254217fa 100644
--- a/src/libedataserver/e-soup-session.c
+++ b/src/libedataserver/e-soup-session.c
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <glib/gi18n-lib.h>
+#include "e-data-server-util.h"
#include "e-oauth2-services.h"
#include "e-soup-auth-bearer.h"
#include "e-soup-ssl-trust.h"
diff --git a/src/libedataserver/e-soup-session.h b/src/libedataserver/e-soup-session.h
index d5112397d..d878814e1 100644
--- a/src/libedataserver/e-soup-session.h
+++ b/src/libedataserver/e-soup-session.h
@@ -25,7 +25,7 @@
#include <glib.h>
#include <libsoup/soup.h>
-#include <libedataserver/e-data-server-util.h>
+#include <libedataserver/e-named-parameters.h>
#include <libedataserver/e-source.h>
/* Standard GObject macros */
diff --git a/src/libedataserver/e-source-autoconfig.c b/src/libedataserver/e-source-autoconfig.c
index 4dafcf1ad..c94b49c94 100644
--- a/src/libedataserver/e-source-autoconfig.c
+++ b/src/libedataserver/e-source-autoconfig.c
@@ -15,6 +15,8 @@
*
*/
+#include "evolution-data-server-config.h"
+
/**
* SECTION: e-source-autoconfig
* @include: libedataserver/libedataserver.h
@@ -34,6 +36,8 @@
* ]|
**/
+#include "e-data-server-util.h"
+
#include "e-source-autoconfig.h"
struct _ESourceAutoconfigPrivate {
diff --git a/src/libedataserver/e-source-credentials-provider-impl.h
b/src/libedataserver/e-source-credentials-provider-impl.h
index 426960753..4902c45f7 100644
--- a/src/libedataserver/e-source-credentials-provider-impl.h
+++ b/src/libedataserver/e-source-credentials-provider-impl.h
@@ -26,6 +26,7 @@
#include <glib-object.h>
#include <libedataserver/e-extension.h>
+#include <libedataserver/e-named-parameters.h>
#include <libedataserver/e-source.h>
/* Standard GObject macros */
diff --git a/src/libedataserver/e-source-credentials-provider.h
b/src/libedataserver/e-source-credentials-provider.h
index 390f1aafc..7ec73fb4f 100644
--- a/src/libedataserver/e-source-credentials-provider.h
+++ b/src/libedataserver/e-source-credentials-provider.h
@@ -26,7 +26,7 @@
#include <glib-object.h>
#include <gio/gio.h>
-#include <libedataserver/e-data-server-util.h>
+#include <libedataserver/e-named-parameters.h>
#include <libedataserver/e-source.h>
#include <libedataserver/e-source-registry.h>
#include <libedataserver/e-source-credentials-provider-impl.h>
diff --git a/src/libedataserver/e-source-ldap.c b/src/libedataserver/e-source-ldap.c
index 18b0f66c3..da3a7b523 100644
--- a/src/libedataserver/e-source-ldap.c
+++ b/src/libedataserver/e-source-ldap.c
@@ -17,6 +17,7 @@
#include "evolution-data-server-config.h"
+#include "e-data-server-util.h"
#include "e-source-authentication.h"
#include "e-source-security.h"
#include "e-source-enumtypes.h"
diff --git a/src/libedataserver/e-source-local.c b/src/libedataserver/e-source-local.c
index ac1cabecc..a1c614da3 100644
--- a/src/libedataserver/e-source-local.c
+++ b/src/libedataserver/e-source-local.c
@@ -17,6 +17,8 @@
#include "evolution-data-server-config.h"
+#include "e-data-server-util.h"
+
#include "e-source-local.h"
struct _ESourceLocalPrivate {
diff --git a/src/libedataserver/e-source-weather.c b/src/libedataserver/e-source-weather.c
index b33732da4..bc15307cc 100644
--- a/src/libedataserver/e-source-weather.c
+++ b/src/libedataserver/e-source-weather.c
@@ -17,6 +17,7 @@
#include "evolution-data-server-config.h"
+#include "e-data-server-util.h"
#include "e-source-enumtypes.h"
#include "e-source-weather.h"
diff --git a/src/libedataserver/e-source-webdav.h b/src/libedataserver/e-source-webdav.h
index e0a0aabdb..a9422479a 100644
--- a/src/libedataserver/e-source-webdav.h
+++ b/src/libedataserver/e-source-webdav.h
@@ -58,10 +58,6 @@
G_BEGIN_DECLS
-/* forward declaration */
-struct _ENamedParameters;
-struct _ESourceRegistry;
-
typedef struct _ESourceWebdav ESourceWebdav;
typedef struct _ESourceWebdavClass ESourceWebdavClass;
typedef struct _ESourceWebdavPrivate ESourceWebdavPrivate;
diff --git a/src/libedataserver/e-source.h b/src/libedataserver/e-source.h
index 867524b90..818977939 100644
--- a/src/libedataserver/e-source.h
+++ b/src/libedataserver/e-source.h
@@ -23,7 +23,8 @@
#define E_SOURCE_H
#include <gio/gio.h>
-#include <libedataserver/e-data-server-util.h>
+
+#include <libedataserver/e-named-parameters.h>
#include <libedataserver/e-source-enums.h>
/* Standard GObject macros */
diff --git a/src/libedataserver/e-webdav-discover.h b/src/libedataserver/e-webdav-discover.h
index 028d3c6e9..e595b7d2e 100644
--- a/src/libedataserver/e-webdav-discover.h
+++ b/src/libedataserver/e-webdav-discover.h
@@ -24,6 +24,7 @@
#include <glib.h>
+#include <libedataserver/e-named-parameters.h>
#include <libedataserver/e-source.h>
#include <libedataserver/e-webdav-session.h>
diff --git a/src/libedataserver/libedataserver.h b/src/libedataserver/libedataserver.h
index c9e58081c..0a4d52f4f 100644
--- a/src/libedataserver/libedataserver.h
+++ b/src/libedataserver/libedataserver.h
@@ -37,6 +37,7 @@
#include <libedataserver/e-list.h>
#include <libedataserver/e-memory.h>
#include <libedataserver/e-module.h>
+#include <libedataserver/e-named-parameters.h>
#include <libedataserver/e-network-monitor.h>
#include <libedataserver/e-oauth2-service.h>
#include <libedataserver/e-oauth2-service-base.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
