[evolution-kolab] KolabSettingsHandler: coding style cleanup

From: Christian Hilberg <chilberg src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-kolab] KolabSettingsHandler: coding style cleanup
Date: Fri, 26 Oct 2012 18:16:13 +0000 (UTC)
commit 4b78e096a5acdf357aa6f25fee5598705fe6ef7f
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Fri Oct 26 19:54:28 2012 +0200

    KolabSettingsHandler: coding style cleanup

 src/libekolab/kolab-settings-handler.c |  203 ++++++++++++++++++--------------
 src/libekolab/kolab-settings-handler.h |   87 ++++++++++----
 2 files changed, 182 insertions(+), 108 deletions(-)
---
diff --git a/src/libekolab/kolab-settings-handler.c b/src/libekolab/kolab-settings-handler.c
index 54933b4..616f5fc 100644
--- a/src/libekolab/kolab-settings-handler.c
+++ b/src/libekolab/kolab-settings-handler.c
@@ -84,9 +84,9 @@ static gboolean settings_handler_char_get_func_user_home_dir (KolabSettingsHandl
 static gboolean settings_handler_char_set_func_user_home_dir (KolabSettingsHandler*, gchar*, GError**);
 static gboolean settings_handler_char_get_func_esource_uid (KolabSettingsHandler*, GError**);
 static gboolean settings_handler_char_set_func_esource_uid (KolabSettingsHandler*, gchar*, GError**);
-static gboolean settings_handler_uint_set_func_folder_context (KolabSettingsHandler*, guint value, GError**);
+static gboolean settings_handler_uint_set_func_folder_context (KolabSettingsHandler*, guint, GError**);
 static gboolean settings_handler_uint_get_func_folder_syncstrategy (KolabSettingsHandler*, GError**);
-static gboolean settings_handler_uint_set_func_folder_syncstrategy (KolabSettingsHandler*, guint value, GError**);
+static gboolean settings_handler_uint_set_func_folder_syncstrategy (KolabSettingsHandler*, guint, GError**);
 
 static KolabSettingsHandlerGetFunc _kolab_settings_handler_char_get_funcs[] = {
 	settings_handler_char_get_func_camel_data_dir, /* KOLAB_SETTINGS_HANDLER_CHAR_FIELD_CAMEL_DATA_DIR */
@@ -121,7 +121,8 @@ static KolabSettingsHandlerUintSetFunc _kolab_settings_handler_uint_set_funcs[]
 /*----------------------------------------------------------------------------*/
 
 static gboolean
-settings_handler_char_get_func_camel_data_dir (KolabSettingsHandler *self, GError **err)
+settings_handler_char_get_func_camel_data_dir (KolabSettingsHandler *self,
+                                               GError **err)
 {
 	KolabSettingsHandlerPrivate *priv = NULL;
 	KolabFolderContextID context = KOLAB_FOLDER_CONTEXT_INVAL;
@@ -129,7 +130,7 @@ settings_handler_char_get_func_camel_data_dir (KolabSettingsHandler *self, GErro
 	gchar *priv_data_dir = NULL;
 	gchar *backend_dir = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
@@ -176,7 +177,8 @@ settings_handler_char_get_func_camel_data_dir (KolabSettingsHandler *self, GErro
 }
 
 static gboolean
-settings_handler_char_get_func_camel_cache_dir (KolabSettingsHandler *self, GError **err)
+settings_handler_char_get_func_camel_cache_dir (KolabSettingsHandler *self,
+                                                GError **err)
 {
 	KolabSettingsHandlerPrivate *priv = NULL;
 	KolabFolderContextID context = KOLAB_FOLDER_CONTEXT_INVAL;
@@ -184,7 +186,7 @@ settings_handler_char_get_func_camel_cache_dir (KolabSettingsHandler *self, GErr
 	gchar *priv_cache_dir = NULL;
 	gchar *backend_dir = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
@@ -231,12 +233,13 @@ settings_handler_char_get_func_camel_cache_dir (KolabSettingsHandler *self, GErr
 }
 
 static gboolean
-settings_handler_char_get_func_user_home_dir (KolabSettingsHandler *self, GError **err)
+settings_handler_char_get_func_user_home_dir (KolabSettingsHandler *self,
+                                              GError **err)
 {
 	KolabSettingsHandlerPrivate *priv = NULL;
 	gchar *home_dir = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
@@ -252,10 +255,14 @@ settings_handler_char_get_func_user_home_dir (KolabSettingsHandler *self, GError
 }
 
 static gboolean
-settings_handler_char_set_func_camel_data_dir (KolabSettingsHandler *self, gchar *value, GError **err)
+settings_handler_char_set_func_camel_data_dir (KolabSettingsHandler *self,
+                                               gchar *value,
+                                               GError **err)
 {
-	(void)self;
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	(void)value;
+	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
+
 	g_set_error (err,
 	             KOLAB_BACKEND_ERROR,
 	             KOLAB_BACKEND_ERROR_GENERIC,
@@ -264,10 +271,14 @@ settings_handler_char_set_func_camel_data_dir (KolabSettingsHandler *self, gchar
 }
 
 static gboolean
-settings_handler_char_set_func_camel_cache_dir (KolabSettingsHandler *self, gchar *value, GError **err)
+settings_handler_char_set_func_camel_cache_dir (KolabSettingsHandler *self,
+                                                gchar *value,
+                                                GError **err)
 {
-	(void)self;
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	(void)value;
+	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
+
 	g_set_error (err,
 	             KOLAB_BACKEND_ERROR,
 	             KOLAB_BACKEND_ERROR_GENERIC,
@@ -276,10 +287,14 @@ settings_handler_char_set_func_camel_cache_dir (KolabSettingsHandler *self, gcha
 }
 
 static gboolean
-settings_handler_char_set_func_user_home_dir (KolabSettingsHandler *self, gchar *value, GError **err)
+settings_handler_char_set_func_user_home_dir (KolabSettingsHandler *self,
+                                              gchar *value,
+                                              GError **err)
 {
-	(void)self;
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	(void)value;
+	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
+
 	g_set_error (err,
 	             KOLAB_BACKEND_ERROR,
 	             KOLAB_BACKEND_ERROR_GENERIC,
@@ -323,7 +338,7 @@ settings_handler_char_set_func_esource_uid (KolabSettingsHandler *self,
                                             gchar *value,
                                             GError **err)
 {
-	(void)self;
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	(void)value;
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
@@ -335,15 +350,21 @@ settings_handler_char_set_func_esource_uid (KolabSettingsHandler *self,
 }
 
 static gboolean
-settings_handler_char_get_func_camel_config_dir (KolabSettingsHandler *self, GError **err)
+settings_handler_char_get_func_camel_config_dir (KolabSettingsHandler *self,
+                                                 GError **err)
 {
-	KolabSettingsHandlerPrivate *priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
+	KolabSettingsHandlerPrivate *priv = NULL;
 	gboolean ok = FALSE;
 	const gchar *data_dir = NULL;
 	gchar *config_dir = NULL;
 	gchar *priv_config_dir = NULL;
 	GError *tmp_err = NULL;
 
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
+	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
+
+	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
+
 	priv_config_dir = priv->sdata_char[KOLAB_SETTINGS_HANDLER_CHAR_FIELD_CAMEL_CONFIG_DIR];
 	if (priv_config_dir != NULL)
 		return TRUE;
@@ -373,10 +394,14 @@ settings_handler_char_get_func_camel_config_dir (KolabSettingsHandler *self, GEr
 }
 
 static gboolean
-settings_handler_char_set_func_camel_config_dir (KolabSettingsHandler *self, gchar *value, GError **err)
+settings_handler_char_set_func_camel_config_dir (KolabSettingsHandler *self,
+                                                 gchar *value,
+                                                 GError **err)
 {
-	(void)self;
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	(void)value;
+	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
+
 	g_set_error (err,
 	             KOLAB_BACKEND_ERROR,
 	             KOLAB_BACKEND_ERROR_GENERIC,
@@ -385,10 +410,14 @@ settings_handler_char_set_func_camel_config_dir (KolabSettingsHandler *self, gch
 }
 
 static gboolean
-settings_handler_uint_set_func_folder_context (KolabSettingsHandler *self, guint value, GError **err)
+settings_handler_uint_set_func_folder_context (KolabSettingsHandler *self,
+                                               guint value,
+                                               GError **err)
 {
-	(void)self;
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	(void)value;
+	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
+
 	g_set_error (err,
 	             KOLAB_BACKEND_ERROR,
 	             KOLAB_BACKEND_ERROR_GENERIC,
@@ -440,7 +469,7 @@ settings_handler_uint_set_func_folder_syncstrategy (KolabSettingsHandler *self,
                                                     guint value,
                                                     GError **err)
 {
-	(void)self;
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	(void)value;
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
@@ -459,7 +488,7 @@ kolab_settings_handler_init (KolabSettingsHandler *self)
 	KolabSettingsHandlerPrivate *priv = NULL;
 	gint ii = 0;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
+	g_return_if_fail (KOLAB_IS_SETTINGS_HANDLER (self));
 
 	priv = self->priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
 
@@ -513,18 +542,18 @@ kolab_settings_handler_set_property (GObject *object,
                                      GParamSpec *pspec)
 {
 	switch (property_id) {
-		case PROP_CAMEL_SETTINGS:
-			kolab_settings_handler_set_camel_settings (
-				KOLAB_SETTINGS_HANDLER (object),
-				g_value_get_object (value));
-			return;
-		case PROP_E_BACKEND:
-			kolab_settings_handler_set_e_backend (
-				KOLAB_SETTINGS_HANDLER (object),
-				g_value_get_object (value));
-			return;
-		default:
-			break;
+	case PROP_CAMEL_SETTINGS:
+		kolab_settings_handler_set_camel_settings (
+		                                           KOLAB_SETTINGS_HANDLER (object),
+		                                           g_value_get_object (value));
+		return;
+	case PROP_E_BACKEND:
+		kolab_settings_handler_set_e_backend (
+		                                      KOLAB_SETTINGS_HANDLER (object),
+		                                      g_value_get_object (value));
+		return;
+	default:
+		break;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -537,20 +566,20 @@ kolab_settings_handler_get_property (GObject *object,
                                      GParamSpec *pspec)
 {
 	switch (property_id) {
-		case PROP_CAMEL_SETTINGS:
-			g_value_set_object (
-				value,
-				kolab_settings_handler_get_camel_settings (
-				KOLAB_SETTINGS_HANDLER (object)));
-			return;
-		case PROP_E_BACKEND:
-			g_value_set_object (
-				value,
-				kolab_settings_handler_get_e_backend (
-				KOLAB_SETTINGS_HANDLER (object)));
-			return;
-		default:
-			break;
+	case PROP_CAMEL_SETTINGS:
+		g_value_set_object (
+		                    value,
+		                    kolab_settings_handler_get_camel_settings (
+		                                                               KOLAB_SETTINGS_HANDLER (object)));
+		return;
+	case PROP_E_BACKEND:
+		g_value_set_object (
+		                    value,
+		                    kolab_settings_handler_get_e_backend (
+		                                                          KOLAB_SETTINGS_HANDLER (object)));
+		return;
+	default:
+		break;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -671,9 +700,9 @@ kolab_settings_handler_configure  (KolabSettingsHandler *self,
 {
 	KolabSettingsHandlerPrivate *priv = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
-	g_assert ((context > KOLAB_FOLDER_CONTEXT_INVAL) &&
-	          (context < KOLAB_FOLDER_LAST_CONTEXT));
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
+	g_return_val_if_fail ((context > KOLAB_FOLDER_CONTEXT_INVAL) &&
+	                      (context < KOLAB_FOLDER_LAST_CONTEXT), FALSE);
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
@@ -707,13 +736,13 @@ kolab_settings_handler_bringup (KolabSettingsHandler *self,
 {
 	KolabSettingsHandlerPrivate *priv = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
 
-	g_assert (priv->is_configured == TRUE);
-	g_assert (priv->is_up == FALSE);
+	g_return_val_if_fail (priv->is_configured == TRUE, FALSE);
+	g_return_val_if_fail (priv->is_up == FALSE, FALSE);
 
 	/* TODO implement me */
 
@@ -739,7 +768,7 @@ kolab_settings_handler_shutdown (KolabSettingsHandler *self,
 {
 	KolabSettingsHandlerPrivate *priv = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
@@ -759,7 +788,7 @@ kolab_settings_handler_shutdown (KolabSettingsHandler *self,
 CamelKolabIMAPXSettings *
 kolab_settings_handler_get_camel_settings (KolabSettingsHandler *self)
 {
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), NULL);
 
 	return self->priv->camel_settings;
 }
@@ -767,7 +796,7 @@ kolab_settings_handler_get_camel_settings (KolabSettingsHandler *self)
 EBackend *
 kolab_settings_handler_get_e_backend (KolabSettingsHandler *self)
 {
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), NULL);
 
 	return self->priv->e_backend;
 }
@@ -799,15 +828,15 @@ kolab_settings_handler_set_char_field (KolabSettingsHandler *self,
 	gboolean ok = FALSE;
 	GError *tmp_err = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
-	g_assert (field_id < KOLAB_SETTINGS_HANDLER_CHAR_LAST_FIELD);
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
+	g_return_val_if_fail (field_id < KOLAB_SETTINGS_HANDLER_CHAR_LAST_FIELD, FALSE);
 	/* value may be NULL */
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
 
-	g_assert (priv->is_configured == TRUE);
-	g_assert (priv->is_up == TRUE);
+	g_return_val_if_fail (priv->is_configured == TRUE, FALSE);
+	g_return_val_if_fail (priv->is_up == TRUE, FALSE);
 
 	setfunc = _kolab_settings_handler_char_set_funcs[field_id];
 	if (setfunc != NULL) {
@@ -846,14 +875,14 @@ kolab_settings_handler_get_char_field (KolabSettingsHandler *self,
 	gboolean ok = FALSE;
 	GError *tmp_err = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
-	g_assert (field_id < KOLAB_SETTINGS_HANDLER_CHAR_LAST_FIELD);
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), NULL);
+	g_return_val_if_fail (field_id < KOLAB_SETTINGS_HANDLER_CHAR_LAST_FIELD, NULL);
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
 
-	g_assert (priv->is_configured == TRUE);
-	g_assert (priv->is_up == TRUE);
+	g_return_val_if_fail (priv->is_configured == TRUE, NULL);
+	g_return_val_if_fail (priv->is_up == TRUE, NULL);
 
 	getfunc = _kolab_settings_handler_char_get_funcs[field_id];
 	if (getfunc != NULL) {
@@ -892,14 +921,14 @@ kolab_settings_handler_set_uint_field (KolabSettingsHandler *self,
 	gboolean ok = FALSE;
 	GError *tmp_err = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
-	g_assert (field_id < KOLAB_SETTINGS_HANDLER_UINT_LAST_FIELD);
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
+	g_return_val_if_fail (field_id < KOLAB_SETTINGS_HANDLER_UINT_LAST_FIELD, FALSE);
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
 
-	g_assert (priv->is_configured == TRUE);
-	g_assert (priv->is_up == TRUE);
+	g_return_val_if_fail (priv->is_configured == TRUE, FALSE);
+	g_return_val_if_fail (priv->is_up == TRUE, FALSE);
 
 	setfunc = _kolab_settings_handler_uint_set_funcs[field_id];
 	if (setfunc != NULL) {
@@ -936,14 +965,14 @@ kolab_settings_handler_get_uint_field (KolabSettingsHandler *self,
 	gboolean ok = FALSE;
 	GError *tmp_err = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
-	g_assert (field_id < KOLAB_SETTINGS_HANDLER_UINT_LAST_FIELD);
-	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), 0);
+	g_return_val_if_fail (field_id < KOLAB_SETTINGS_HANDLER_UINT_LAST_FIELD, 0);
+	g_return_val_if_fail (err == NULL || *err == NULL, 0);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
 
-	g_assert (priv->is_configured == TRUE);
-	g_assert (priv->is_up == TRUE);
+	g_return_val_if_fail (priv->is_configured == TRUE, 0);
+	g_return_val_if_fail (priv->is_up == TRUE, 0);
 
 	getfunc = _kolab_settings_handler_uint_get_funcs[field_id];
 	if (getfunc != NULL) {
@@ -979,14 +1008,14 @@ kolab_settings_handler_set_int_field (KolabSettingsHandler *self,
 {
 	KolabSettingsHandlerPrivate *priv = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	/* g_assert (field_id < KOLAB_SETTINGS_HANDLER_INT_LAST_FIELD); */
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
 
-	g_assert (priv->is_configured == TRUE);
-	g_assert (priv->is_up == TRUE);
+	g_return_val_if_fail (priv->is_configured == TRUE, FALSE);
+	g_return_val_if_fail (priv->is_up == TRUE, FALSE);
 
 	priv->sdata_int[field_id] = value;
 	return TRUE;
@@ -1011,14 +1040,14 @@ kolab_settings_handler_get_int_field (KolabSettingsHandler *self,
 {
 	KolabSettingsHandlerPrivate *priv = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), 0);
 	/* g_assert (field_id < KOLAB_SETTINGS_HANDLER_INT_LAST_FIELD); */
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
 
-	g_assert (priv->is_configured == TRUE);
-	g_assert (priv->is_up == TRUE);
+	g_return_val_if_fail (priv->is_configured == TRUE, 0);
+	g_return_val_if_fail (priv->is_up == TRUE, 0);
 
 	return priv->sdata_int[field_id];
 }
@@ -1045,14 +1074,14 @@ kolab_settings_handler_set_bool_field (KolabSettingsHandler *self,
 {
 	KolabSettingsHandlerPrivate *priv = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	/* g_assert (field_id < KOLAB_SETTINGS_HANDLER_BOOL_LAST_FIELD); */
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
 
-	g_assert (priv->is_configured == TRUE);
-	g_assert (priv->is_up == TRUE);
+	g_return_val_if_fail (priv->is_configured == TRUE, FALSE);
+	g_return_val_if_fail (priv->is_up == TRUE, FALSE);
 
 	priv->sdata_bool[field_id] = value;
 	return TRUE;
@@ -1077,14 +1106,14 @@ kolab_settings_handler_get_bool_field (KolabSettingsHandler *self,
 {
 	KolabSettingsHandlerPrivate *priv = NULL;
 
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (self));
+	g_return_val_if_fail (KOLAB_IS_SETTINGS_HANDLER (self), FALSE);
 	/* g_assert (field_id < KOLAB_SETTINGS_HANDLER_BOOL_LAST_FIELD); */
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
 
-	g_assert (priv->is_configured == TRUE);
-	g_assert (priv->is_up == TRUE);
+	g_return_val_if_fail (priv->is_configured == TRUE, FALSE);
+	g_return_val_if_fail (priv->is_up == TRUE, FALSE);
 
 	return priv->sdata_bool[field_id];
 }
diff --git a/src/libekolab/kolab-settings-handler.h b/src/libekolab/kolab-settings-handler.h
index 7c1c81c..01edbb7 100644
--- a/src/libekolab/kolab-settings-handler.h
+++ b/src/libekolab/kolab-settings-handler.h
@@ -127,27 +127,72 @@ typedef enum {
 
 GType kolab_settings_handler_get_type (void) G_GNUC_CONST;
 
-KolabSettingsHandler * kolab_settings_handler_new (CamelKolabIMAPXSettings *camel_settings,
-                                                   EBackend *e_backend);
-
-gboolean kolab_settings_handler_configure (KolabSettingsHandler *self, KolabFolderContextID context, GError **err);
-gboolean kolab_settings_handler_bringup (KolabSettingsHandler *self, GError **err);
-gboolean kolab_settings_handler_shutdown (KolabSettingsHandler *self, GError **err);
-
-CamelKolabIMAPXSettings * kolab_settings_handler_get_camel_settings (KolabSettingsHandler *self);
-EBackend * kolab_settings_handler_get_e_backend (KolabSettingsHandler *self);
-
-gboolean kolab_settings_handler_set_char_field (KolabSettingsHandler *self, KolabSettingsHandlerCharFieldID field_id, gchar *value, GError **err);
-const gchar* kolab_settings_handler_get_char_field (KolabSettingsHandler *self, KolabSettingsHandlerCharFieldID field_id, GError **err);
-
-gboolean kolab_settings_handler_set_uint_field (KolabSettingsHandler *self, KolabSettingsHandlerUintFieldID field_id, guint value, GError **err);
-guint kolab_settings_handler_get_uint_field (KolabSettingsHandler *self, KolabSettingsHandlerUintFieldID field_id, GError **err);
-
-gboolean kolab_settings_handler_set_int_field (KolabSettingsHandler *self, KolabSettingsHandlerIntFieldID field_id, gint value, GError **err);
-gint kolab_settings_handler_get_int_field (KolabSettingsHandler *self, KolabSettingsHandlerIntFieldID field_id, GError **err);
-
-gboolean kolab_settings_handler_set_bool_field (KolabSettingsHandler *self, KolabSettingsHandlerBoolFieldID field_id, gboolean value, GError **err);
-gboolean kolab_settings_handler_get_bool_field (KolabSettingsHandler *self, KolabSettingsHandlerBoolFieldID field_id, GError **err);
+KolabSettingsHandler*
+kolab_settings_handler_new (CamelKolabIMAPXSettings *camel_settings,
+                            EBackend *e_backend);
+
+gboolean
+kolab_settings_handler_configure (KolabSettingsHandler *self,
+                                  KolabFolderContextID context,
+                                  GError **err);
+
+gboolean
+kolab_settings_handler_bringup (KolabSettingsHandler *self,
+                                GError **err);
+
+gboolean
+kolab_settings_handler_shutdown (KolabSettingsHandler *self,
+                                 GError **err);
+
+CamelKolabIMAPXSettings*
+kolab_settings_handler_get_camel_settings (KolabSettingsHandler *self);
+
+EBackend*
+kolab_settings_handler_get_e_backend (KolabSettingsHandler *self);
+
+gboolean
+kolab_settings_handler_set_char_field (KolabSettingsHandler *self,
+                                       KolabSettingsHandlerCharFieldID field_id,
+                                       gchar *value,
+                                       GError **err);
+
+const gchar*
+kolab_settings_handler_get_char_field (KolabSettingsHandler *self,
+                                       KolabSettingsHandlerCharFieldID field_id,
+                                       GError **err);
+
+gboolean
+kolab_settings_handler_set_uint_field (KolabSettingsHandler *self,
+                                       KolabSettingsHandlerUintFieldID field_id,
+                                       guint value,
+                                       GError **err);
+
+guint
+kolab_settings_handler_get_uint_field (KolabSettingsHandler *self,
+                                       KolabSettingsHandlerUintFieldID field_id,
+                                       GError **err);
+
+gboolean
+kolab_settings_handler_set_int_field (KolabSettingsHandler *self,
+                                      KolabSettingsHandlerIntFieldID field_id,
+                                      gint value,
+                                      GError **err);
+
+gint
+kolab_settings_handler_get_int_field (KolabSettingsHandler *self,
+                                      KolabSettingsHandlerIntFieldID field_id,
+                                      GError **err);
+
+gboolean
+kolab_settings_handler_set_bool_field (KolabSettingsHandler *self,
+                                       KolabSettingsHandlerBoolFieldID field_id,
+                                       gboolean value,
+                                       GError **err);
+
+gboolean
+kolab_settings_handler_get_bool_field (KolabSettingsHandler *self,
+                                       KolabSettingsHandlerBoolFieldID field_id,
+                                       GError **err);
 
 G_END_DECLS
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]