GNOME.org
 

[evolution-kolab/ek-wip-porting-imapx] camel: conditionally include config.h in extension files

commit 2f733dbcf557f9fdf8656bd632d24a5ffa8d5ce8
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Dec 5 18:53:06 2011 +0100

    camel: conditionally include config.h in extension files
    
    * added conditional include of config.h to the
      extension files where it was missing
    * re-indented

 src/camel/camel-kolab-imapx-folder.c      |    8 +++-
 src/camel/camel-kolab-imapx-folder.h      |   22 +++++-----
 src/camel/camel-kolab-imapx-metadata-db.c |   38 ++++++++++--------
 src/camel/camel-kolab-imapx-metadata.c    |   12 ++++--
 src/camel/camel-kolab-imapx-provider.c    |   10 ++--
 src/camel/camel-kolab-imapx-server.c      |    4 ++
 src/camel/camel-kolab-imapx-settings.c    |   46 ++++++++++++----------
 src/camel/camel-kolab-imapx-settings.h    |   60 ++++++++++++++--------------
 src/camel/camel-kolab-imapx-transport.c   |    4 ++
 src/camel/camel-kolab-session.c           |   40 ++++++++++---------
 src/camel/camel-kolab-session.h           |    4 +-
 src/camel/camel-kolab-stream.c            |   14 +++---
 12 files changed, 145 insertions(+), 117 deletions(-)
---
diff --git a/src/camel/camel-kolab-imapx-folder.c b/src/camel/camel-kolab-imapx-folder.c
index 0f9055f..d7b367f 100644
--- a/src/camel/camel-kolab-imapx-folder.c
+++ b/src/camel/camel-kolab-imapx-folder.c
@@ -25,6 +25,10 @@
 
 /*----------------------------------------------------------------------------*/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "camel-kolab-imapx-folder.h"
 
 /*----------------------------------------------------------------------------*/
@@ -73,7 +77,7 @@ camel_kolab_imapx_folder_dispose (GObject *object)
 {
 	g_assert (CAMEL_IS_KOLAB_IMAPX_FOLDER (object));
 
-	G_OBJECT_CLASS (camel_kolab_imapx_folder_parent_class)->dispose (object);	
+	G_OBJECT_CLASS (camel_kolab_imapx_folder_parent_class)->dispose (object);
 }
 
 static void
@@ -81,7 +85,7 @@ camel_kolab_imapx_folder_finalize (GObject *object)
 {
 	g_assert (CAMEL_IS_KOLAB_IMAPX_FOLDER (object));
 
-	G_OBJECT_CLASS (camel_kolab_imapx_folder_parent_class)->finalize (object);	
+	G_OBJECT_CLASS (camel_kolab_imapx_folder_parent_class)->finalize (object);
 }
 
 static void
diff --git a/src/camel/camel-kolab-imapx-folder.h b/src/camel/camel-kolab-imapx-folder.h
index 2d2205c..56b750c 100644
--- a/src/camel/camel-kolab-imapx-folder.h
+++ b/src/camel/camel-kolab-imapx-folder.h
@@ -31,7 +31,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include <glib.h>
-#include <camel/camel.h>
+#include <glib-object.h>
 
 #include <camel/providers/imapx/camel-imapx-extd-folder.h>
 
@@ -60,21 +60,21 @@ camel_kolab_imapx_folder_metadata_gdestroy (gpointer data);
 
 #define CAMEL_TYPE_KOLAB_IMAPX_FOLDER	  \
 	(camel_kolab_imapx_folder_get_type ())
-#define CAMEL_KOLAB_IMAPX_FOLDER(obj) \
+#define CAMEL_KOLAB_IMAPX_FOLDER(obj)	  \
 	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), CAMEL_TYPE_KOLAB_IMAPX_FOLDER, CamelKolabIMAPXFolder))
-#define CAMEL_KOLAB_IMAPX_FOLDER_CLASS(klass) \
+	 ((obj), CAMEL_TYPE_KOLAB_IMAPX_FOLDER, CamelKolabIMAPXFolder))
+#define CAMEL_KOLAB_IMAPX_FOLDER_CLASS(klass)	  \
 	(G_TYPE_CHECK_CLASS_CAST \
-	((klass), CAMEL_TYPE_KOLAB_IMAPX_FOLDER, CamelKolabIMAPXFolderClass))
-#define CAMEL_IS_KOLAB_IMAPX_FOLDER(obj) \
+	 ((klass), CAMEL_TYPE_KOLAB_IMAPX_FOLDER, CamelKolabIMAPXFolderClass))
+#define CAMEL_IS_KOLAB_IMAPX_FOLDER(obj)	  \
 	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), CAMEL_TYPE_KOLAB_IMAPX_FOLDER))
-#define CAMEL_IS_KOLAB_IMAPX_FOLDER_CLASS(klass) \
+	 ((obj), CAMEL_TYPE_KOLAB_IMAPX_FOLDER))
+#define CAMEL_IS_KOLAB_IMAPX_FOLDER_CLASS(klass)	  \
 	(G_TYPE_CHECK_CLASS_TYPE \
-	((klass), CAMEL_TYPE_KOLAB_IMAPX_FOLDER))
-#define CAMEL_KOLAB_IMAPX_FOLDER_GET_CLASS(obj) \
+	 ((klass), CAMEL_TYPE_KOLAB_IMAPX_FOLDER))
+#define CAMEL_KOLAB_IMAPX_FOLDER_GET_CLASS(obj)	  \
 	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), CAMEL_TYPE_KOLAB_IMAPX_FOLDER, CamelKolabIMAPXFolderClass))
+	 ((obj), CAMEL_TYPE_KOLAB_IMAPX_FOLDER, CamelKolabIMAPXFolderClass))
 
 G_BEGIN_DECLS
 
diff --git a/src/camel/camel-kolab-imapx-metadata-db.c b/src/camel/camel-kolab-imapx-metadata-db.c
index 37b9478..f776df9 100644
--- a/src/camel/camel-kolab-imapx-metadata-db.c
+++ b/src/camel/camel-kolab-imapx-metadata-db.c
@@ -42,6 +42,10 @@
 
 /*----------------------------------------------------------------------------*/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 
 /* Kolab error reporting */
@@ -143,9 +147,9 @@ camel_kolab_imapx_metadata_db_table_exists (CamelKolabImapxMetadataDb *mdb,
 
 	if (sql_errno != SQLITE_OK) {
 		g_set_error (err,
-			     KOLAB_CAMEL_KOLAB_ERROR,
-			     KOLAB_CAMEL_KOLAB_ERROR_DB,
-			     "%s: %s",
+		             KOLAB_CAMEL_KOLAB_ERROR,
+		             KOLAB_CAMEL_KOLAB_ERROR_DB,
+		             "%s: %s",
 		             __func__, sqlite3_errmsg (mdb->db));
 		return FALSE;
 	}
@@ -153,9 +157,9 @@ camel_kolab_imapx_metadata_db_table_exists (CamelKolabImapxMetadataDb *mdb,
 	if (mdb->ctr > 1) {
 		/* each table must exist only once (or not at all) */
 		g_set_error (err,
-			     KOLAB_CAMEL_KOLAB_ERROR,
-			     KOLAB_CAMEL_KOLAB_ERROR_DB,
-			     "%s: multiple table [%s], corrupted [%s]",
+		             KOLAB_CAMEL_KOLAB_ERROR,
+		             KOLAB_CAMEL_KOLAB_ERROR_DB,
+		             "%s: multiple table [%s], corrupted [%s]",
 		             __func__, name, mdb->path);
 		return FALSE;
 	}
@@ -184,7 +188,7 @@ camel_kolab_imapx_metadata_db_table_create (CamelKolabImapxMetadataDb *mdb,
 	/* primary key (1st column) is folder names,
 	 * rest of the row maps to CamelKolabImapxFolderMetadata */
 	sql_str = sqlite3_mprintf ("CREATE TABLE IF NOT EXISTS %Q ( %Q TEXT PRIMARY KEY, %Q INTEGER );",
-			           name,
+	                           name,
 	                           CAMEL_KOLAB_IMAPX_SQLITE_COL_FOLDERNAME,
 	                           CAMEL_KOLAB_IMAPX_SQLITE_COL_FOLDERTYPE);
 
@@ -193,9 +197,9 @@ camel_kolab_imapx_metadata_db_table_create (CamelKolabImapxMetadataDb *mdb,
 
 	if (sql_errno != SQLITE_OK) {
 		g_set_error (err,
-			     KOLAB_CAMEL_KOLAB_ERROR,
-			     KOLAB_CAMEL_KOLAB_ERROR_DB,
-			     "%s: %s",
+		             KOLAB_CAMEL_KOLAB_ERROR,
+		             KOLAB_CAMEL_KOLAB_ERROR_DB,
+		             "%s: %s",
 		             __func__, sqlite3_errmsg (mdb->db));
 		return FALSE;
 	}
@@ -247,10 +251,10 @@ camel_kolab_imapx_metadata_db_open (CamelKolabImapxMetadataDb *mdb,
 
 	if (tmp_db == NULL) {
 		g_set_error (err,
-			     KOLAB_CAMEL_KOLAB_ERROR,
-			     KOLAB_CAMEL_KOLAB_ERROR_DB,
-			     "%s: could not open/create sqlite db for [%s]",
-			     __func__, filename);
+		             KOLAB_CAMEL_KOLAB_ERROR,
+		             KOLAB_CAMEL_KOLAB_ERROR_DB,
+		             "%s: could not open/create sqlite db for [%s]",
+		             __func__, filename);
 		g_free (filename);
 		return FALSE;
 	}
@@ -443,9 +447,9 @@ camel_kolab_imapx_metadata_db_lookup (CamelKolabImapxMetadataDb *mdb,
 	sqlite3_free (sql_str);
 	if (sql_errno != SQLITE_OK) {
 		g_set_error (err,
-			     KOLAB_CAMEL_KOLAB_ERROR,
-			     KOLAB_CAMEL_KOLAB_ERROR_DB,
-			     "%s: %s",
+		             KOLAB_CAMEL_KOLAB_ERROR,
+		             KOLAB_CAMEL_KOLAB_ERROR_DB,
+		             "%s: %s",
 		             __func__, sqlite3_errmsg (mdb->db));
 		camel_kolab_imapx_folder_metadata_free (kfmd);
 		return NULL;
diff --git a/src/camel/camel-kolab-imapx-metadata.c b/src/camel/camel-kolab-imapx-metadata.c
index d1ad480..a327853 100644
--- a/src/camel/camel-kolab-imapx-metadata.c
+++ b/src/camel/camel-kolab-imapx-metadata.c
@@ -25,6 +25,10 @@
 
 /*----------------------------------------------------------------------------*/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 
 #include <libekolabutil/kolab-util-error.h>
@@ -48,10 +52,10 @@ camel_kolab_imapx_metadata_folder_metadata_new_from_imapx (CamelImapxMetadataAnn
 	g_assert ((proto > CAMEL_IMAPX_METADATA_PROTO_INVAL) &&
 	          (proto < CAMEL_IMAPX_METADATA_LAST_PROTO));
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
-	
+
 	if (man == NULL)
 		return NULL;
-	
+
 	g_assert (man->entries != NULL);
 
 	/* search for folder type info */
@@ -237,7 +241,7 @@ camel_kolab_imapx_metadata_update (CamelKolabImapxMetadata *kmd,
                                    camel_imapx_metadata_proto_t proto)
 {
 	/* TODO better error reporting */
-	
+
 	CamelImapxMetadataAnnotation *man = NULL;
 	CamelKolabImapxFolderMetadata *kfmd = NULL;
 	GHashTableIter mbox_iter;
@@ -260,7 +264,7 @@ camel_kolab_imapx_metadata_update (CamelKolabImapxMetadata *kmd,
 			(man,
 			 proto,
 			 &tmp_err);
-			 
+
 		if (kfmd == NULL) {
 			g_warning ("%s: kolab annotation error for [%s]: %s",
 			           __func__, foldername, tmp_err->message);
diff --git a/src/camel/camel-kolab-imapx-provider.c b/src/camel/camel-kolab-imapx-provider.c
index dafa4d0..1087216 100644
--- a/src/camel/camel-kolab-imapx-provider.c
+++ b/src/camel/camel-kolab-imapx-provider.c
@@ -90,8 +90,8 @@ static CamelProvider kolab_imapx_provider = {	/* http://www.go-evolution.org/Cam
 	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE | \
 	CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_SUPPORTS_SSL,
 
- 	/* TODO customize for kolab2 */
- 	CAMEL_URL_NEED_USER | CAMEL_URL_NEED_HOST | CAMEL_URL_NEED_AUTH,
+	/* TODO customize for kolab2 */
+	CAMEL_URL_NEED_USER | CAMEL_URL_NEED_HOST | CAMEL_URL_NEED_AUTH,
 
 	kolab_imapx_conf_entries,
 
@@ -133,9 +133,9 @@ camel_kolab_imapx_provider_module_init (void)
 	kolab_imapx_provider.translation_domain = GETTEXT_PACKAGE;
 
 	/* TODO
-	bindtextdomain (GETTEXT_PACKAGE, KOLAB_LOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	*/
+	 * bindtextdomain (GETTEXT_PACKAGE, KOLAB_LOCALEDIR);
+	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	 */
 	g_assert (kolab_imapx_provider.object_types[CAMEL_PROVIDER_STORE] != G_TYPE_INVALID);
 	g_debug ("%s: done", __func__);
 }
diff --git a/src/camel/camel-kolab-imapx-server.c b/src/camel/camel-kolab-imapx-server.c
index 24bea39..47c98e1 100644
--- a/src/camel/camel-kolab-imapx-server.c
+++ b/src/camel/camel-kolab-imapx-server.c
@@ -25,6 +25,10 @@
 
 /*----------------------------------------------------------------------------*/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 
 #include "camel-kolab-imapx-store.h"
diff --git a/src/camel/camel-kolab-imapx-settings.c b/src/camel/camel-kolab-imapx-settings.c
index b4271c7..00807c1 100644
--- a/src/camel/camel-kolab-imapx-settings.c
+++ b/src/camel/camel-kolab-imapx-settings.c
@@ -1,30 +1,34 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /***************************************************************************
-*            camel-kolab-imapx-settings.c
-*
-*  2011-12-02, 19:11:12
-*  Copyright 2011, Christian Hilberg
-*  <hilberg unix-ag org>
-****************************************************************************/
+ *            camel-kolab-imapx-settings.c
+ *
+ *  2011-12-02, 19:11:12
+ *  Copyright 2011, Christian Hilberg
+ *  <hilberg unix-ag org>
+ ****************************************************************************/
 
 /*
-* This program 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; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This program 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 main.c; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
-*/
+ * This program 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; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This program 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 main.c; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ */
 
 /*----------------------------------------------------------------------------*/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "camel-kolab-imapx-settings.h"
 
 /*----------------------------------------------------------------------------*/
@@ -75,7 +79,7 @@ camel_kolab_imapx_settings_finalize (GObject *object)
 	priv = CAMEL_KOLAB_IMAPX_SETTINGS_PRIVATE (self);
 
 	priv->foo = 0; /* FIXME */
-	
+
 	G_OBJECT_CLASS (camel_kolab_imapx_settings_parent_class)->finalize (object);
 }
 
diff --git a/src/camel/camel-kolab-imapx-settings.h b/src/camel/camel-kolab-imapx-settings.h
index 84cb814..5faf6f5 100644
--- a/src/camel/camel-kolab-imapx-settings.h
+++ b/src/camel/camel-kolab-imapx-settings.h
@@ -1,27 +1,27 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /***************************************************************************
-*            camel-kolab-imapx-settings.h
-*
-*  2011-12-02, 19:11:11
-*  Copyright 2011, Christian Hilberg
-*  <hilberg unix-ag org>
-****************************************************************************/
+ *            camel-kolab-imapx-settings.h
+ *
+ *  2011-12-02, 19:11:11
+ *  Copyright 2011, Christian Hilberg
+ *  <hilberg unix-ag org>
+ ****************************************************************************/
 
 /*
-* This program 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; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This program 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 main.c; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
-*/
+ * This program 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; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This program 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 main.c; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ */
 
 /*----------------------------------------------------------------------------*/
 
@@ -42,21 +42,21 @@
 
 #define CAMEL_TYPE_KOLAB_IMAPX_SETTINGS	  \
 	(camel_kolab_imapx_settings_get_type ())
-#define CAMEL_KOLAB_IMAPX_SETTINGS(obj) \
+#define CAMEL_KOLAB_IMAPX_SETTINGS(obj)	  \
 	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), CAMEL_TYPE_KOLAB_IMAPX_SETTINGS, CamelKolabIMAPXSettings))
-#define CAMEL_KOLAB_IMAPX_SETTINGS_CLASS(klass) \
+	 ((obj), CAMEL_TYPE_KOLAB_IMAPX_SETTINGS, CamelKolabIMAPXSettings))
+#define CAMEL_KOLAB_IMAPX_SETTINGS_CLASS(klass)	  \
 	(G_TYPE_CHECK_CLASS_CAST \
-	((klass), CAMEL_TYPE_KOLAB_IMAPX_SETTINGS, CamelKolabIMAPXSettingsClass))
-#define CAMEL_IS_KOLAB_IMAPX_SETTINGS(obj) \
+	 ((klass), CAMEL_TYPE_KOLAB_IMAPX_SETTINGS, CamelKolabIMAPXSettingsClass))
+#define CAMEL_IS_KOLAB_IMAPX_SETTINGS(obj)	  \
 	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), CAMEL_TYPE_KOLAB_IMAPX_SETTINGS))
-#define CAMEL_IS_KOLAB_IMAPX_SETTINGS_CLASS(klass) \
+	 ((obj), CAMEL_TYPE_KOLAB_IMAPX_SETTINGS))
+#define CAMEL_IS_KOLAB_IMAPX_SETTINGS_CLASS(klass)	  \
 	(G_TYPE_CHECK_CLASS_TYPE \
-	((klass), CAMEL_TYPE_KOLAB_IMAPX_SETTINGS))
-#define CAMEL_KOLAB_IMAPX_SETTINGS_GET_CLASS(obj) \
+	 ((klass), CAMEL_TYPE_KOLAB_IMAPX_SETTINGS))
+#define CAMEL_KOLAB_IMAPX_SETTINGS_GET_CLASS(obj)	  \
 	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), CAMEL_TYPE_KOLAB_IMAPX_SETTINGS, CamelKolabIMAPXSettingsClass))
+	 ((obj), CAMEL_TYPE_KOLAB_IMAPX_SETTINGS, CamelKolabIMAPXSettingsClass))
 
 G_BEGIN_DECLS
 
diff --git a/src/camel/camel-kolab-imapx-transport.c b/src/camel/camel-kolab-imapx-transport.c
index 1131808..5fbafbf 100644
--- a/src/camel/camel-kolab-imapx-transport.c
+++ b/src/camel/camel-kolab-imapx-transport.c
@@ -25,6 +25,10 @@
 
 /*----------------------------------------------------------------------------*/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "camel-kolab-imapx-transport.h"
 
 /*----------------------------------------------------------------------------*/
diff --git a/src/camel/camel-kolab-session.c b/src/camel/camel-kolab-session.c
index 363ae63..18123a8 100644
--- a/src/camel/camel-kolab-session.c
+++ b/src/camel/camel-kolab-session.c
@@ -34,6 +34,10 @@
 
 /*----------------------------------------------------------------------------*/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <nss/pk11func.h>
 #include <nspr/prtypes.h>
 
@@ -106,7 +110,7 @@ camel_kolab_session_class_init (CamelKolabSessionClass *klass)
 	camel_session_class->forward_to = parent_class->forward_to;
 
 	/* virtual method override */
-        camel_session_class->get_password = camel_kolab_session_get_password;
+	camel_session_class->get_password = camel_kolab_session_get_password;
 	camel_session_class->forget_password = camel_kolab_session_forget_password;
 }
 
@@ -116,25 +120,25 @@ camel_kolab_session_get_type (void)
 	/* TODO might need another mechanism than 'static'
 	 *      when dealing with multiple session instances
 	 */
-        static CamelType camel_kolab_session_type = CAMEL_INVALID_TYPE;
+	static CamelType camel_kolab_session_type = CAMEL_INVALID_TYPE;
 
 	/* TODO check whether one single KolabSession type
 	 *      is okay (it should, as all Camel.Providers
 	 *      we use will be IMAPX providers under the hood)
 	 */
-        if (camel_kolab_session_type == CAMEL_INVALID_TYPE) {
-                camel_kolab_session_type = camel_type_register (
-                        camel_session_get_type (),
-                        "CamelKolabSession",
-                        sizeof (CamelKolabSession),
-                        sizeof (CamelKolabSessionClass),
-                        (CamelObjectClassInitFunc) camel_kolab_session_class_init,
-                        NULL,
-                        (CamelObjectInitFunc) camel_kolab_session_init,
-                        (CamelObjectFinalizeFunc) camel_kolab_session_finalize);
-        }
-
-        return camel_kolab_session_type;
+	if (camel_kolab_session_type == CAMEL_INVALID_TYPE) {
+		camel_kolab_session_type = \
+			camel_type_register (camel_session_get_type (),
+			                     "CamelKolabSession",
+			                     sizeof (CamelKolabSession),
+			                     sizeof (CamelKolabSessionClass),
+			                     (CamelObjectClassInitFunc) camel_kolab_session_class_init,
+			                     NULL,
+			                     (CamelObjectInitFunc) camel_kolab_session_init,
+			                     (CamelObjectFinalizeFunc) camel_kolab_session_finalize);
+	}
+
+	return camel_kolab_session_type;
 }
 
 /*----------------------------------------------------------------------------*/
@@ -262,7 +266,7 @@ camel_kolab_session_bringup (CamelKolabSession *self,
 		             __func__);
 		return FALSE;
 	}
-        camel_session_construct (CAMEL_SESSION (self), self->data_dir);
+	camel_session_construct (CAMEL_SESSION (self), self->data_dir);
 
 	/* TODO junk settings */
 
@@ -311,7 +315,7 @@ const gchar*
 camel_kolab_session_get_data_dir (CamelKolabSession *self)
 {
 	g_assert (CAMEL_KOLAB_IS_SESSION (self));
-        return self->data_dir;
+	return self->data_dir;
 }
 
 void
@@ -331,7 +335,7 @@ const gchar*
 camel_kolab_session_get_config_dir (CamelKolabSession *self)
 {
 	g_assert (CAMEL_KOLAB_IS_SESSION (self));
-        return self->config_dir;
+	return self->config_dir;
 }
 
 /*----------------------------------------------------------------------------*/
diff --git a/src/camel/camel-kolab-session.h b/src/camel/camel-kolab-session.h
index 8506591..2a74dec 100644
--- a/src/camel/camel-kolab-session.h
+++ b/src/camel/camel-kolab-session.h
@@ -63,7 +63,7 @@
 G_BEGIN_DECLS
 
 typedef struct _CamelKolabSession {
-        CamelSession parent_instance;
+	CamelSession parent_instance;
 
 	gchar *data_dir;
 	gchar *config_dir;
@@ -73,7 +73,7 @@ typedef struct _CamelKolabSession {
 } CamelKolabSession;
 
 typedef struct _CamelKolabSessionClass {
-        CamelSessionClass parent_class;
+	CamelSessionClass parent_class;
 	/* TODO check what else is needed here */
 
 } CamelKolabSessionClass;
diff --git a/src/camel/camel-kolab-stream.c b/src/camel/camel-kolab-stream.c
index 5ee824c..973e1c8 100644
--- a/src/camel/camel-kolab-stream.c
+++ b/src/camel/camel-kolab-stream.c
@@ -49,9 +49,9 @@ camel_kolab_stream_new_filestream (const gchar *filename,
 	g_return_val_if_fail (err == NULL || *err == NULL, NULL);
 
 	stream = camel_stream_fs_new_with_name (filename,
-						flags,
-						mode,
-						&tmp_err);
+	                                        flags,
+	                                        mode,
+	                                        &tmp_err);
 
 	if (tmp_err != NULL) {
 		g_propagate_error (err, tmp_err);
@@ -80,8 +80,8 @@ camel_kolab_stream_new_httpstream (CamelSession *session,
 	}
 
 	stream = camel_http_stream_new(CAMEL_HTTP_METHOD_GET,
-				       session,
-				       url);
+	                               session,
+	                               url);
 	if (stream == NULL) {
 		g_debug ("%s: CamelHttpStream is NULL", __func__);
 		goto done;
@@ -89,9 +89,9 @@ camel_kolab_stream_new_httpstream (CamelSession *session,
 
 	/* TODO use better agent version string here */
 	camel_http_stream_set_user_agent((CamelHttpStream *)stream,
-					 "CamelHttpStream/1.0 Evolution-kolab/" VERSION);
+	                                 "CamelHttpStream/1.0 Evolution-kolab/" VERSION);
 
-done:
+ done:
 	if (url != NULL)
 		camel_url_free (url);
 	if (tmp_err != NULL) {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]