[evolution-data-server/gnome-3-16] [ETrustPrompt] Ensure needed extensions for GOA/UOA sources

[Milan Crha <mcrha src gnome org>]

commit 79dbb273a37623a1e667b82788e7f05e2746b444
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jun 19 12:13:54 2015 +0200

    [ETrustPrompt] Ensure needed extensions for GOA/UOA sources
    
    These are collection sources, thus not necessarily also WebDAV or
    with an Authentication extensions, but at least the WebDAV extension
    is used for auto-discovery and SSL Trust result reading, thus make
    sure the extension is there, thus the prompt result is saved as well.

 libedataserverui/e-trust-prompt.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/libedataserverui/e-trust-prompt.c b/libedataserverui/e-trust-prompt.c
index bc4bbc6..837889d 100644
--- a/libedataserverui/e-trust-prompt.c
+++ b/libedataserverui/e-trust-prompt.c
@@ -560,6 +560,13 @@ e_trust_prompt_run_for_source (GtkWindow *parent,
        g_return_if_fail (E_IS_SOURCE (source));
        g_return_if_fail (certificate_pem != NULL);
 
+       if (e_source_has_extension (source, E_SOURCE_EXTENSION_GOA) ||
+           e_source_has_extension (source, E_SOURCE_EXTENSION_UOA)) {
+               /* Make sure that GOA/UOA collection sources contain these extensions too */
+               g_warn_if_fail (e_source_get_extension (source, E_SOURCE_EXTENSION_AUTHENTICATION));
+               g_warn_if_fail (e_source_get_extension (source, E_SOURCE_EXTENSION_WEBDAV_BACKEND));
+       }
+
        if (e_source_has_extension (source, E_SOURCE_EXTENSION_AUTHENTICATION))
                extension_authentication = e_source_get_extension (source, E_SOURCE_EXTENSION_AUTHENTICATION);
        if (e_source_has_extension (source, E_SOURCE_EXTENSION_WEBDAV_BACKEND))