[evolution-data-server] Coding style and whitespace cleanup.

[Matthew Barnes <mbarnes src gnome org>]

commit 7355227d37b0ee9d5b67cac11391ff7e696625de
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jul 11 11:34:36 2010 -0400

    Coding style and whitespace cleanup.

 addressbook/backends/ldap/e-book-backend-ldap.c    |    1 -
 addressbook/libebook/e-book.c                      |   39 +++++++++++-----
 addressbook/libebook/e-error.h                     |   45 +++++++++---------
 calendar/libecal/e-cal.c                           |    2 +-
 camel/camel-lock-client.c                          |    2 +-
 camel/camel.c                                      |    7 +--
 camel/providers/imapx/camel-imapx-server.c         |   48 +++++++++----------
 camel/providers/imapx/camel-imapx-server.h         |    3 +-
 camel/providers/imapx/camel-imapx-utils.c          |    1 -
 camel/providers/imapx/camel-imapx-utils.h          |    2 +-
 .../libecal/tmpl/e-cal-check-timezones.sgml        |    1 +
 .../reference/camel/tmpl/camel-cipher-context.sgml |    2 +
 libedataserverui/e-name-selector.c                 |    1 -
 libedataserverui/gtk-compat.h                      |    2 +-
 14 files changed, 83 insertions(+), 73 deletions(-)
---
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 2cf6c85..96d701e 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -4388,7 +4388,6 @@ ldap_search_handler (LDAPOp *op, LDAPMessage *res)
 				"LDAP error 0x%x (%s)", ldap_error,
 				ldap_err2string (ldap_error) ? ldap_err2string (ldap_error) : "Unknown error");
 
-
 		e_data_book_view_notify_complete (view, edb_err);
 		if (edb_err)
 			g_error_free (edb_err);
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index d489253..5dd73a8 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -453,6 +453,7 @@ e_book_async_add_contact (EBook                 *book,
  * Adds @contact to @book without blocking.
  *
  * Returns: %TRUE if the operation was started, %FALSE otherwise.
+ *
  * Since: 3.0
  **/
 gboolean
@@ -594,13 +595,14 @@ e_book_async_commit_contact (EBook                 *book,
  * @book without blocking.
  *
  * Returns: %TRUE if the operation was started, %FALSE otherwise.
+ *
  * Since: 3.0
  **/
 gboolean
 e_book_async_commit_contact_ex (EBook                 *book,
-			        EContact              *contact,
-			        EBookExCallback        cb,
-			        gpointer               closure)
+                                EContact              *contact,
+                                EBookExCallback        cb,
+                                gpointer               closure)
 {
 	gchar *vcard;
 	AsyncData *data;
@@ -741,6 +743,7 @@ e_book_async_get_required_fields (EBook              *book,
  * all contacts in this @book. This function does not block.
  *
  * Returns: %TRUE if the operation was started, %FALSE otherwise.
+ *
  * Since: 3.0
  **/
 gboolean
@@ -884,6 +887,7 @@ e_book_async_get_supported_fields (EBook              *book,
  * function does not block.
  *
  * Returns: %TRUE if successful, %FALSE otherwise.
+ *
  * Since: 3.0
  **/
 gboolean
@@ -1026,6 +1030,7 @@ e_book_async_get_supported_auth_methods (EBook              *book,
  * This function does not block.
  *
  * Returns: %TRUE if successful, %FALSE otherwise.
+ *
  * Since: 3.0
  **/
 gboolean
@@ -1172,6 +1177,7 @@ e_book_async_authenticate_user (EBook                 *book,
  * This function does not block.
  *
  * Returns: %FALSE if successful, %TRUE otherwise.
+ *
  * Since: 3.0
  **/
 gboolean
@@ -1316,6 +1322,7 @@ e_book_async_get_contact (EBook                 *book,
  * Retrieves a contact specified by @id from @book.
  *
  * Returns: %FALSE if successful, %TRUE otherwise
+ *
  * Since: 3.0
  **/
 gboolean
@@ -1489,13 +1496,14 @@ e_book_async_remove_contact (EBook                 *book,
  * Removes @contact from @book.
  *
  * Returns: %TRUE if successful, %FALSE otherwise
+ *
  * Since: 3.0
  **/
 gboolean
 e_book_async_remove_contact_ex (EBook                 *book,
-			        EContact              *contact,
-			        EBookExCallback        cb,
-			        gpointer               closure)
+                                EContact              *contact,
+                                EBookExCallback        cb,
+                                gpointer               closure)
 {
 	AsyncData *data;
 	const gchar *l[2];
@@ -1598,6 +1606,7 @@ e_book_async_remove_contact_by_id (EBook                 *book,
  * Removes the contact with id @id from @book.
  *
  * Returns: %TRUE if successful, %FALSE otherwise
+ *
  * Since: 3.0
  **/
 gboolean
@@ -1719,13 +1728,14 @@ e_book_async_remove_contacts (EBook                 *book,
  * as a batch request.
  *
  * Returns: %TRUE if successful, %FALSE otherwise
+ *
  * Since: 3.0
  **/
 gboolean
 e_book_async_remove_contacts_ex (EBook                 *book,
-			         GList                 *ids,
-			         EBookExCallback        cb,
-			         gpointer               closure)
+                                 GList                 *ids,
+                                 EBookExCallback        cb,
+                                 gpointer               closure)
 {
 	AsyncData *data;
 	gchar **l;
@@ -1918,6 +1928,7 @@ e_book_async_get_book_view (EBook                 *book,
  * specified by @requested_fields and limited at @max_results records.
  *
  * Returns: %FALSE if successful, %TRUE otherwise
+ *
  * Since: 3.0
  **/
 gboolean
@@ -2086,6 +2097,7 @@ e_book_async_get_contacts (EBook             *book,
  * Query @book with @query.
  *
  * Returns: %FALSE on success, %TRUE otherwise
+ *
  * Since: 3.0
  **/
 gboolean
@@ -2261,6 +2273,7 @@ e_book_async_get_changes (EBook             *book,
  * for a given change ID.
  *
  * Returns: TRUE on success, FALSE otherwise
+ *
  * Since: 3.0
  */
 gboolean
@@ -2476,6 +2489,7 @@ e_book_async_open (EBook                 *book,
  * This function does not block.
  *
  * Returns: %FALSE if successful, %TRUE otherwise.
+ *
  * Since: 3.0
  **/
 gboolean
@@ -2600,12 +2614,13 @@ e_book_async_remove (EBook   *book,
  * deletes the database file. You cannot get it back!
  *
  * Returns: %FALSE if successful, %TRUE otherwise.
+ *
  * Since: 3.0
  **/
 gboolean
 e_book_async_remove_ex (EBook   *book,
-		        EBookExCallback cb,
-		        gpointer closure)
+                        EBookExCallback cb,
+                        gpointer closure)
 {
 	AsyncData *data;
 
@@ -3334,7 +3349,7 @@ e_book_new_default_addressbook   (GError **error)
 static gboolean
 strcaseequal_no_underscore (const gchar *str1, const gchar *str2)
 {
-	int i, j;
+	gint i, j;
 
 	if (!str1 || !str2)
 		return FALSE;
diff --git a/addressbook/libebook/e-error.h b/addressbook/libebook/e-error.h
index dae4bd4..c4addae 100644
--- a/addressbook/libebook/e-error.h
+++ b/addressbook/libebook/e-error.h
@@ -13,13 +13,13 @@
 		"file %s: line %d (%s): assertion `%s' failed",		\
 		__FILE__,						\
 		__LINE__,						\
-		G_STRFUNC,					\
+		G_STRFUNC,						\
 		#expr);							\
-	 g_set_error (error, E_BOOK_ERROR, (error_code),                \
+	 g_set_error (error, E_BOOK_ERROR, (error_code),		\
 		"file %s: line %d (%s): assertion `%s' failed",		\
 		__FILE__,						\
 		__LINE__,						\
-		G_STRFUNC,					\
+		G_STRFUNC,						\
 		#expr);							\
 	 return FALSE;							\
        };				}G_STMT_END
@@ -44,33 +44,32 @@
     }                                                            \
   } G_STMT_END                                                   \
 
-
-#define e_return_ex_async_error_if_fail(expr, error) G_STMT_START { 	\
-    if G_LIKELY (expr) {} else {                                 	\
-      GError *err;						 	\
-      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,                 	\
-             "file %s: line %d (%s): assertion `%s' failed",     	\
-             __FILE__, __LINE__, G_STRFUNC, #expr);    			\
-      err = g_error_new (E_BOOK_ERROR, (error),                		\
+#define e_return_ex_async_error_if_fail(expr, error) G_STMT_START {	\
+    if G_LIKELY (expr) {} else {					\
+      GError *err;							\
+      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,			\
+             "file %s: line %d (%s): assertion `%s' failed",		\
+             __FILE__, __LINE__, G_STRFUNC, #expr);			\
+      err = g_error_new (E_BOOK_ERROR, (error),				\
 		"file %s: line %d (%s): assertion `%s' failed",		\
 		__FILE__, __LINE__, G_STRFUNC, #expr);			\
-      cb (book, err, closure);                           		\
+      cb (book, err, closure);					\
       g_error_free (err);						\
-      return FALSE;                                                  	\
-    }                                                            	\
+      return FALSE;							\
+    }								\
   } G_STMT_END
 
 #define e_return_ex_async_error_val_if_fail(expr, error) G_STMT_START {	\
-    if G_LIKELY (expr) {} else {                                 	\
-      GError *err;						 	\
-      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,                 	\
-             "file %s: line %d (%s): assertion `%s' failed",     	\
-             __FILE__, __LINE__, G_STRFUNC, #expr);    			\
-      err = g_error_new (E_BOOK_ERROR, (error),                		\
+    if G_LIKELY (expr) {} else {					\
+      GError *err;							\
+      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,			\
+             "file %s: line %d (%s): assertion `%s' failed",		\
+             __FILE__, __LINE__, G_STRFUNC, #expr);			\
+      err = g_error_new (E_BOOK_ERROR, (error),				\
 		"file %s: line %d (%s): assertion `%s' failed",		\
 		__FILE__, __LINE__, G_STRFUNC, #expr);			\
-      cb (book, err, NULL, closure);                           		\
+      cb (book, err, NULL, closure);					\
       g_error_free (err);						\
-      return 0;                                                  	\
-    }                                                            	\
+      return 0;							\
+    }								\
   } G_STMT_END
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index 6d28626..195095f 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -1170,7 +1170,7 @@ async_signal_idle_cb (DBusGProxy *proxy, GError *error, gpointer user_data)
 	if (error) {
 	#ifndef E_CAL_DISABLE_DEPRECATED
 		status = get_status_from_error (error);
-		
+
 	} else {
 		status = E_CALENDAR_STATUS_OK;
 	#endif
diff --git a/camel/camel-lock-client.c b/camel/camel-lock-client.c
index 60c4fe8..b669b82 100644
--- a/camel/camel-lock-client.c
+++ b/camel/camel-lock-client.c
@@ -225,7 +225,7 @@ again:
 				error, CAMEL_ERROR,
 				CAMEL_ERROR_GENERIC,
 				_("Could not lock '%s'"), path);
-			d(printf("locking failed ! status = %d\n", msg->id));
+			d(printf("locking failed !status = %d\n", msg->id));
 			break;
 		}
 	} else if (retry > 0) {
diff --git a/camel/camel.c b/camel/camel.c
index 8cd60d1..6dadaad 100644
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -64,15 +64,15 @@ gint camel_application_is_exiting = FALSE;
 static gint
 nss_has_system_db(void)
 {
-	int found = FALSE;
+	gint found = FALSE;
 #ifndef G_OS_WIN32
 	FILE *f;
-	char buf[80];
+	gchar buf[80];
 
 	f = fopen(NSS_SYSTEM_DB "/pkcs11.txt", "r");
 	if (!f)
 		return FALSE;
-		
+
 	/* Check whether the system NSS db is actually enabled */
 	while (fgets(buf, 80, f) && !found) {
 		if (!strcmp(buf, "library=libnsssysinit.so\n"))
@@ -144,7 +144,6 @@ camel_init (const gchar *configdir, gboolean nss_init)
 #endif
 		}
 
-
 #if NSS_VMAJOR > 3 || (NSS_VMAJOR == 3 && NSS_VMINOR >= 12)
 		/* See: https://wiki.mozilla.org/NSS_Shared_DB,
 		 * particularly "Mode 3A".  Note that the target
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index ec05ebd..d62e417 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -659,7 +659,7 @@ imapx_command_addv(CamelIMAPXCommand *ic, const gchar *fmt, va_list ap)
 					if (encoded) {
 						s = encoded;
 						goto output_string;
-					} else 
+					} else
 						camel_stream_write((CamelStream *)ic->mem, "\"\"", 2, NULL);
 
 					break;
@@ -757,7 +757,7 @@ camel_imapx_command_free(CamelIMAPXCommand *ic)
 	if (ic->mem)
 		g_object_unref (ic->mem);
 	imapx_free_status(ic->status);
- 
+
 	while ((cp = ((CamelIMAPXCommandPart *)camel_dlist_remhead(&ic->parts)))) {
 		g_free(cp->data);
 		if (cp->ob) {
@@ -1092,7 +1092,7 @@ imapx_job_matches (CamelFolder *folder, CamelIMAPXJob *job, guint32 type, const
 {
 	switch (job->type) {
 		case IMAPX_JOB_GET_MESSAGE:
-			if (folder == job->folder && 
+			if (folder == job->folder &&
 			    strcmp(job->u.get_message.uid, uid) == 0)
 				return TRUE;
 			break;
@@ -1267,7 +1267,7 @@ imapx_untagged(CamelIMAPXServer *imap, GError **error)
 	case IMAPX_VANISHED: {
 		GPtrArray *uids;
 		gboolean unsolicited = TRUE;
-		int i;
+		gint i;
 		guint len;
 		guchar *token;
 		gint tok;
@@ -1582,7 +1582,7 @@ imapx_untagged(CamelIMAPXServer *imap, GError **error)
 				path_name = camel_imapx_store_summary_full_to_path(s, sinfo->name, ns->sep);
 				c(printf("Got folder path '%s' for full '%s'\n", path_name, sinfo->name));
 				if (path_name) {
-					ifolder = (void *)camel_store_get_folder(imap->store, path_name, 0, error);
+					ifolder = (gpointer)camel_store_get_folder(imap->store, path_name, 0, error);
 					g_free (path_name);
 				}
 			}
@@ -1752,7 +1752,7 @@ imapx_continuation(CamelIMAPXServer *imap, gboolean litplus, GError **error)
 
 		if (camel_imapx_stream_text (imap->stream, &token, error))
 			return -1;
-		    
+
 		resp = camel_sasl_challenge_base64((CamelSasl *)cp->ob, (const gchar *) token, error);
 		g_free(token);
 		if (resp == NULL)
@@ -1936,7 +1936,7 @@ imapx_command_run (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 
 	while (ic->status == NULL && ic->error == NULL)
 		imapx_step(is, &ic->error);
-	
+
 	if (is->literal == ic)
 		is->literal = NULL;
 
@@ -2058,7 +2058,6 @@ imapx_submit_job (CamelIMAPXServer *is,
 /* ********************************************************************** */
 // IDLE support
 
-
 /*TODO handle negative cases sanely */
 static gboolean
 imapx_command_idle_stop (CamelIMAPXServer *is, GError **error)
@@ -2196,7 +2195,7 @@ imapx_idle_thread (gpointer data)
 				continue;
 			}
 			IDLE_UNLOCK(is->idle);
-			camel_imapx_server_idle (is, (void *)ifolder, &local_error);
+			camel_imapx_server_idle (is, (gpointer)ifolder, &local_error);
 
 			if (local_error == NULL && ifolder->exists_on_server >
 			    camel_folder_summary_count (((CamelFolder *) ifolder)->summary) && imapx_is_command_queue_empty (is))
@@ -2226,13 +2225,13 @@ static gboolean
 imapx_stop_idle (CamelIMAPXServer *is, GError **error)
 {
 	CamelIMAPXIdle *idle = is->idle;
-	int stopped = FALSE;
+	gint stopped = FALSE;
 	time_t now;
 
 	time(&now);
 	IDLE_LOCK (idle);
 
-	switch(idle->state) {
+	switch (idle->state) {
 	case IMAPX_IDLE_ISSUED:
 		idle->state = IMAPX_IDLE_CANCEL;
 	case IMAPX_IDLE_CANCEL:
@@ -2501,13 +2500,13 @@ imapx_select (CamelIMAPXServer *is, CamelFolder *folder, gboolean forced, GError
 			camel_imapx_command_add(ic, " (QRESYNC (%" G_GUINT64_FORMAT " %" G_GUINT64_FORMAT " %s:*", ifolder->uidvalidity_on_server, isum->modseq, uid);
 
 			if (total > 10) {
-				int i;
+				gint i;
 				GString *seqs, *uids;
 
 				seqs = g_string_new(" ");
 				uids = g_string_new(")");
 
-				/* Include some seq/uid pairs to avoid a huge VANISHED list 
+				/* Include some seq/uid pairs to avoid a huge VANISHED list
 				   (see RFC5162 §3.1). Work backwards exponentially from the
 				   end of the mailbox, starting with the message 9 from the
 				   end, then 27 from the end, then 81 from the end... */
@@ -2529,7 +2528,7 @@ imapx_select (CamelIMAPXServer *is, CamelFolder *folder, gboolean forced, GError
 					   the summary starts from zero. */
 					sprintf(buf, "%d", total - i + 1);
 					g_string_prepend(seqs, buf);
- 					g_string_prepend(uids, camel_folder_summary_uid_from_index(folder->summary, total - i));
+					g_string_prepend(uids, camel_folder_summary_uid_from_index(folder->summary, total - i));
 				} while (i < total);
 
 				g_string_prepend(seqs, " (");
@@ -2537,7 +2536,7 @@ imapx_select (CamelIMAPXServer *is, CamelFolder *folder, gboolean forced, GError
 				c(printf("adding QRESYNC seq/uidset %s%s\n", seqs->str, uids->str));
 				camel_imapx_command_add(ic, seqs->str);
 				camel_imapx_command_add(ic, uids->str);
-				
+
 				g_string_free(seqs, TRUE);
 				g_string_free(uids, TRUE);
 
@@ -2662,7 +2661,7 @@ connect_to_server_process (CamelIMAPXServer *is, const gchar *cmd, GError **erro
 
 	return TRUE;
 }
-#endif /* !G_OS_WIN32 */
+#endif /* G_OS_WIN32 */
 
 gboolean
 imapx_connect_to_server (CamelIMAPXServer *is, GError **error)
@@ -2695,7 +2694,7 @@ imapx_connect_to_server (CamelIMAPXServer *is, GError **error)
 		else
 			goto connected;
 	}
-#endif		
+#endif
 	if (is->url->port) {
 		serv = g_alloca(16);
 		sprintf((gchar *) serv, "%d", is->url->port);
@@ -2779,7 +2778,7 @@ imapx_connect_to_server (CamelIMAPXServer *is, GError **error)
 				"Connection to server cancelled\n");
 			return FALSE;
 		}
-			
+
 		tok = camel_imapx_stream_token (is->stream, &token, &len, error);
 		if (tok < 0)
 			return FALSE;
@@ -3121,7 +3120,7 @@ imapx_command_fetch_message_done(CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 		gsize really_fetched = CAMEL_SEEKABLE_STREAM(job->u.get_message.stream)->position;
 		/* Don't automatically stop when we reach the reported message
 		   size -- some crappy servers (like Microsoft Exchange) have
-		   a tendency to lie about it. Keep going (one request at a 
+		   a tendency to lie about it. Keep going (one request at a
 		   time) until the data actually stop coming. */
 		if (job->u.get_message.fetch_offset < job->u.get_message.size ||
 		    job->u.get_message.fetch_offset == really_fetched) {
@@ -3356,7 +3355,7 @@ imapx_command_append_message_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 
 				/* should we update the message count ? */
 				camel_folder_summary_add (job->folder->summary, mi);
-				imapx_set_message_info_flags_for_new_message (mi, 
+				imapx_set_message_info_flags_for_new_message (mi,
 									      ((CamelMessageInfoBase *)job->u.append_message.info)->flags,
 									      ((CamelMessageInfoBase *)job->u.append_message.info)->user_flags,
 									      job->folder);
@@ -3895,7 +3894,7 @@ imapx_job_refresh_info_start (CamelIMAPXServer *is, CamelIMAPXJob *job)
 	    folder->summary->unread_count != ifolder->unread_on_server ||
 	    (!is_selected && isum->modseq != ifolder->modseq_on_server))
 		need_rescan = TRUE;
-	
+
 	/* This is probably the first check of this folder after startup;
 	   use STATUS to check whether the cached summary is valid, rather
 	   than blindly updating. Only for servers which support CONDSTORE
@@ -3906,7 +3905,7 @@ imapx_job_refresh_info_start (CamelIMAPXServer *is, CamelIMAPXJob *job)
 	/* If we don't think there's anything to do, poke it to check */
 	if (!need_rescan) {
 		CamelIMAPXCommand *ic;
-		
+
 		if (is_selected) {
 			/* We may not issue STATUS on the current folder. Use SELECT or NOOP instead. */
 			if (0 /* server needs SELECT not just NOOP*/) {
@@ -3928,7 +3927,7 @@ imapx_job_refresh_info_start (CamelIMAPXServer *is, CamelIMAPXJob *job)
 				ic = camel_imapx_command_new (is, "STATUS", NULL, "STATUS %f (MESSAGES UNSEEN UIDVALIDITY UIDNEXT HIGHESTMODSEQ)", folder);
 			else
 				ic = camel_imapx_command_new (is, "STATUS", NULL, "STATUS %f (MESSAGES UNSEEN UIDVALIDITY UIDNEXT)", folder);
-		
+
 			ic->job = job;
 			ic->pri = job->pri;
 
@@ -4807,7 +4806,6 @@ camel_imapx_server_class_init(CamelIMAPXServerClass *class)
 		g_cclosure_marshal_VOID__VOID,
 		G_TYPE_NONE, 0);
 
-
 	class->tagprefix = 'A';
 }
 
@@ -5575,7 +5573,7 @@ camel_imapx_server_get_job_queue_info (CamelIMAPXServer *is)
 			g_hash_table_insert (jinfo->folders, g_strdup (full_name), GINT_TO_POINTER (1));
 		}
 	}
-	
+
 	QUEUE_UNLOCK(is);
 
 	return jinfo;
diff --git a/camel/providers/imapx/camel-imapx-server.h b/camel/providers/imapx/camel-imapx-server.h
index 2713c6b..a23d0b2 100644
--- a/camel/providers/imapx/camel-imapx-server.h
+++ b/camel/providers/imapx/camel-imapx-server.h
@@ -136,7 +136,6 @@ struct _CamelIMAPXServerClass {
 	gchar tagprefix;
 };
 
-
 GType		camel_imapx_server_get_type	(void);
 CamelIMAPXServer *
 		camel_imapx_server_new		(CamelStore *store,
@@ -197,7 +196,7 @@ gboolean	camel_imapx_server_rename_folder(CamelIMAPXServer *is,
 						 const gchar *old_name,
 						 const gchar *new_name,
 						 GError **error);
-struct _IMAPXJobQueueInfo *	
+struct _IMAPXJobQueueInfo *
 		camel_imapx_server_get_job_queue_info
 						(CamelIMAPXServer *is);
 
diff --git a/camel/providers/imapx/camel-imapx-utils.c b/camel/providers/imapx/camel-imapx-utils.c
index 77d746d..dd65099 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -1338,7 +1338,6 @@ imapx_parse_modseq(CamelIMAPXStream *is, GError **error)
 	guint len;
 	guchar *token;
 
-	
 	tok = camel_imapx_stream_token(is, &token, &len, NULL);
 	if (tok != '(') {
 		g_set_error (error, CAMEL_IMAPX_ERROR, 1, "fetch: expecting '('");
diff --git a/camel/providers/imapx/camel-imapx-utils.h b/camel/providers/imapx/camel-imapx-utils.h
index f60e0d8..08d11ae 100644
--- a/camel/providers/imapx/camel-imapx-utils.h
+++ b/camel/providers/imapx/camel-imapx-utils.h
@@ -215,7 +215,7 @@ typedef struct _IMAPXJobQueueInfo {
 
 	/* list of folders for which jobs are in the queue */
 	GHashTable *folders;
-} IMAPXJobQueueInfo;	
+} IMAPXJobQueueInfo;
 
 void camel_imapx_server_destroy_job_queue_info (IMAPXJobQueueInfo *jinfo);
 
diff --git a/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml b/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
index 7f919b9..0a7e321 100644
--- a/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
+++ b/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
@@ -51,6 +51,7 @@ e-cal-check-timezones
 @const gchar *tzid, gconstpointer custom, GError **error:
 @const gchar *tzid, gconstpointer custom, GError **error:
 @const gchar *tzid, gconstpointer custom, GError **error:
+ const gchar *tzid, gconstpointer custom, GError **error:
 @const gchar *tzid, gconstpointer custom, GError **error: 
 @custom: 
 @error: 
diff --git a/docs/reference/camel/tmpl/camel-cipher-context.sgml b/docs/reference/camel/tmpl/camel-cipher-context.sgml
index 2cdfa69..714e8f0 100644
--- a/docs/reference/camel/tmpl/camel-cipher-context.sgml
+++ b/docs/reference/camel/tmpl/camel-cipher-context.sgml
@@ -452,6 +452,8 @@ CamelCipherContext
 @gpointer cert_data: 
 @gpointer cert_data:
 @gpointer cert_data: 
+ gpointer cert_data:
+ gpointer cert_data: 
 @gpointer cert_data: 
 
 
diff --git a/libedataserverui/e-name-selector.c b/libedataserverui/e-name-selector.c
index ccf58c2..725fe82 100644
--- a/libedataserverui/e-name-selector.c
+++ b/libedataserverui/e-name-selector.c
@@ -326,7 +326,6 @@ e_name_selector_show_dialog (ENameSelector *name_selector,
 	gtk_widget_show (GTK_WIDGET (dialog));
 }
 
-
 /**
  * e_name_selector_peek_section_entry:
  * @name_selector: an #ENameSelector
diff --git a/libedataserverui/gtk-compat.h b/libedataserverui/gtk-compat.h
index aaabf0a..7e894e9 100644
--- a/libedataserverui/gtk-compat.h
+++ b/libedataserverui/gtk-compat.h
@@ -15,7 +15,7 @@
 #define gdk_drag_context_get_suggested_action(context) (context)->suggested_action
 #define gdk_drag_context_get_selected_action(context)  (context)->action
 
-#endif 
+#endif
 
 #if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 21 && GTK_MICRO_VERSION == 1
 #define gdk_drag_context_get_selected_action(context)  gdk_drag_context_get_action(context)