[evolution-kolab/ek-wip-porting: 7/7] EPlugin: fix Evolution crasher in backend setup dialog

[Christian Hilberg <chilberg src gnome org>]

commit 2be3f33ba33a10774f2ef8f5e41f02448a9f8a3b
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Wed Feb 15 12:48:06 2012 +0100

    EPlugin: fix Evolution crasher in backend setup dialog
    
    * deal with widget properties which can initially
      be NULL
    * substitute default values in these cases

 src/libekolab/kolab-util-backend.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/libekolab/kolab-util-backend.c b/src/libekolab/kolab-util-backend.c
index 6fbd766..cf44ee2 100644
--- a/src/libekolab/kolab-util-backend.c
+++ b/src/libekolab/kolab-util-backend.c
@@ -174,7 +174,7 @@ KolabSyncStrategyID
 kolab_util_misc_sync_value_from_property (const gchar *sync_prop)
 {
 	KolabSyncStrategyID sid = KOLAB_SYNC_STRATEGY_DEFAULT;
-	g_assert (sync_prop != NULL);
+	g_return_val_if_fail (sync_prop != NULL, KOLAB_SYNC_STRATEGY_DEFAULT);
 	sid = kolab_util_misc_generic_integer_from_property (sync_prop,
 	                                                     KOLAB_SYNC_STRATEGY_DEFAULT);
 	return sid;
@@ -184,7 +184,7 @@ KolabTLSVariantID
 kolab_util_misc_tls_variant_from_property (const gchar *tls_variant)
 {
 	KolabTLSVariantID tvid = KOLAB_TLS_VARIANT_DEFAULT;
-	g_assert (tls_variant != NULL);
+	g_return_val_if_fail (tls_variant != NULL, KOLAB_TLS_VARIANT_DEFAULT);
 	tvid = kolab_util_misc_generic_integer_from_property (tls_variant,
 	                                                      KOLAB_TLS_VARIANT_DEFAULT);
 	return tvid;
@@ -194,7 +194,7 @@ KolabReqPkcs11
 kolab_util_misc_req_pkcs11_from_property (const gchar *req_pkcs11_prop)
 {
 	KolabReqPkcs11 pkreq = KOLAB_PKCS11_INFRASTRUCTURE_DEFAULT;
-	g_assert (req_pkcs11_prop != NULL);
+	g_return_val_if_fail (req_pkcs11_prop != NULL, KOLAB_PKCS11_INFRASTRUCTURE_DEFAULT);
 	pkreq = kolab_util_misc_generic_integer_from_property (req_pkcs11_prop,
 	                                                       KOLAB_PKCS11_INFRASTRUCTURE_DEFAULT);
 	return pkreq;