[libgsf] whitespace

[Morten Welinder <mortenw src gnome org>]

commit 153fa4f7a40eea9472f970ef9d5665d9a3caf6a8
Author: Morten Welinder <terra gnome org>
Date:   Wed Dec 7 13:35:09 2011 -0500

    whitespace

 gsf-gnome/gsf-input-bonobo.c    |    4 +-
 gsf-gnome/gsf-input-gnomevfs.c  |    2 +-
 gsf-gnome/gsf-output-bonobo.c   |    2 +-
 gsf-gnome/gsf-output-gnomevfs.c |   10 +++---
 gsf-win32/gsf-input-win32.h     |    2 +-
 gsf-win32/gsf-output-win32.h    |    2 +-
 gsf/gsf-blob.c                  |   12 +++---
 gsf/gsf-clip-data.c             |    4 +-
 gsf/gsf-doc-meta-data.c         |    4 +-
 gsf/gsf-docprop-vector.c        |    6 ++--
 gsf/gsf-impl-utils.h            |    2 +-
 gsf/gsf-infile-ar.c             |   12 +++---
 gsf/gsf-infile-ar.h             |    2 +-
 gsf/gsf-infile-impl.h           |    2 +-
 gsf/gsf-infile-msole.c          |    8 ++--
 gsf/gsf-infile-msole.h          |    2 +-
 gsf/gsf-infile-msvba.h          |    2 +-
 gsf/gsf-infile-stdio.h          |    2 +-
 gsf/gsf-infile-tar.c            |    2 +-
 gsf/gsf-infile-tar.h            |    2 +-
 gsf/gsf-infile-zip.c            |   14 ++++----
 gsf/gsf-infile-zip.h            |    2 +-
 gsf/gsf-infile.h                |    2 +-
 gsf/gsf-input-bzip.c            |   10 +++---
 gsf/gsf-input-gio.h             |    2 +-
 gsf/gsf-input-gzip.c            |    2 +-
 gsf/gsf-input-http.c            |   16 ++++----
 gsf/gsf-input-http.h            |    2 +-
 gsf/gsf-input-iochannel.c       |    2 +-
 gsf/gsf-input-stdio.c           |    2 +-
 gsf/gsf-input.c                 |   10 +++---
 gsf/gsf-io-context.c            |    2 +-
 gsf/gsf-libxml.c                |   18 +++++-----
 gsf/gsf-meta-names.h            |    8 ++--
 gsf/gsf-msole-impl.h            |    2 +-
 gsf/gsf-msole-utils.c           |   70 +++++++++++++++++++-------------------
 gsf/gsf-open-pkg-utils.c        |    4 +-
 gsf/gsf-opendoc-utils.c         |   16 ++++----
 gsf/gsf-outfile-impl.h          |    2 +-
 gsf/gsf-outfile-msole.c         |   12 +++---
 gsf/gsf-outfile-stdio.c         |    4 +-
 gsf/gsf-outfile-zip.c           |    2 +-
 gsf/gsf-output-bzip.c           |   10 +++---
 gsf/gsf-output-gio.c            |    8 ++--
 gsf/gsf-output-gio.h            |    2 +-
 gsf/gsf-output-iconv.c          |    2 +-
 gsf/gsf-output-iochannel.c      |    6 ++--
 gsf/gsf-output-memory.c         |   20 +++++-----
 gsf/gsf-output-stdio.c          |    8 ++--
 gsf/gsf-output-transaction.c    |   36 ++++++++++----------
 gsf/gsf-output-transaction.h    |    2 +-
 gsf/gsf-output.c                |    4 +-
 gsf/gsf-shared-memory.c         |    4 +-
 gsf/gsf-structured-blob.c       |    2 +-
 gsf/gsf-timestamp.c             |    6 ++--
 gsf/gsf-utils.c                 |   12 +++---
 gsf/gsf-utils.h                 |    2 +-
 gsf/gsf-zip-impl.h              |    4 +-
 python/gsfgnomemodule.c         |    4 +-
 python/gsfmodule.c              |    4 +-
 tests/test-cat-zip.c            |    2 +-
 tests/test-cp.c                 |    2 +-
 tests/test-dump-msole.c         |    4 +-
 tests/test-gio.c                |    2 +-
 tests/test-msole2.c             |    2 +-
 tests/test-msvba-zip.c          |    8 ++--
 tests/test-restore-msole.c      |    2 +-
 tests/test-xml.c                |    2 +-
 tests/test-zip-out-subdirs.c    |    2 +-
 tests/test-zip1.c               |    2 +-
 tests/test-zip2.c               |    4 +-
 thumbnailer/main.c              |    2 +-
 tools/gsf.c                     |    8 ++--
 73 files changed, 233 insertions(+), 233 deletions(-)
---
diff --git a/gsf-gnome/gsf-input-bonobo.c b/gsf-gnome/gsf-input-bonobo.c
index 2f92095..8a2eb12 100644
--- a/gsf-gnome/gsf-input-bonobo.c
+++ b/gsf-gnome/gsf-input-bonobo.c
@@ -235,7 +235,7 @@ gsf_input_bonobo_seek (GsfInput *input, gsf_off_t offset, GSeekType whence)
 		if (gib_synch_shared_ptr (binput) != 0)
 			return TRUE;
 	}
-	
+
 	switch (whence) {
 	case G_SEEK_SET :
 		bwhence =  Bonobo_Stream_SeekSet;
@@ -249,7 +249,7 @@ gsf_input_bonobo_seek (GsfInput *input, gsf_off_t offset, GSeekType whence)
 	default:
 		return TRUE;
 	}
-	
+
 
 	coffset = offset;
 	if ((gsf_off_t) coffset != offset) { /* Check for overflow */
diff --git a/gsf-gnome/gsf-input-gnomevfs.c b/gsf-gnome/gsf-input-gnomevfs.c
index 7b28a24..d36bcaa 100644
--- a/gsf-gnome/gsf-input-gnomevfs.c
+++ b/gsf-gnome/gsf-input-gnomevfs.c
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-input-gnomevfs.c: 
+ * gsf-input-gnomevfs.c:
  *
  * Copyright (C) 2002-2004 Dom Lachowicz (cinamod hotmail com)
  *
diff --git a/gsf-gnome/gsf-output-bonobo.c b/gsf-gnome/gsf-output-bonobo.c
index e88a345..821f911 100644
--- a/gsf-gnome/gsf-output-bonobo.c
+++ b/gsf-gnome/gsf-output-bonobo.c
@@ -78,7 +78,7 @@ gsf_output_bonobo_seek (GsfOutput *output, gsf_off_t offset,
 	CORBA_long	  pos;
 	CORBA_Environment ev;
 
-	g_return_val_if_fail (bonobo->stream != CORBA_OBJECT_NIL, 
+	g_return_val_if_fail (bonobo->stream != CORBA_OBJECT_NIL,
 		gsf_output_set_error (output, 0, "missing stream"));
 
 	switch (whence) {
diff --git a/gsf-gnome/gsf-output-gnomevfs.c b/gsf-gnome/gsf-output-gnomevfs.c
index bd4ea6d..764e41e 100644
--- a/gsf-gnome/gsf-output-gnomevfs.c
+++ b/gsf-gnome/gsf-output-gnomevfs.c
@@ -128,8 +128,8 @@ gsf_output_gnomevfs_new_uri (GnomeVFSURI * uri, GError **err)
 	}
 
 	if (gnome_vfs_uri_exists (uri)) {
-		/* see bug 159442 - if the file exists, we want to do our best to preserve existing 
-		 * pemissions AND truncate the file. that is, we want to emulate truncate() in case 
+		/* see bug 159442 - if the file exists, we want to do our best to preserve existing
+		 * pemissions AND truncate the file. that is, we want to emulate truncate() in case
 		 * a gnomevfs backend doesn't support it */
 		GnomeVFSFileInfo *info;
 
@@ -140,7 +140,7 @@ gsf_output_gnomevfs_new_uri (GnomeVFSURI * uri, GError **err)
 
 		if ((res == GNOME_VFS_OK) && (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS)) {
 			perms = info->permissions;
-		} 
+		}
 
 		gnome_vfs_file_info_unref (info);
 	}
@@ -154,7 +154,7 @@ gsf_output_gnomevfs_new_uri (GnomeVFSURI * uri, GError **err)
 			res = gnome_vfs_create_uri (&handle, uri, GNOME_VFS_OPEN_WRITE|GNOME_VFS_OPEN_RANDOM, FALSE, 0644);
 		}
 	} else {
-		/* we got the permissions, so let's call create() with the existing permissions instead of open() since 
+		/* we got the permissions, so let's call create() with the existing permissions instead of open() since
 		 * create() will truncate the file for us. */
 		res = gnome_vfs_create_uri (&handle, uri, GNOME_VFS_OPEN_WRITE|GNOME_VFS_OPEN_RANDOM, FALSE, perms);
 
@@ -221,7 +221,7 @@ gsf_output_gnomevfs_seek (GsfOutput *output, gsf_off_t offset,
 	GnomeVFSSeekPosition	vfs_whence = 0; /* make compiler shut up */
 	GnomeVFSResult	 	res;
 
-	g_return_val_if_fail (vfs->handle != NULL, 
+	g_return_val_if_fail (vfs->handle != NULL,
 		gsf_output_set_error (output, 0, "missing handle"));
 
 	switch (whence) {
diff --git a/gsf-win32/gsf-input-win32.h b/gsf-win32/gsf-input-win32.h
index 6052c15..953ab73 100644
--- a/gsf-win32/gsf-input-win32.h
+++ b/gsf-win32/gsf-input-win32.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-input-win32.h: 
+ * gsf-input-win32.h:
  *
  * Copyright (C) 2003 Dom Lachowicz <cinamod hotmail com>
  *
diff --git a/gsf-win32/gsf-output-win32.h b/gsf-win32/gsf-output-win32.h
index 038a015..3402bdc 100644
--- a/gsf-win32/gsf-output-win32.h
+++ b/gsf-win32/gsf-output-win32.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-outut-win32.h: 
+ * gsf-outut-win32.h:
  *
  * Copyright (C) 2003 Dom Lachowicz <cinamod hotmail com>
  *
diff --git a/gsf/gsf-blob.c b/gsf/gsf-blob.c
index 66b88ab..cda146a 100644
--- a/gsf/gsf-blob.c
+++ b/gsf/gsf-blob.c
@@ -77,12 +77,12 @@ GSF_CLASS (GsfBlob, gsf_blob,
  * @size: Size of the data in bytes.
  * @data_to_copy: Data which will be copied into the blob, or %NULL if @size is zero.
  * @error: location to store error, or %NULL.
- * 
+ *
  * Creates a new #GsfBlob object to hold the specified data.  The blob can then
  * be used as a facility for reference-counting for the data.  The data is
  * copied internally, so the blob does not hold references to external chunks
  * of memory.
- * 
+ *
  * Return value: A newly-created #GsfBlob, or %NULL if the data could not be copied.
  *
  * Error domain: #GSF_ERROR
@@ -132,9 +132,9 @@ gsf_blob_new (gsize size, gconstpointer data_to_copy, GError **error)
 /**
  * gsf_blob_get_size:
  * @blob: A #GsfBlob.
- * 
+ *
  * Queries the size in bytes of the data stored in the blob.
- * 
+ *
  * Return value: Size in bytes, or 0 if the data is %NULL.
  **/
 gsize
@@ -151,11 +151,11 @@ gsf_blob_get_size (GsfBlob const *blob)
 /**
  * gsf_blob_peek_data:
  * @blob: A #GsfBlob.
- * 
+ *
  * Queries a pointer to the data stored in the blob.  This does not copy the data
  * for you; it returns a pointer to the actual buffer which the blob uses internally,
  * so you should not free this buffer on your own.
- * 
+ *
  * Return value: Pointer to the data stored in the blob, or %NULL if the size
  * of the data is zero.
  **/
diff --git a/gsf/gsf-clip-data.c b/gsf/gsf-clip-data.c
index bd7f8ad..5f74358 100644
--- a/gsf/gsf-clip-data.c
+++ b/gsf/gsf-clip-data.c
@@ -283,14 +283,14 @@ gsf_clip_data_get_windows_clipboard_format (GsfClipData *clip_data, GError **err
  * @clip_data: A #GsfClipData.
  * @ret_size: Location to return the size of the returned data buffer.
  * @error: Location to store error, or %NULL.
- * 
+ *
  * Queries a pointer directly to the clipboard data of a #GsfClipData.  The
  * resulting pointer is not necessarily the same data pointer that was passed to
  * gsf_blob_new() prior to creating the @clip_data.  For example, if the data is
  * in #GSF_CLIP_FORMAT_WINDOWS_CLIPBOARD format, then it will have extra header
  * bytes in front of the actual metafile data.  This function will skip over
  * those header bytes if necessary and return a pointer to the "real" data.
- * 
+ *
  * Return value: Pointer to the real clipboard data.  The size in bytes of this
  * buffer is returned in the @ret_size argument.
  **/
diff --git a/gsf/gsf-doc-meta-data.c b/gsf/gsf-doc-meta-data.c
index 8331c9c..c938a83 100644
--- a/gsf/gsf-doc-meta-data.c
+++ b/gsf/gsf-doc-meta-data.c
@@ -110,7 +110,7 @@ void
 gsf_doc_meta_data_insert (GsfDocMetaData *meta, char *name, GValue *value)
 {
 	GsfDocProp *prop;
-	
+
 	g_return_if_fail (IS_GSF_DOC_META_DATA (meta));
 	g_return_if_fail (name != NULL);
 	prop = g_new (GsfDocProp, 1);
@@ -139,7 +139,7 @@ gsf_doc_meta_data_remove (GsfDocMetaData *meta, char const *name)
 /**
  * gsf_doc_meta_data_store :
  * @meta : #GsfDocMetaData
- * @name : 
+ * @name :
  *
  **/
 GsfDocProp *
diff --git a/gsf/gsf-docprop-vector.c b/gsf/gsf-docprop-vector.c
index 8e6464d..57004d7 100644
--- a/gsf/gsf-docprop-vector.c
+++ b/gsf/gsf-docprop-vector.c
@@ -57,7 +57,7 @@ GsfDocPropVector *
 gsf_value_get_docprop_vector (GValue const *value)
 {
 	g_return_val_if_fail (VAL_IS_GSF_DOCPROP_VECTOR (value), NULL);
-	
+
 	return (GsfDocPropVector *) g_value_get_object (value);
 }
 
@@ -100,11 +100,11 @@ gsf_docprop_vector_as_string (GsfDocPropVector const *vector)
 
 	rstring    = g_new0 (gchar, 1);
 	num_values = vector->gva->n_values;
-	
+
 	for (i = 0; i < num_values; i++) {
 		char    *str;
 		GValue	*v;
-		
+
 		v = g_value_array_get_nth (vector->gva, i);
 		str = g_strdup_value_contents (v);
 		rstring = g_strconcat (rstring, str, ",", NULL);
diff --git a/gsf/gsf-impl-utils.h b/gsf/gsf-impl-utils.h
index 9a62aa1..047d0b5 100644
--- a/gsf/gsf-impl-utils.h
+++ b/gsf/gsf-impl-utils.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-impl-utils.h: 
+ * gsf-impl-utils.h:
  *
  * Copyright (C) 2002-2006 Jody Goldberg (jody gnome org)
  *
diff --git a/gsf/gsf-infile-ar.c b/gsf/gsf-infile-ar.c
index 5b84934..a5584bd 100644
--- a/gsf/gsf-infile-ar.c
+++ b/gsf/gsf-infile-ar.c
@@ -40,7 +40,7 @@
 
 static GObjectClass *parent_class;
 
-typedef struct {	
+typedef struct {
 	char                 *name;
 	size_t                usize;
 	gsf_off_t             offset;
@@ -207,7 +207,7 @@ ar_vdir_child_by_name (ArVDir *vdir, char const * name)
 {
 	GSList *l;
 	ArVDir *child;
-	
+
 	for (l = vdir->children; l; l = l->next) {
 		child = (ArVDir *) l->data;
 		if (strcmp (child->name, name) == 0)
@@ -220,7 +220,7 @@ static ArVDir *
 ar_vdir_child_by_index (ArVDir *vdir, int target)
 {
 	GSList *l;
-	
+
 	for (l = vdir->children; l; l = l->next)
 		if (target-- <= 0)
 			return (ArVDir *) l->data;
@@ -233,7 +233,7 @@ ar_vdir_insert (ArVDir *vdir, char const * name, ArDirent *dirent)
 	char const *p;
 	char *dirname;
 	ArVDir *child;
-	
+
 	p = strchr (name, AR_NAME_SEPARATOR);
 	if (p) {	/* A directory */
 		dirname = g_strndup (name, (gsize) (p - name));
@@ -292,7 +292,7 @@ ar_read_header (GsfInput *fp, ArHeader *header)
 
 	if (fp == NULL || header == NULL)
 		return AR_FAILURE;
-	
+
 	memset(header, 0, AR_HEADER_LEN);
 
 	len = gsf_input_remaining (fp);
@@ -425,7 +425,7 @@ gsf_infile_ar_init (GObject *obj)
 	GsfInfileAr *ar = (GsfInfileAr *)obj;
 	ar->input       = NULL;
 	ar->vdir        = NULL;
-	ar->buf         = NULL;	
+	ar->buf         = NULL;
 	ar->buf_size    = 0;
 }
 
diff --git a/gsf/gsf-infile-ar.h b/gsf/gsf-infile-ar.h
index 79c2f4e..7a8458b 100644
--- a/gsf/gsf-infile-ar.h
+++ b/gsf/gsf-infile-ar.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-infile-ar.h: 
+ * gsf-infile-ar.h:
  *
  * Copyright (C) 2004-2006 Dom Lachowicz (cinamod hotmail com)
  *
diff --git a/gsf/gsf-infile-impl.h b/gsf/gsf-infile-impl.h
index bea59b1..87f90d4 100644
--- a/gsf/gsf-infile-impl.h
+++ b/gsf/gsf-infile-impl.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-infile-impl.h: 
+ * gsf-infile-impl.h:
  *
  * Copyright (C) 2002-2006 Jody Goldberg (jody gnome org)
  *
diff --git a/gsf/gsf-infile-msole.c b/gsf/gsf-infile-msole.c
index a6a5ece..1b5bce8 100644
--- a/gsf/gsf-infile-msole.c
+++ b/gsf/gsf-infile-msole.c
@@ -374,8 +374,8 @@ ole_dirent_new (GsfInfileMSOle *ole, guint32 entry, MSOleDirent *parent,
 			dirent, (GCompareFunc)ole_dirent_cmp);
 
 	/* NOTE : These links are a tree, not a linked list */
-	ole_dirent_new (ole, prev, parent, seen_before); 
-	ole_dirent_new (ole, next, parent, seen_before); 
+	ole_dirent_new (ole, prev, parent, seen_before);
+	ole_dirent_new (ole, next, parent, seen_before);
 
 	if (dirent->is_directory)
 		ole_dirent_new (ole, child, dirent, seen_before);
@@ -734,7 +734,7 @@ gsf_infile_msole_seek (GsfInput *input, gsf_off_t offset, GSeekType whence)
 {
 	GsfInfileMSOle *ole = GSF_INFILE_MSOLE (input);
 
-	(void) offset; 
+	(void) offset;
 	(void) whence;
 
 	ole->cur_block = BAT_MAGIC_UNUSED;
@@ -890,7 +890,7 @@ gsf_infile_msole_init (GObject *obj)
 	ole->bat.num_blocks	= 0;
 	ole->cur_block		= BAT_MAGIC_UNUSED;
 	ole->stream.buf		= NULL;
-	ole->stream.buf_size	= 0; 
+	ole->stream.buf_size	= 0;
 }
 
 static void
diff --git a/gsf/gsf-infile-msole.h b/gsf/gsf-infile-msole.h
index 0820da3..8131590 100644
--- a/gsf/gsf-infile-msole.h
+++ b/gsf/gsf-infile-msole.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-infile-msole.h: 
+ * gsf-infile-msole.h:
  *
  * Copyright (C) 2002-2006 Jody Goldberg (jody gnome org)
  *
diff --git a/gsf/gsf-infile-msvba.h b/gsf/gsf-infile-msvba.h
index d9ec7e1..4c1efb6 100644
--- a/gsf/gsf-infile-msvba.h
+++ b/gsf/gsf-infile-msvba.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-infile-msvba.h: 
+ * gsf-infile-msvba.h:
  *
  * Copyright (C) 2002-2006 Jody Goldberg (jody gnome org)
  *
diff --git a/gsf/gsf-infile-stdio.h b/gsf/gsf-infile-stdio.h
index 8d37d8b..5addac9 100644
--- a/gsf/gsf-infile-stdio.h
+++ b/gsf/gsf-infile-stdio.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-infile-stdio.h: 
+ * gsf-infile-stdio.h:
  *
  * Copyright (C) 2004-2006 Novell, Inc.
  *
diff --git a/gsf/gsf-infile-tar.c b/gsf/gsf-infile-tar.c
index 3e1d9d2..b516df6 100644
--- a/gsf/gsf-infile-tar.c
+++ b/gsf/gsf-infile-tar.c
@@ -283,7 +283,7 @@ tar_init_info (GsfInfileTar *tar)
 
 		/* Round up to block size */
 		length = (length + (BLOCK_SIZE - 1)) / BLOCK_SIZE * BLOCK_SIZE;
-		
+
 		if (!tar->err &&
 		    gsf_input_seek (tar->source, offset + length, G_SEEK_SET)) {
 			tar->err = g_error_new (gsf_input_error_id (), 0,
diff --git a/gsf/gsf-infile-tar.h b/gsf/gsf-infile-tar.h
index f3e91fe..303182c 100644
--- a/gsf/gsf-infile-tar.h
+++ b/gsf/gsf-infile-tar.h
@@ -1,5 +1,5 @@
 /*
- * gsf-infile-tar.h: 
+ * gsf-infile-tar.h:
  *
  * Copyright (C) 2008 Morten Welinder (terra gnome org)
  *
diff --git a/gsf/gsf-infile-zip.c b/gsf/gsf-infile-zip.c
index 301e222..9bc9744 100644
--- a/gsf/gsf-infile-zip.c
+++ b/gsf/gsf-infile-zip.c
@@ -63,7 +63,7 @@ struct _GsfInfileZip {
 	z_stream  *stream;
 	guint32   restlen;
 	guint32   crestlen;
-	
+
 	guint8   *buf;
 	size_t    buf_size;
 	gsf_off_t seek_skipped;
@@ -104,7 +104,7 @@ vdir_insert (GsfZipVDir *vdir, char const * name, GsfZipDirent *dirent)
 	char const *p;
 	char *dirname;
 	GsfZipVDir *child;
-	
+
 	p = strchr (name, ZIP_NAME_SEPARATOR);
 	if (p) {	/* A directory */
 		dirname = g_strndup (name, (gsize) (p - name));
@@ -153,7 +153,7 @@ zip_find_trailer (GsfInfileZip *zip)
 			return -1;
 
 		p = (guchar *) data;
-        
+
 		for (s = p + maplen - 1; (s >= p); s--, trailer_offset--) {
 			if ((*s == 'P') &&
 			    (p + maplen - 1 - s > ZIP_TRAILER_SIZE - 2) &&
@@ -161,7 +161,7 @@ zip_find_trailer (GsfInfileZip *zip)
 				return --trailer_offset;
 			}
 		}
-        
+
 		/* not found in currently mapped block, so update it if
 		 * there is some room in before. The requirements are..
 		 * (a) mappings should overlap so that trailer can cross BUFSIZ-boundary
@@ -373,7 +373,7 @@ static gboolean
 zip_init_info (GsfInfileZip *zip)
 {
 	gboolean ret;
-	
+
 	ret = zip_read_dirents (zip);
 	if (ret != FALSE)
 		return ret;
@@ -471,7 +471,7 @@ zip_update_stream_in (GsfInfileZip *zip)
 	guint32 read_now;
 	guint8 const *data;
 	gsf_off_t pos;
-	
+
 	if (zip->crestlen == 0)
 		return FALSE;
 
@@ -532,7 +532,7 @@ gsf_infile_zip_read (GsfInput *input, size_t num_bytes, guint8 *buffer)
 			startlen = zip->stream->total_out;
 			err = inflate(zip->stream, Z_NO_FLUSH);
 
-			if (err == Z_STREAM_END) 
+			if (err == Z_STREAM_END)
 				zip->restlen = 0;
 			else if (err == Z_OK)
 				zip->restlen -= (zip->stream->total_out - startlen);
diff --git a/gsf/gsf-infile-zip.h b/gsf/gsf-infile-zip.h
index 0dd495a..3cb42d0 100644
--- a/gsf/gsf-infile-zip.h
+++ b/gsf/gsf-infile-zip.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-infile-zip.h: 
+ * gsf-infile-zip.h:
  *
  * Copyright (C) 2002-2006 Jody Goldberg (jody gnome org)
  *
diff --git a/gsf/gsf-infile.h b/gsf/gsf-infile.h
index 4980d44..d6e7cec 100644
--- a/gsf/gsf-infile.h
+++ b/gsf/gsf-infile.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-infile.h: 
+ * gsf-infile.h:
  *
  * Copyright (C) 2002-2006 Jody Goldberg (jody gnome org)
  *
diff --git a/gsf/gsf-input-bzip.c b/gsf/gsf-input-bzip.c
index e20bd9d..55fed78 100644
--- a/gsf/gsf-input-bzip.c
+++ b/gsf/gsf-input-bzip.c
@@ -40,7 +40,7 @@
  *
  * Returns: a new #GsfInputMemory or %NULL.
  */
-GsfInput * 
+GsfInput *
 gsf_input_memory_new_from_bzip (GsfInput *source, GError **err)
 {
 #ifndef HAVE_BZ2
@@ -76,7 +76,7 @@ gsf_input_memory_new_from_bzip (GsfInput *source, GError **err)
 			bzstm.avail_in = (unsigned int)MIN (gsf_input_remaining (source), BZ_BUFSIZ);
 			bzstm.next_in  = (char *)gsf_input_read (source, bzstm.avail_in, NULL);
 		}
-		
+
 		bzerr = BZ2_bzDecompress (&bzstm);
 		if (bzerr != BZ_OK && bzerr != BZ_STREAM_END) {
 			if (err)
@@ -87,14 +87,14 @@ gsf_input_memory_new_from_bzip (GsfInput *source, GError **err)
 			g_object_unref (sink);
 			return NULL;
 		}
-		
+
 		gsf_output_write (sink, BZ_BUFSIZ - bzstm.avail_out, out_buf);
 		if (bzerr == BZ_STREAM_END)
 			break;
 	}
 
 	gsf_output_close (sink);
-	
+
 	if (BZ_OK != BZ2_bzDecompressEnd (&bzstm)) {
 		if (err)
 			*err = g_error_new (gsf_input_error_id (), 0,
@@ -104,7 +104,7 @@ gsf_input_memory_new_from_bzip (GsfInput *source, GError **err)
 	}
 
 	mem = gsf_input_memory_new_clone (
-		gsf_output_memory_get_bytes (GSF_OUTPUT_MEMORY (sink)), 
+		gsf_output_memory_get_bytes (GSF_OUTPUT_MEMORY (sink)),
 		gsf_output_size (sink));
 
 	if (mem != NULL)
diff --git a/gsf/gsf-input-gio.h b/gsf/gsf-input-gio.h
index be0de68..5cff3d7 100644
--- a/gsf/gsf-input-gio.h
+++ b/gsf/gsf-input-gio.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-input-gio.h: 
+ * gsf-input-gio.h:
  *
  * Copyright (C) 2007 Dom Lachowicz <cinamod hotmail com>
  *
diff --git a/gsf/gsf-input-gzip.c b/gsf/gsf-input-gzip.c
index 69f32a5..8ec8e95 100644
--- a/gsf/gsf-input-gzip.c
+++ b/gsf/gsf-input-gzip.c
@@ -518,7 +518,7 @@ gsf_input_gzip_class_init (GObjectClass *gobject_class)
 	 * The size that the data will have after uncompression.
 	 * The is mandatory for raw streams and if the uncompressed size is
 	 * larger than 4GB.
-	 */  
+	 */
 	g_object_class_install_property
 		(gobject_class,
 		 PROP_UNCOMPRESSED_SIZE,
diff --git a/gsf/gsf-input-http.c b/gsf/gsf-input-http.c
index 3613da3..69bfab4 100644
--- a/gsf/gsf-input-http.c
+++ b/gsf/gsf-input-http.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  * USA
  */
- 
+
 #include <gsf-config.h>
 #include <gsf/gsf-input-http.h>
 #include <gsf/gsf-input-impl.h>
@@ -141,9 +141,9 @@ gsf_input_http_set_property (GObject *object,
 {
         GsfInputHTTP *input;
         char *old;
-        
+
         input = GSF_INPUT_HTTP (object);
-        
+
         switch (property_id) {
         case PROP_URL:
                 old = input->url;
@@ -203,7 +203,7 @@ gsf_input_http_get_url (GsfInputHTTP *input)
 /**
  * gsf_input_http_get_content_type :
  * @input: #GsfInputHTTP
- * 
+ *
  * Returns: an allocated string containing the Content-Type field of the HTTP response.
  **/
 gchar *
@@ -236,14 +236,14 @@ gsf_input_http_new (gchar const * url, GError **error G_GNUC_UNUSED)
                 return NULL;
 
         obj = g_object_new (GSF_INPUT_HTTP_TYPE,
-		"url",		url, 
+		"url",		url,
 		"content-type", content_type,
 		NULL);
 	if (G_UNLIKELY (NULL == obj)) return NULL;
-        
+
         gsf_input_set_size (GSF_INPUT (obj), xmlNanoHTTPContentLength (ctx));
         GSF_INPUT_HTTP (obj)->ctx = ctx;
-        
+
         return GSF_INPUT (obj);
 }
 
@@ -279,7 +279,7 @@ gsf_input_http_read (GsfInput *input, size_t num_bytes, guint8 *buffer)
 }
 
 static gboolean
-gsf_input_http_seek (GsfInput *input G_GNUC_UNUSED, 
+gsf_input_http_seek (GsfInput *input G_GNUC_UNUSED,
 		     gsf_off_t offset G_GNUC_UNUSED, GSeekType whence G_GNUC_UNUSED)
 {
         return FALSE;
diff --git a/gsf/gsf-input-http.h b/gsf/gsf-input-http.h
index bf2df4f..c6b10de 100644
--- a/gsf/gsf-input-http.h
+++ b/gsf/gsf-input-http.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  * USA
  */
- 
+
 #ifndef __GSF_INPUT_HTTP_H__
 #define __GSF_INPUT_HTTP_H__
 
diff --git a/gsf/gsf-input-iochannel.c b/gsf/gsf-input-iochannel.c
index 300fd12..b490345 100644
--- a/gsf/gsf-input-iochannel.c
+++ b/gsf/gsf-input-iochannel.c
@@ -31,7 +31,7 @@
  *
  * Returns: a new #GsfInputMemory or NULL.
  **/
-GsfInput * 
+GsfInput *
 gsf_input_memory_new_from_iochannel (GIOChannel *channel,
 				     GError **err)
 {
diff --git a/gsf/gsf-input-stdio.c b/gsf/gsf-input-stdio.c
index 5af68a0..3299bdb 100644
--- a/gsf/gsf-input-stdio.c
+++ b/gsf/gsf-input-stdio.c
@@ -246,7 +246,7 @@ gsf_input_stdio_read (GsfInput *input, size_t num_bytes,
 	}
 
 	while (total_read < num_bytes) {
-		nread = fread (buffer + total_read, 1, 
+		nread = fread (buffer + total_read, 1,
 			       num_bytes - total_read, stdio->file);
 		total_read += nread;
 		if (total_read < num_bytes &&
diff --git a/gsf/gsf-input.c b/gsf/gsf-input.c
index 328d82b..23913f3 100644
--- a/gsf/gsf-input.c
+++ b/gsf/gsf-input.c
@@ -492,7 +492,7 @@ gsf_input_seek_emulate (GsfInput *input, gsf_off_t pos)
  *
  * Returns: A utility quark to flag a GError as being an input problem.
  */
-GQuark 
+GQuark
 gsf_input_error_id (void)
 {
 	static GQuark quark;
@@ -508,7 +508,7 @@ gsf_input_error_id (void)
  *
  * Returns: A utility quark to flag a GError as being an input problem.
  */
-GQuark 
+GQuark
 gsf_input_error (void)
 {
 	return gsf_input_error_id ();
@@ -587,7 +587,7 @@ gsf_input_uncompress (GsfInput *src)
 			if (res) {
 				g_object_unref (src);
 				return gsf_input_uncompress (res);
-			} 
+			}
 		}
 	}
 
@@ -639,11 +639,11 @@ gsf_input_new_for_uri (char const * uri, GError ** err)
 #if HAVE_GNOME
 		/* have gnome, let GnomeVFS deal with this */
 		input = gsf_input_gnomevfs_new (uri, err);
-#else		
+#else
 		if (len > 7 && !strncmp (uri, "file:/", 6)) {
 			/* dumb attempt to translate this into a local path */
 			input = gsf_input_stdio_new (uri+7, err);
-		} 
+		}
 		/* else: unknown or unhandled protocol - bail */
 #endif
 	}
diff --git a/gsf/gsf-io-context.c b/gsf/gsf-io-context.c
index b6564e6..9af65e6 100644
--- a/gsf/gsf-io-context.c
+++ b/gsf/gsf-io-context.c
@@ -139,7 +139,7 @@ void
 gsf_io_context_update_progress (GsfIOContext *ioc, gdouble value)
 {
 	gdouble *new_range;
-	
+
 	g_return_if_fail (GSF_IS_IO_CONTEXT (ioc));
 
 	/* check value */
diff --git a/gsf/gsf-libxml.c b/gsf/gsf-libxml.c
index ca3998d..1cd6c18 100644
--- a/gsf/gsf-libxml.c
+++ b/gsf/gsf-libxml.c
@@ -90,7 +90,7 @@ glade_flags_from_string (GType type, const char *string)
 	gboolean eos;
 
 	eos = flagstr [i] == '\0';
-	
+
 	if (eos || flagstr [i] == '|') {
 	    GFlagsValue *fv;
 	    const char  *flag;
@@ -140,7 +140,7 @@ glade_flags_from_string (GType type, const char *string)
 		break;
 	}
     }
-    
+
     g_free (flagstr);
 
     g_type_class_unref(fclass);
@@ -161,7 +161,7 @@ glade_string_from_flags (GType type, guint flags)
     if (flags_class->n_values)
       {
 	GFlagsValue *fval;
-      
+
 	for (fval = flags_class->values; fval->value_name; fval++)
 	  {
 	    /* We have to be careful as some flags include 0 values, e.g.
@@ -223,7 +223,7 @@ gsf_xml_gvalue_from_str (GValue *res, GType t, char const *str)
 		g_value_set_uchar (res, (guchar)str[0]);
 		break;
 	case G_TYPE_BOOLEAN:
-		g_value_set_boolean (res, 
+		g_value_set_boolean (res,
 			g_ascii_tolower (str[0]) == 't' ||
 			g_ascii_tolower (str[0]) == 'y' ||
 			strtol (str, NULL, 0));
@@ -239,7 +239,7 @@ gsf_xml_gvalue_from_str (GValue *res, GType t, char const *str)
 		break;
 	case G_TYPE_ULONG:
 		g_value_set_ulong (res, strtoul (str, NULL, 0));
-		break; 
+		break;
 	case G_TYPE_ENUM:
 		g_value_set_enum (res, glade_enum_from_string (G_VALUE_TYPE (res), str));
 		break;
@@ -319,7 +319,7 @@ gsf_xml_parser_context_full (GsfInput *input, xmlSAXHandlerPtr sax, gpointer use
 
 	res = xmlCreateIOParserCtxt (
 		sax, user,
-		(xmlInputReadCallback) gsf_libxml_read, 
+		(xmlInputReadCallback) gsf_libxml_read,
 		(xmlInputCloseCallback) gsf_libxml_close,
 		input, XML_CHAR_ENCODING_NONE);
 
@@ -1167,7 +1167,7 @@ gsf_xml_in_push_state (GsfXMLIn *xin, GsfXMLInDoc const *doc,
 {
 	GsfXMLInInternal *state = (GsfXMLInInternal *)xin;
 	GsfXMLInExtension *ext;
-	
+
 	g_return_if_fail (xin != NULL);
 	g_return_if_fail (doc != NULL);
 	g_return_if_fail (doc->root_node != NULL);
@@ -1239,7 +1239,7 @@ gsf_xml_in_get_input (GsfXMLIn const *xin)
  * @xin : #GsfXMLIn
  * @str : string to check
  * @ns_id : the namespace id
- * 
+ *
  * According to @state is @str in the namespace @ns_id ?
  *
  * Returns: a pointer to @str after the namespace if successful,
@@ -1868,7 +1868,7 @@ gsf_xml_out_add_gvalue (GsfXMLOut *xout, char const *id, GValue const *val)
 		break;
 	case G_TYPE_ULONG:
 		gsf_xml_out_add_uint (xout, id, g_value_get_ulong (val));
-		break; 
+		break;
 	case G_TYPE_ENUM:
 		gsf_xml_out_add_cstr (xout, id,
 			glade_string_from_enum (t, g_value_get_enum (val)));
diff --git a/gsf/gsf-meta-names.h b/gsf/gsf-meta-names.h
index 2627743..5e1fc34 100644
--- a/gsf/gsf-meta-names.h
+++ b/gsf/gsf-meta-names.h
@@ -154,7 +154,7 @@
  *
  * (Vector of strings) Names of the 'interesting' parts of the document.  In
  * spreadsheets this is a list of the sheet names, and the named expressions.
- * From MSOLE 
+ * From MSOLE
  */
 #define GSF_META_NAME_DOCUMENT_PARTS			"gsf:document-parts"
 
@@ -163,7 +163,7 @@
  *
  * (Vector of string value pairs stored in alternating elements) Store the
  * counts of objects in the document as names 'worksheet' and count '4'
- * From MSOLE 
+ * From MSOLE
  */
 #define GSF_META_NAME_HEADING_PAIRS			"gsf:heading-pairs"
 
@@ -220,7 +220,7 @@
 /**
  * GSF_META_NAME_SCALE:
  *
- * (Boolean) ????? 
+ * (Boolean) ?????
  */
 #define GSF_META_NAME_SCALE				"gsf:scale"
 
@@ -392,7 +392,7 @@
  * GSF_META_NAME_EDITING_DURATION:
  *
  * (Date as ISO String) The total-time taken until the last modification.
- * Moved from "gsf" to "meta". This way can be used correctly by OpenDocument 
+ * Moved from "gsf" to "meta". This way can be used correctly by OpenDocument
  * and Gnumeric.
  */
 #define GSF_META_NAME_EDITING_DURATION			"meta:editing-duration"
diff --git a/gsf/gsf-msole-impl.h b/gsf/gsf-msole-impl.h
index 4a80dd8..bbe6512 100644
--- a/gsf/gsf-msole-impl.h
+++ b/gsf/gsf-msole-impl.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-msole-impl.h: 
+ * gsf-msole-impl.h:
  *
  * Copyright (C) 2002-2006 Jody Goldberg (jody gnome org)
  *
diff --git a/gsf/gsf-msole-utils.c b/gsf/gsf-msole-utils.c
index 057d18f..0881004 100644
--- a/gsf/gsf-msole-utils.c
+++ b/gsf/gsf-msole-utils.c
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-msole-utils.c: 
+ * gsf-msole-utils.c:
  *
  * Copyright (C) 2002-2006 Jody Goldberg (jody gnome org)
  * Copyright (C) 2002-2006 Dom Lachowicz (cinamod hotmail com)
@@ -235,7 +235,7 @@ msole_vt_name (GsfMSOleVariantType type)
 		"VT_I8",	"VT_UI8",	"VT_INT",	"VT_UINT",	"VT_VOID",
 		"VT_HRESULT",	"VT_PTR",	"VT_SAFEARRAY",	"VT_CARRAY",	"VT_USERDEFINED",
 		"VT_LPSTR",	"VT_LPWSTR",
-	};	
+	};
 	static char const *names2[] = {
 		"VT_FILETIME",
 		"VT_BLOB",	"VT_STREAM",	"VT_STORAGE",	"VT_STREAMED_OBJECT",
@@ -616,7 +616,7 @@ msole_prop_parse (GsfMSOleMetaDataSection *section,
 		break;
 
 	case VT_DATE :
-		/* 
+		/*
 		 * 64-bit floating-point number representing the number of days
 		 * (not seconds) since December 31, 1899.
 		 */
@@ -714,7 +714,7 @@ msole_prop_parse (GsfMSOleMetaDataSection *section,
 		break;
 
 	case VT_LPSTR :
-		/* 
+		/*
 		 * This is the representation of many strings.  It is stored in
 		 * the same representation as VT_BSTR.  Note that the serialized
 		 * representation of VP_LPSTR has a preceding byte count, whereas
@@ -1106,8 +1106,8 @@ gsf_msole_metadata_read	(GsfInput *in, GsfDocMetaData *accum)
 	GsfMSOleMetaDataSection *sections;
 	GsfMSOleMetaDataProp	*props;
 	GsfDocProp		*prop;
-	
-	/* http://bugzilla.gnome.org/show_bug.cgi?id=352055 
+
+	/* http://bugzilla.gnome.org/show_bug.cgi?id=352055
 	 * psiwin generates files with empty property sections */
 	if (gsf_input_size (in) <= 0)
 		return NULL;
@@ -1560,7 +1560,7 @@ msole_metadata_write_section (WritePropState *state, gboolean user)
 			i++;
 			offsets[i].id     = offsets[i-1].id | 0x1000000;
 			offsets[i].offset = gsf_output_tell (state->out);
-			g_value_set_static_string (&scratch, 
+			g_value_set_static_string (&scratch,
 				gsf_doc_prop_get_link (prop));
 			msole_metadata_write_prop (state, NULL, &scratch, FALSE);
 		}
@@ -1703,19 +1703,19 @@ static struct {
 	{ "sq_AL",  0x041c }, /* Albanian */
 	{ "ar_SA",  0x0401 }, /* Arabic (Saudi) */
 	{ "ar_IQ",  0x0801 }, /* Arabic (Iraq) */
-	{ "ar_EG",  0x0c01 }, /* Arabic (Egypt) */		
+	{ "ar_EG",  0x0c01 }, /* Arabic (Egypt) */
 	{ "ar_LY",  0x1001 }, /* Arabic (Libya) */
 	{ "ar_DZ",  0x1401 }, /* Arabic (Algeria) */
 	{ "ar_MA",  0x1801 }, /* Arabic (Morocco) */
 	{ "ar_TN",  0x1c01 }, /* Arabic (Tunisia) */
 	{ "ar_OM",  0x2001 }, /* Arabic (Oman) */
-	{ "ar_YE",  0x2401 }, /* Arabic (Yemen) */		
+	{ "ar_YE",  0x2401 }, /* Arabic (Yemen) */
 	{ "ar_SY",  0x2801 }, /* Arabic (Syria) */
 	{ "ar_JO",  0x2c01 }, /* Arabic (Jordan) */
 	{ "ar_LB",  0x3001 }, /* Arabic (Lebanon) */
 	{ "ar_KW",  0x3401 }, /* Arabic (Kuwait) */
 	{ "ar_AE",  0x3801 }, /* Arabic (United Arab Emirates) */
-	{ "ar_BH",  0x3c01 }, /* Arabic (Bahrain) */		
+	{ "ar_BH",  0x3c01 }, /* Arabic (Bahrain) */
 	{ "ar_QA",  0x4001 }, /* Arabic (Qatar) */
 	{ "as",     0x044d }, /* Assamese */
 	{ "az",     0x042c }, /* Azerbaijani */
@@ -1723,20 +1723,20 @@ static struct {
 	{ "az",     0x044c }, /* Azeri (Latin) az_ */
 	{ "az",     0x082c }, /* Azeri (Cyrillic) az_ */
 	{ "eu_ES",  0x042d }, /* Basque */
-	{ "be_BY",  0x0423 }, /* Belarussian */		
+	{ "be_BY",  0x0423 }, /* Belarussian */
 	{ "bn",     0x0445 }, /* Bengali bn_ */
 	{ "bg_BG",  0x0402 }, /* Bulgarian */
 	{ "ca_ES",  0x0403 }, /* Catalan */
 	{ "zh_TW",  0x0404 }, /* Chinese (Taiwan) */
 	{ "zh_CN",  0x0804 }, /* Chinese (PRC) */
-	{ "zh_HK",  0x0c04 }, /* Chinese (Hong Kong) */		
+	{ "zh_HK",  0x0c04 }, /* Chinese (Hong Kong) */
 	{ "zh_SG",  0x1004 }, /* Chinese (Singapore) */
 	{ "ch_MO",  0x1404 }, /* Chinese (Macau SAR) */
 	{ "hr_HR",  0x041a }, /* Croatian */
 	{ "cs_CZ",  0x0405 }, /* Czech */
 	{ "da_DK",  0x0406 }, /* Danish */
 	{ "div",    0x465 }, /* Divehi div_*/
-	{ "nl_NL",  0x0413 }, /* Dutch (Netherlands) */		
+	{ "nl_NL",  0x0413 }, /* Dutch (Netherlands) */
 	{ "nl_BE",  0x0813 }, /* Dutch (Belgium) */
 	{ "en_US",  0x0409 }, /* English (USA) */
 	{ "en_GB",  0x0809 }, /* English (UK) */
@@ -1748,19 +1748,19 @@ static struct {
 	{ "en_JM",  0x2009 }, /* English (Jamaica) */
 	{ "en",     0x2409 }, /* English (Caribbean) */
 	{ "en_BZ",  0x2809 }, /* English (Belize) */
-	{ "en_TT",  0x2c09 }, /* English (Trinidad) */		
+	{ "en_TT",  0x2c09 }, /* English (Trinidad) */
 	{ "en_ZW",  0x3009 }, /* English (Zimbabwe) */
 	{ "en_PH",  0x3409 }, /* English (Phillipines) */
 	{ "et_EE",  0x0425 }, /* Estonian */
 	{ "fo",     0x0438 }, /* Faeroese fo_ */
 	{ "fa_IR",  0x0429 }, /* Farsi */
-	{ "fi_FI",  0x040b }, /* Finnish */		
+	{ "fi_FI",  0x040b }, /* Finnish */
 	{ "fr_FR",  0x040c }, /* French (France) */
 	{ "fr_BE",  0x080c }, /* French (Belgium) */
 	{ "fr_CA",  0x0c0c }, /* French (Canada) */
 	{ "fr_CH",  0x100c }, /* French (Switzerland) */
 	{ "fr_LU",  0x140c }, /* French (Luxembourg) */
-	{ "fr_MC",  0x180c }, /* French (Monaco) */		
+	{ "fr_MC",  0x180c }, /* French (Monaco) */
 	{ "gl",     0x0456 }, /* Galician gl_ */
 	{ "ga_IE",  0x083c }, /* Irish Gaelic */
 	{ "gd_GB",  0x100c }, /* Scottish Gaelic */
@@ -1776,7 +1776,7 @@ static struct {
 	{ "he_IL",  0x040d }, /* Hebrew */
 	{ "hi_IN",  0x0439 }, /* Hindi */
 	{ "hu_HU",  0x040e }, /* Hungarian */
-	{ "is_IS",  0x040f }, /* Icelandic */		
+	{ "is_IS",  0x040f }, /* Icelandic */
 	{ "id_ID",  0x0421 }, /* Indonesian */
 	{ "iu",     0x045d }, /* Inkutitut */
 	{ "it_IT",  0x0410 }, /* Italian (Italy) */
@@ -1792,7 +1792,7 @@ static struct {
 	{ "la",     0x0476 }, /* Latin */
 	{ "lo",     0x0454 }, /* Laothian */
 	{ "lv_LV",  0x0426 }, /* Latvian */
-	{ "lt_LT",  0x0427 }, /* Lithuanian */		
+	{ "lt_LT",  0x0427 }, /* Lithuanian */
 	{ "lt_LT",  0x0827 }, /* Lithuanian (Classic) */
 	{ "mk",     0x042f }, /* FYRO Macedonian */
 	{ "my_MY",  0x043e }, /* Malaysian */
@@ -1807,39 +1807,39 @@ static struct {
 	{ "nn_NO",  0x0814 }, /* Norwegian (Nynorsk) */
 	{ "or",     0x0448 }, /* Oriya or_ */
 	{ "om",     0x0472 }, /* Oromo (Afan, Galla) */
-	{ "pl_PL",  0x0415 }, /* Polish */		
+	{ "pl_PL",  0x0415 }, /* Polish */
 	{ "pt_BR",  0x0416 }, /* Portuguese (Brazil) */
 	{ "pt_PT",  0x0816 }, /* Portuguese (Portugal) */
 	{ "pa",     0x0446 }, /* Punjabi pa_ */
 	{ "ps",     0x0463 }, /* Pashto (Pushto) */
 	{ "rm",     0x0417 }, /* Rhaeto_Romanic rm_ */
 	{ "ro_RO",  0x0418 }, /* Romanian */
-	{ "ro_MD",  0x0818 }, /* Romanian (Moldova) */		
+	{ "ro_MD",  0x0818 }, /* Romanian (Moldova) */
 	{ "ru_RU",  0x0419 }, /* Russian */
 	{ "ru_MD",  0x0819 }, /* Russian (Moldova) */
 	{ "se",     0x043b }, /* Sami (Lappish) se_ */
 	{ "sa",     0x044f }, /* Sanskrit sa_ */
 	{ "sr",     0x0c1a }, /* Serbian (Cyrillic) sr_ */
-	{ "sr",     0x081a }, /* Serbian (Latin) sr_ */		
+	{ "sr",     0x081a }, /* Serbian (Latin) sr_ */
 	{ "sd",     0x0459 }, /* Sindhi sd_ */
 	{ "sk_SK",  0x041b }, /* Slovak */
 	{ "sl_SI",  0x0424 }, /* Slovenian */
 	{ "wen",    0x042e }, /* Sorbian wen_ */
 	{ "so",     0x0477 }, /* Somali */
 	{ "es_ES",  0x040a }, /* Spanish (Spain, Traditional) */
-	{ "es_MX",  0x080a }, /* Spanish (Mexico) */		
+	{ "es_MX",  0x080a }, /* Spanish (Mexico) */
 	{ "es_ES",  0x0c0a }, /* Spanish (Modern) */
 	{ "es_GT",  0x100a }, /* Spanish (Guatemala) */
 	{ "es_CR",  0x140a }, /* Spanish (Costa Rica) */
 	{ "es_PA",  0x180a }, /* Spanish (Panama) */
 	{ "es_DO",  0x1c0a }, /* Spanish (Dominican Republic) */
-	{ "es_VE",  0x200a }, /* Spanish (Venezuela) */		
+	{ "es_VE",  0x200a }, /* Spanish (Venezuela) */
 	{ "es_CO",  0x240a }, /* Spanish (Colombia) */
 	{ "es_PE",  0x280a }, /* Spanish (Peru) */
 	{ "es_AR",  0x2c0a }, /* Spanish (Argentina) */
 	{ "es_EC",  0x300a }, /* Spanish (Ecuador) */
 	{ "es_CL",  0x340a }, /* Spanish (Chile) */
-	{ "es_UY",  0x380a }, /* Spanish (Uruguay) */		
+	{ "es_UY",  0x380a }, /* Spanish (Uruguay) */
 	{ "es_PY",  0x3c0a }, /* Spanish (Paraguay) */
 	{ "es_BO",  0x400a }, /* Spanish (Bolivia) */
 	{ "es_SV",  0x440a }, /* Spanish (El Salvador) */
@@ -1861,7 +1861,7 @@ static struct {
 	{ "tg",     0x0428 }, /* Tajik */
 	{ "bo",     0x0451 }, /* Tibetan */
 	{ "ti",     0x0473 }, /* Tigrinya */
-	{ "uk_UA",  0x0422 }, /* Ukrainian */		
+	{ "uk_UA",  0x0422 }, /* Ukrainian */
 	{ "ur_PK",  0x0420 }, /* Urdu (Pakistan) */
 	{ "ur_IN",  0x0820 }, /* Urdu (India) */
 	{ "uz",     0x0443 }, /* Uzbek (Latin) uz_ */
@@ -1897,7 +1897,7 @@ gsf_msole_lid_for_language (char const *lang)
 	for (i = 0 ; i < G_N_ELEMENTS(gsf_msole_language_ids); i++)
 		if (!strncmp (lang, gsf_msole_language_ids[i].tag, len))
 			return gsf_msole_language_ids[i].lid;
-	
+
 	return 0x0400 ;   /* return -none- */
 }
 
@@ -1913,11 +1913,11 @@ char const *
 gsf_msole_language_for_lid (guint lid)
 {
 	guint i = 0 ;
-	
+
 	for (i = 0 ; i < G_N_ELEMENTS(gsf_msole_language_ids); i++)
 		if (gsf_msole_language_ids[i].lid == lid)
 			return gsf_msole_language_ids[i].tag;
-	
+
 	return "-none-"; /* default */
 }
 
@@ -1992,7 +1992,7 @@ gsf_msole_lid_to_codepage (guint lid)
 		case 0x1404:		/* Chinese (Macau SAR) */
 		case 0x0c04:		/* Chinese (Hong Kong SAR, PRC) */
 			return 950;
-			
+
 		case 0x0804:		/* Chinese (PRC) */
 			return 936;
 		default :
@@ -2142,7 +2142,7 @@ gsf_msole_lid_to_codepage (guint lid)
 		return 0;
 
 #if 0
-		/****************************************************************** 
+		/******************************************************************
 		 * Below this line is untested, unproven, and are just guesses.   *
 		 * Insert above and use at your own risk                          *
 		 ******************************************************************/
@@ -2162,7 +2162,7 @@ gsf_msole_lid_to_codepage (guint lid)
 		return 0; /* UNKNOWN, believed to be Unicode only */
 #endif
 	};
-	
+
 	/* This is just a guess, but it will be a frequent guess */
 	return 1252;
 }
@@ -2170,7 +2170,7 @@ gsf_msole_lid_to_codepage (guint lid)
 /**
  * gsf_msole_lid_to_codepage_str
  * @lid :
- * 
+ *
  * Returns: the Iconv codepage string for the given LID.
  * 	Return value must be g_free ()'d
  **/
@@ -2245,7 +2245,7 @@ gsf_msole_iconv_get_codepage_string_list (int codepage)
 		default:
 			cp_list = g_slist_prepend (cp_list, g_strdup_printf ("CP%u", codepage));
 	}
-	
+
 	return cp_list;
 }
 
@@ -2357,9 +2357,9 @@ gsf_msole_iconv_open_for_export (void)
  * gsf_msole_inflate:
  * @input: stream to read from
  * @offset: offset into it for start byte of compresse stream
- * 
+ *
  * Decompresses an LZ compressed stream.
- * 
+ *
  * Return value: A GByteArray that the caller is responsible for freeing
  **/
 GByteArray *
diff --git a/gsf/gsf-open-pkg-utils.c b/gsf/gsf-open-pkg-utils.c
index 5ecfb0b..56fa61e 100644
--- a/gsf/gsf-open-pkg-utils.c
+++ b/gsf/gsf-open-pkg-utils.c
@@ -763,7 +763,7 @@ gsf_outfile_open_pkg_set_sink (GsfOutfileOpenPkg *open_pkg, GsfOutput *sink)
 /**
  * gsf_outfile_open_pkg_set_content_type :
  * @open_pkg : #GsfOutfileOpenPkg
- * @content_type : 
+ * @content_type :
  *
  **/
 void
@@ -812,7 +812,7 @@ gsf_outfile_open_pkg_relate (GsfOutfileOpenPkg *child,
 	GString *path;
 	int up = -1;
 	GsfOutfile *child_dir, *parent_dir;
-	
+
 	/* Calculate the path from @child to @parent */
 	parent_dir = parent->is_dir ? GSF_OUTFILE (parent)
 		: gsf_output_container (GSF_OUTPUT (parent));
diff --git a/gsf/gsf-opendoc-utils.c b/gsf/gsf-opendoc-utils.c
index b6ce3fe..3602d3c 100644
--- a/gsf/gsf-opendoc-utils.c
+++ b/gsf/gsf-opendoc-utils.c
@@ -48,7 +48,7 @@ get_gsf_odf_version_string (void)
 	return "1.2";
 }
 
-G_MODULE_EXPORT short 
+G_MODULE_EXPORT short
 get_gsf_odf_version (void)
 {
 	return 102;
@@ -131,7 +131,7 @@ GsfXMLInNS gsf_ooo_ns[] = {
 	GSF_XML_IN_NS (OO_LOTUS_NS_PRODTOOLS, "http://www.ibm.com/xmlns/prodtools";),
 
 	/* CleverAge ODF Add-in for Microsoft Office 3.0.5224.0 (11.0.8302)*/
-	GSF_XML_IN_NS (OO_CLEVERAGE_NS_DC,	"http://purl.org/dc/terms/";), 
+	GSF_XML_IN_NS (OO_CLEVERAGE_NS_DC,	"http://purl.org/dc/terms/";),
 
 	/* KOffice 1.6.3 */
 	GSF_XML_IN_NS (OO_KDE_NS_KOFFICE, "http://www.koffice.org/2005/";),
@@ -220,7 +220,7 @@ od_meta_user_defined (GsfXMLIn *xin,  xmlChar const **attrs)
 		else if (!strcmp (CXML2C (attrs[0]), "meta:value-type") ||
 			 !strcmp (CXML2C (attrs[0]), "meta:type")) {
 				/*
-				 * "meta:type" is a typo on the write 
+				 * "meta:type" is a typo on the write
 				 * side that was
 				 * fixed on 20110509.
 				 */
@@ -253,7 +253,7 @@ static void
 od_meta_user_defined_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
 {
 	GsfOOMetaIn *mi = (GsfOOMetaIn *)xin->user_state;
-	
+
 	if (mi->name != NULL) {
 		GValue *res = g_new0 (GValue, 1);
 		GType t = mi->typ;
@@ -303,7 +303,7 @@ static GsfXMLInNode const gsf_opendoc_meta_st_dtd[] = {
 };
 
 
-static void 
+static void
 gsf_opendoc_metadata_subtree_free (G_GNUC_UNUSED GsfXMLIn *xin, gpointer old_state)
 {
 	GsfOOMetaIn *state = old_state;
@@ -413,7 +413,7 @@ od_map_prop_name (char const *name)
 	/* shared by all instances and never freed */
 	static GHashTable *od_prop_name_map = NULL;
 
-	if (NULL == od_prop_name_map) 
+	if (NULL == od_prop_name_map)
 	{
 		static struct {
 			char const *gsf_key;
@@ -544,7 +544,7 @@ meta_write_props (char const *prop_name, GsfDocProp *prop, GsfXMLOut *output)
 		case G_TYPE_FLOAT:
 		case G_TYPE_DOUBLE:
 			type_name = "float";
-			break; 
+			break;
 
 		default:
 			if (GSF_TIMESTAMP_TYPE == t)
@@ -576,7 +576,7 @@ gsf_opendoc_metadata_write (GsfXMLOut *output, GsfDocMetaData const *md)
 		"urn:oasis:names:tc:opendocument:xmlns:meta:1.0");
 	gsf_xml_out_add_cstr_unchecked (output, "xmlns:ooo",
 		"http://openoffice.org/2004/office";);
-	gsf_xml_out_add_cstr_unchecked (output, "office:version", 
+	gsf_xml_out_add_cstr_unchecked (output, "office:version",
 					get_gsf_odf_version_string ());
 	gsf_xml_out_start_element (output, OFFICE "meta");
 	gsf_doc_meta_data_foreach (md, (GHFunc) meta_write_props, output);
diff --git a/gsf/gsf-outfile-impl.h b/gsf/gsf-outfile-impl.h
index e563459..5ee2b12 100644
--- a/gsf/gsf-outfile-impl.h
+++ b/gsf/gsf-outfile-impl.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-outfile-impl.h: 
+ * gsf-outfile-impl.h:
  *
  * Copyright (C) 2002-2006 Jody Goldberg (jody gnome org)
  *
diff --git a/gsf/gsf-outfile-msole.c b/gsf/gsf-outfile-msole.c
index 3a50379..ecd3a00 100644
--- a/gsf/gsf-outfile-msole.c
+++ b/gsf/gsf-outfile-msole.c
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-outfile-msole.c: 
+ * gsf-outfile-msole.c:
  *
  * Copyright (C) 2002-2006 Jody Goldberg (jody gnome org)
  *
@@ -218,7 +218,7 @@ ole_write_const (GsfOutput *sink, guint32 value, unsigned n)
 static void
 ole_pad_bat_unused (GsfOutfileMSOle *ole, unsigned residual)
 {
-	ole_write_const (ole->sink, BAT_MAGIC_UNUSED, 
+	ole_write_const (ole->sink, BAT_MAGIC_UNUSED,
 		(ole_bytes_left_in_block (ole) / BAT_INDEX_SIZE) - residual);
 }
 
@@ -513,7 +513,7 @@ gsf_outfile_msole_write (GsfOutput *output,
 			g_warning ("File too big");
 			return FALSE;
 		}
-		
+
 		ole->first_block = ole_cur_block (ole);
 		ole->type = MSOLE_BIG_BLOCK;
 		wsize = output->cur_size;
@@ -619,7 +619,7 @@ gsf_outfile_msole_new_child (GsfOutfile *parent,
 	child->sink   = ole_parent->sink;
 	child->root   = ole_parent->root;
 	gsf_outfile_msole_set_block_shift (child,
-		ole_parent->bb.shift, ole_parent->sb.shift); 
+		ole_parent->bb.shift, ole_parent->sb.shift);
 	gsf_output_set_name (GSF_OUTPUT (child), name);
 	gsf_output_set_container (GSF_OUTPUT (child), parent);
 
@@ -640,7 +640,7 @@ gsf_outfile_msole_init (GObject *obj)
 	ole->root   = NULL;
 	ole->type   = MSOLE_DIR;
 
-	gsf_outfile_msole_set_block_shift (ole, 
+	gsf_outfile_msole_set_block_shift (ole,
 		OLE_DEFAULT_BB_SHIFT, OLE_DEFAULT_SB_SHIFT);
 
 	ole->content.dir.children = NULL;
@@ -771,7 +771,7 @@ gsf_outfile_msole_new_full (GsfOutput *sink, guint bb_size, guint sb_size)
 GsfOutfile *
 gsf_outfile_msole_new (GsfOutput *sink)
 {
-	return gsf_outfile_msole_new_full (sink, 
+	return gsf_outfile_msole_new_full (sink,
 		OLE_DEFAULT_BB_SIZE, OLE_DEFAULT_SB_SIZE);
 }
 
diff --git a/gsf/gsf-outfile-stdio.c b/gsf/gsf-outfile-stdio.c
index 3e6cbbb..607e03e 100644
--- a/gsf/gsf-outfile-stdio.c
+++ b/gsf/gsf-outfile-stdio.c
@@ -60,7 +60,7 @@ gsf_outfile_stdio_new_child (GsfOutfile *parent,
 	char *path = g_build_filename (ofs->root, name, NULL);
 
 	if (is_dir)
-		child = (GsfOutput *)gsf_outfile_stdio_new_valist (path, NULL, 
+		child = (GsfOutput *)gsf_outfile_stdio_new_valist (path, NULL,
 								   first_property_name, args);
 	else
 		child = gsf_output_stdio_new_valist (path, NULL,
@@ -157,7 +157,7 @@ gsf_outfile_stdio_new_full (char const *root, GError **err,
 {
 	GsfOutfile *res;
 	va_list var_args;
-	
+
 	va_start (var_args, first_property_name);
 	res = gsf_outfile_stdio_new_valist (root, err, first_property_name, var_args);
 	va_end (var_args);
diff --git a/gsf/gsf-outfile-zip.c b/gsf/gsf-outfile-zip.c
index f94e262..315e809 100644
--- a/gsf/gsf-outfile-zip.c
+++ b/gsf/gsf-outfile-zip.c
@@ -390,7 +390,7 @@ zip_flush (GsfOutfileZip *zip)
 	do {
 		zret = deflate (zip->stream, Z_FINISH);
 		if (zret == Z_OK || (zret == Z_BUF_ERROR && zip->stream->avail_out == 0)) {
-			/*  In this case Z_OK or Z_BUF_ERROR means more buffer 
+			/*  In this case Z_OK or Z_BUF_ERROR means more buffer
 			    space is needed  */
 			if (!zip_output_block (zip))
 				return FALSE;
diff --git a/gsf/gsf-output-bzip.c b/gsf/gsf-output-bzip.c
index 87300f8..934bf83 100644
--- a/gsf/gsf-output-bzip.c
+++ b/gsf/gsf-output-bzip.c
@@ -71,7 +71,7 @@ static gboolean
 init_bzip (GsfOutputBzip *bzip, GError **err)
 {
 	int ret;
-	
+
 	ret = BZ2_bzCompressInit (&bzip->stream, 6, 0, 0);
 
 	if (ret != BZ_OK) {
@@ -81,7 +81,7 @@ init_bzip (GsfOutputBzip *bzip, GError **err)
 		return FALSE;
 	}
 	if (!bzip->buf) {
-		bzip->buf_size = BZ_BUFSIZE; 
+		bzip->buf_size = BZ_BUFSIZE;
 		bzip->buf = g_new (guint8, bzip->buf_size);
 	}
 	bzip->stream.next_out  = bzip->buf;
@@ -94,7 +94,7 @@ static gboolean
 bzip_output_block (GsfOutputBzip *bzip)
 {
 	size_t num_bytes = bzip->buf_size - bzip->stream.avail_out;
-	
+
 	if (!gsf_output_write (bzip->sink, num_bytes, bzip->buf))
 		return FALSE;
 
@@ -141,7 +141,7 @@ gsf_output_bzip_write (GsfOutput *output,
 
 	bzip->stream.next_in  = (unsigned char *) data;
 	bzip->stream.avail_in = num_bytes;
-	
+
 	while (bzip->stream.avail_in > 0) {
 		int zret;
 
@@ -176,7 +176,7 @@ static gboolean
 gsf_output_bzip_seek (G_GNUC_UNUSED GsfOutput *output,
 		      G_GNUC_UNUSED gsf_off_t offset,
 		      G_GNUC_UNUSED GSeekType whence)
-{	
+{
 	return FALSE;
 }
 
diff --git a/gsf/gsf-output-gio.c b/gsf/gsf-output-gio.c
index 8256067..7d0966e 100644
--- a/gsf/gsf-output-gio.c
+++ b/gsf/gsf-output-gio.c
@@ -111,7 +111,7 @@ gsf_output_gio_new_for_path (char const *path, GError **err)
 
 	output = gsf_output_gio_new (file);
 	g_object_unref (file);
-	
+
 	return output;
 }
 
@@ -139,7 +139,7 @@ gsf_output_gio_new_for_uri (char const *uri, GError **err)
 
 	output = gsf_output_gio_new (file);
 	g_object_unref (file);
-	
+
 	return output;
 }
 
@@ -152,7 +152,7 @@ gsf_output_gio_close (GsfOutput *output)
 		g_output_stream_close (gio->stream, NULL, NULL);
 		g_object_unref (gio->stream);
 		gio->stream = NULL;
-		
+
 		g_object_unref (gio->file);
 		gio->file = NULL;
 
@@ -210,7 +210,7 @@ gsf_output_gio_seek (GsfOutput *output, gsf_off_t offset, GSeekType whence)
 
 	g_return_val_if_fail (gio != NULL, FALSE);
 	g_return_val_if_fail (gio->stream != NULL, FALSE);
-	
+
 	if (!can_seek (gio->stream))
 		return FALSE;
 
diff --git a/gsf/gsf-output-gio.h b/gsf/gsf-output-gio.h
index f7f44ee..5a03318 100644
--- a/gsf/gsf-output-gio.h
+++ b/gsf/gsf-output-gio.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-output-gio.h: 
+ * gsf-output-gio.h:
  *
  * Copyright (C) 2007 Dom Lachowicz <cinamod hotmail com>
  *
diff --git a/gsf/gsf-output-iconv.c b/gsf/gsf-output-iconv.c
index a3fc0d3..4a2a70f 100644
--- a/gsf/gsf-output-iconv.c
+++ b/gsf/gsf-output-iconv.c
@@ -303,7 +303,7 @@ gsf_output_iconv_class_init (GObjectClass *gobject_class)
 	 * Either NULL or a UTF-8 string (representable in the target encoding)
 	 * to convert and output in place of characters that cannot be represented
 	 * in the target encoding.  NULL means use \u1234 or \U12345678 format.
-	 */  
+	 */
 	g_object_class_install_property
 		(gobject_class,
 		 PROP_FALLBACK,
diff --git a/gsf/gsf-output-iochannel.c b/gsf/gsf-output-iochannel.c
index 09eae07..5c2c480 100644
--- a/gsf/gsf-output-iochannel.c
+++ b/gsf/gsf-output-iochannel.c
@@ -47,7 +47,7 @@ gsf_output_iochannel_new (GIOChannel *channel)
 
 	g_return_val_if_fail (channel != NULL, NULL);
 
-	output = g_object_new (GSF_OUTPUT_IOCHANNEL_TYPE, NULL);	
+	output = g_object_new (GSF_OUTPUT_IOCHANNEL_TYPE, NULL);
 	if (G_UNLIKELY (NULL == output)) return NULL;
 
 	output->channel = channel;
@@ -61,7 +61,7 @@ gsf_output_iochannel_close (GsfOutput *output)
 
 	if (parent_class->Close)
 		parent_class->Close (output);
-	
+
 	return TRUE;
 }
 
@@ -119,7 +119,7 @@ static void
 gsf_output_iochannel_class_init (GObjectClass *gobject_class)
 {
 	GsfOutputClass *output_class = GSF_OUTPUT_CLASS (gobject_class);
-	
+
 	gobject_class->finalize = gsf_output_iochannel_finalize;
 	output_class->Close     = gsf_output_iochannel_close;
 	output_class->Seek      = gsf_output_iochannel_seek;
diff --git a/gsf/gsf-output-memory.c b/gsf/gsf-output-memory.c
index 1338954..df29676 100644
--- a/gsf/gsf-output-memory.c
+++ b/gsf/gsf-output-memory.c
@@ -47,7 +47,7 @@ typedef struct {
 GsfOutput *
 gsf_output_memory_new (void)
 {
-	return g_object_new (GSF_OUTPUT_MEMORY_TYPE, NULL);	
+	return g_object_new (GSF_OUTPUT_MEMORY_TYPE, NULL);
 }
 
 static gboolean
@@ -61,7 +61,7 @@ static void
 gsf_output_memory_finalize (GObject *obj)
 {
 	GsfOutputMemory *mem = GSF_OUTPUT_MEMORY (obj);
-	
+
 	g_free (mem->buffer);
 	mem->buffer = NULL;
 
@@ -82,7 +82,7 @@ gsf_output_memory_expand (GsfOutputMemory *mem, gsf_off_t needed)
 {
 	gsf_off_t capacity = MAX (mem->capacity, MIN_BLOCK);
 	gsize lcapacity;
-	
+
 	/* If we need >= MAX_STEP, align to a next multiple of MAX_STEP.
 	 * Since MAX_STEP is probably a power of two, this computation
 	 * should reduce to "dec, shr, inc, shl", which is probably
@@ -102,7 +102,7 @@ gsf_output_memory_expand (GsfOutputMemory *mem, gsf_off_t needed)
 	}
 	mem->buffer   = g_renew (guint8, mem->buffer, lcapacity);
 	mem->capacity = capacity;
-	
+
 	return TRUE;
 }
 
@@ -112,9 +112,9 @@ gsf_output_memory_write (GsfOutput *output,
 			 guint8 const *buffer)
 {
 	GsfOutputMemory *mem = GSF_OUTPUT_MEMORY (output);
-	
+
 	g_return_val_if_fail (mem != NULL, FALSE);
-	
+
 	if (!mem->buffer) {
 		mem->buffer   = g_new (guint8, MIN_BLOCK);
 		mem->capacity = MIN_BLOCK;
@@ -123,8 +123,8 @@ gsf_output_memory_write (GsfOutput *output,
 		if (!gsf_output_memory_expand (mem, output->cur_offset + num_bytes))
 			return FALSE;
 	}
-	
-	memcpy (mem->buffer + output->cur_offset, buffer, num_bytes);	
+
+	memcpy (mem->buffer + output->cur_offset, buffer, num_bytes);
 	return TRUE;
 }
 
@@ -174,7 +174,7 @@ static void
 gsf_output_memory_class_init (GObjectClass *gobject_class)
 {
 	GsfOutputClass *output_class = GSF_OUTPUT_CLASS (gobject_class);
-	
+
 	gobject_class->finalize = gsf_output_memory_finalize;
 	output_class->Close     = gsf_output_memory_close;
 	output_class->Seek      = gsf_output_memory_seek;
@@ -187,7 +187,7 @@ gsf_output_memory_class_init (GObjectClass *gobject_class)
 /**
  * gsf_output_memory_get_bytes :
  * @mem : the output device.
- * 
+ *
  * Returns: The data that has been written to @mem, or %null
  **/
 const guint8 *
diff --git a/gsf/gsf-output-stdio.c b/gsf/gsf-output-stdio.c
index d40ba02..88733da 100644
--- a/gsf/gsf-output-stdio.c
+++ b/gsf/gsf-output-stdio.c
@@ -315,7 +315,7 @@ gsf_output_stdio_seek (GsfOutput *output, gsf_off_t offset, GSeekType whence)
 	off_t loffset;
 #endif
 
-	g_return_val_if_fail (stdio->file != NULL, 
+	g_return_val_if_fail (stdio->file != NULL,
 			      gsf_output_set_error (output, 0, "missing file"));
 
 	loffset = offset;
@@ -360,7 +360,7 @@ gsf_output_stdio_write (GsfOutput *output,
 	remaining = num_bytes;
 
 	while (remaining > 0) {
-		written = fwrite (buffer + (num_bytes - remaining), 1, 
+		written = fwrite (buffer + (num_bytes - remaining), 1,
 				  remaining, stdio->file);
 		if ((written < remaining) && ferror (stdio->file) != 0)
 			return gsf_output_set_error (output, errno, "%s", g_strerror (errno));
@@ -533,7 +533,7 @@ gsf_output_stdio_new_valist (char const *filename, GError **err,
  * @filename : name of file to create or replace.
  * @err	     : optionally %NULL.
  * @first_property_name : %NULL terminated list of properties
- * @Varargs : 
+ * @Varargs :
  *
  * Returns: a new file or %NULL.
  **/
@@ -543,7 +543,7 @@ gsf_output_stdio_new_full (char const *filename, GError **err,
 {
 	GsfOutput *res;
 	va_list var_args;
-	
+
 	va_start (var_args, first_property_name);
 	res = gsf_output_stdio_new_valist (filename, err, first_property_name, var_args);
 	va_end (var_args);
diff --git a/gsf/gsf-output-transaction.c b/gsf/gsf-output-transaction.c
index c8f1f05..2fc2f59 100644
--- a/gsf/gsf-output-transaction.c
+++ b/gsf/gsf-output-transaction.c
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-output-transaction.c: 
+ * gsf-output-transaction.c:
  *
  * Copyright (C) 2004-2006 Dom Lachowicz (cinamod hotmail com)
  *
@@ -36,10 +36,10 @@ struct _GsfOutputTransaction
 	gboolean    aborted;
 };
 
-struct _GsfOutputTransactionClass 
+struct _GsfOutputTransactionClass
 {
 	GsfOutputClass parent;
-	
+
 	/* signals */
 	void (* updated)   (GsfOutputTransaction * me);
 	void (* committed) (GsfOutputTransaction * me);
@@ -83,9 +83,9 @@ gsf_output_transaction_commit (GsfOutputTransaction * output)
 		g_warning ("Attempting to commit to an aborted transaction");
 		return FALSE;
 	}
-	
+
 	/* write the proxy's bytes to the wrapped class */
-	result = gsf_output_write (output->wrapped, 
+	result = gsf_output_write (output->wrapped,
 				   gsf_output_size (GSF_OUTPUT (output->proxy)),
 				   gsf_output_memory_get_bytes (GSF_OUTPUT_MEMORY (output->proxy)));
 
@@ -96,7 +96,7 @@ gsf_output_transaction_commit (GsfOutputTransaction * output)
 	}
 	else
 		gsf_output_transaction_abort (output);
-	
+
 	return result;
 }
 
@@ -114,10 +114,10 @@ gsf_output_transaction_abort (GsfOutputTransaction * output)
 	g_return_if_fail (GSF_IS_OUTPUT_TRANSACTION (output));
 
 	output->aborted = TRUE;
-	
+
 	/* close the underlying proxy - we can no longer take place in any transactions */
 	gsf_output_close (GSF_OUTPUT (output));
-	
+
 	g_signal_emit (G_OBJECT (output), transaction_signals[ABORTED], 0);
 }
 
@@ -143,12 +143,12 @@ gsf_output_transaction_new_named (GsfOutput *wrapped, char const *name)
 	gsf_output_set_name (GSF_OUTPUT (trans), name);
 
 	trans->proxy = gsf_output_memory_new ();
-	
+
 	/* TODO: connect signals if wrapped is a GsfOutputTransaction for cascade-effect?? */
-	
+
 	trans->wrapped = wrapped;
 	g_object_ref (trans->wrapped);
-	
+
 	return GSF_OUTPUT (trans);
 }
 
@@ -185,7 +185,7 @@ static gboolean
 gsf_output_trans_seek (GsfOutput *output, gsf_off_t offset,
 		       GSeekType whence)
 {
-	GsfOutputTransaction * trans = (GsfOutputTransaction *)output;	
+	GsfOutputTransaction * trans = (GsfOutputTransaction *)output;
 	gboolean result;
 
 	g_return_val_if_fail (output != NULL, FALSE);
@@ -216,18 +216,18 @@ gsf_output_trans_write (GsfOutput *output,
 
 	g_return_val_if_fail (output != NULL, FALSE);
 	g_return_val_if_fail (GSF_IS_OUTPUT_TRANSACTION (output), FALSE);
-	
+
 	if (trans->aborted) {
 		g_warning ("Attempting to write to an aborted transaction");
 		return FALSE;
 	}
-	
+
 	result = gsf_output_write (trans->proxy, num_bytes, buffer);
 	if (result)
 		g_signal_emit (G_OBJECT (trans), transaction_signals[UPDATED], 0);
 	else
 		gsf_output_transaction_abort (trans);
-	
+
 	return result;
 }
 
@@ -243,18 +243,18 @@ gsf_output_trans_vprintf (GsfOutput *output, char const *format, va_list args)
 
 	g_return_val_if_fail (output != NULL, FALSE);
 	g_return_val_if_fail (GSF_IS_OUTPUT_TRANSACTION (output), FALSE);
-	
+
 	if (trans->aborted) {
 		g_warning ("Attempting to write to an aborted transaction");
 		return FALSE;
 	}
-	
+
 	result = proxy_class->Vprintf (trans->proxy, format, args);
 	if (result >= 0)
 		g_signal_emit (G_OBJECT (trans), transaction_signals[UPDATED], 0);
 	else
 		gsf_output_transaction_abort (trans);
-	
+
 	return result;
 }
 
diff --git a/gsf/gsf-output-transaction.h b/gsf/gsf-output-transaction.h
index 8d2ff6e..6637396 100644
--- a/gsf/gsf-output-transaction.h
+++ b/gsf/gsf-output-transaction.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-output-transaction.h: 
+ * gsf-output-transaction.h:
  *
  * Copyright (C) 2004-2006 Dom Lachowicz (cinamod hotmail com)
  *
diff --git a/gsf/gsf-output.c b/gsf/gsf-output.c
index bda6fbf..410aec1 100644
--- a/gsf/gsf-output.c
+++ b/gsf/gsf-output.c
@@ -271,7 +271,7 @@ gsf_output_tell	(GsfOutput *output)
  * Reposition in output stream @output. @whence specifies what the offset is
  * relative to: the beginning of the stream (%G_SEEK_SET), current position in
  * the stream (%G_SEEK_CUR) or the end of the stream (%G_SEEK_END).
- * This function is similar to 
+ * This function is similar to
  * <citerefentry><refentrytitle>fseek</refentrytitle>
  * <manvolnum>3</manvolnum></citerefentry>.
  *
@@ -628,7 +628,7 @@ gsf_output_real_vprintf (GsfOutput *output, char const *fmt, va_list args)
  * @output: A #GsfOutput
  * @line: %null terminated string to write
  *
- * Like fputs, this assumes that the line already ends with a newline 
+ * Like fputs, this assumes that the line already ends with a newline
  *
  * Returns: %TRUE if successful, %FALSE if not
  **/
diff --git a/gsf/gsf-shared-memory.c b/gsf/gsf-shared-memory.c
index 4057ab5..9492f8c 100644
--- a/gsf/gsf-shared-memory.c
+++ b/gsf/gsf-shared-memory.c
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-shared-memory.c: 
+ * gsf-shared-memory.c:
  *
  * Copyright (C) 2002-2006 Morten Welinder (terra diku dk)
  *
@@ -71,7 +71,7 @@ static void
 gsf_shared_memory_finalize (GObject *obj)
 {
 	GsfSharedMemory *mem = (GsfSharedMemory *) (obj);
-	
+
 	if (mem->buf != NULL) {
 		if (mem->needs_free)
 			g_free (mem->buf);
diff --git a/gsf/gsf-structured-blob.c b/gsf/gsf-structured-blob.c
index ad5c8d6..e4845e8 100644
--- a/gsf/gsf-structured-blob.c
+++ b/gsf/gsf-structured-blob.c
@@ -36,7 +36,7 @@ struct _GsfStructuredBlob {
 
 	GsfSharedMemory *data;
 	GPtrArray *children;
-}; 
+};
 typedef struct {
 	GsfInfileClass base;
 } GsfStructuredBlobClass;
diff --git a/gsf/gsf-timestamp.c b/gsf/gsf-timestamp.c
index f9dc081..91e9e4e 100644
--- a/gsf/gsf-timestamp.c
+++ b/gsf/gsf-timestamp.c
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-timestamp.c: 
+ * gsf-timestamp.c:
  *
  * Copyright (C) 2002-2006 Jody Goldberg (jody gnome org)
  *
@@ -110,10 +110,10 @@ static time_t gmt_to_local_win32(void)
 
     if (dwStandardDaylight == TIME_ZONE_ID_STANDARD)
         bias += tzinfo.StandardBias;
-    
+
     if (dwStandardDaylight == TIME_ZONE_ID_DAYLIGHT)
         bias += tzinfo.DaylightBias;
-    
+
     return (- bias * 60);
 }
 #endif
diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
index d7a7247..299fc84 100644
--- a/gsf/gsf-utils.c
+++ b/gsf/gsf-utils.c
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-utils.c: 
+ * gsf-utils.c:
  *
  * Copyright (C) 2002-2006 Jody Goldberg (jody gnome org)
  *
@@ -189,7 +189,7 @@ gsf_init (void)
 
 /**
  * gsf_shutdown:
- * 
+ *
  * De-intializes the GSF library
  * Currently does nothing.
  **/
@@ -267,7 +267,7 @@ gsf_init_dynamic (GTypeModule *module)
 
 /**
  * gsf_shutdown:
- * 
+ *
  * De-intializes the GSF library from a type module.
  * Currently does nothing.
  **/
@@ -581,7 +581,7 @@ char const *
 gsf_extension_pointer (char const *path)
 {
 	char const *s, *end;
-	
+
 	g_return_val_if_fail (path != NULL, NULL);
 
 	end = path + strlen (path);
@@ -715,7 +715,7 @@ gsf_base64_encode_close (guint8 const *in, size_t inlen,
 
 	c1 = ((guint8 *)save)[1];
 	c2 = ((guint8 *)save)[2];
-	
+
 	d(printf("mode = %d\nc1 = %c\nc2 = %c\n",
 		 (int)((char *)save)[0],
 		 (int)((char *)save)[1],
@@ -791,7 +791,7 @@ gsf_base64_encode_step (guint8 const *in, size_t len,
 		case 2:	c1 = ((guint8 *)save)[1];
 			c2 = ((guint8 *)save)[2]; goto skip2;
 		}
-		
+
 		/* yes, we jump into the loop, no i'm not going to change it, it's beautiful! */
 		while (inptr < inend) {
 			c1 = *inptr++;
diff --git a/gsf/gsf-utils.h b/gsf/gsf-utils.h
index 0d18bfd..11e25f6 100644
--- a/gsf/gsf-utils.h
+++ b/gsf/gsf-utils.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-utils.h: 
+ * gsf-utils.h:
  *
  * Copyright (C) 2002-2006 Jody Goldberg (jody gnome org)
  *
diff --git a/gsf/gsf-zip-impl.h b/gsf/gsf-zip-impl.h
index d36daa8..dc187e2 100644
--- a/gsf/gsf-zip-impl.h
+++ b/gsf/gsf-zip-impl.h
@@ -1,6 +1,6 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gsf-zip-impl.h: 
+ * gsf-zip-impl.h:
  *
  * Copyright (C) 2002-2006 Tambet Ingo (tambet ximian com)
  *
@@ -86,7 +86,7 @@ G_BEGIN_DECLS
 #define ZZIP_IS_COMPRLEVEL(p)  (((*(unsigned char*)p)>>1)&3)
 #define ZZIP_IS_STREAMED(p)    (((*(unsigned char*)p)>>3)&1)
 
-typedef struct {	
+typedef struct {
 	char                    *name;
 	guint16                  flags;
 	GsfZipCompressionMethod  compr_method;
diff --git a/python/gsfgnomemodule.c b/python/gsfgnomemodule.c
index dbb2c46..3d48cfd 100644
--- a/python/gsfgnomemodule.c
+++ b/python/gsfgnomemodule.c
@@ -18,7 +18,7 @@
  * USA
  */
 
-/* 
+/*
  * Python bindings for gnome extensions to libgsf.
  */
 
@@ -40,7 +40,7 @@ initgnome (void)
 	d = PyModule_GetDict (m);
 
 	pygsfgnome_register_classes (d);
-	
+
 	if (PyErr_Occurred ()) {
 		Py_FatalError ((char *) "can't initialise module gsf.gnome");
 	}
diff --git a/python/gsfmodule.c b/python/gsfmodule.c
index 35880ea..c1b3c6a 100644
--- a/python/gsfmodule.c
+++ b/python/gsfmodule.c
@@ -18,7 +18,7 @@
  * USA
  */
 
-/* 
+/*
  * Python bindings for libgsf.
  */
 
@@ -40,7 +40,7 @@ init_gsf (void)
 	d = PyModule_GetDict (m);
 
 	pygsf_register_classes (d);
-	
+
 	if (PyErr_Occurred ()) {
 		Py_FatalError ((char *) "can't initialise module gsf");
 	}
diff --git a/tests/test-cat-zip.c b/tests/test-cat-zip.c
index d5e5984..56a2a01 100644
--- a/tests/test-cat-zip.c
+++ b/tests/test-cat-zip.c
@@ -35,7 +35,7 @@ ls_R (GsfInput *input)
 	char const *name = gsf_input_name (GSF_INPUT (input));
 	gboolean is_dir = GSF_IS_INFILE (input) &&
 		(gsf_infile_num_children (GSF_INFILE (input)) >= 0);
-	
+
 	printf ("%c '%s'\t\t%" GSF_OFF_T_FORMAT "\n",
 		(is_dir ? 'd' : ' '),
 		(name != NULL) ? name : "",
diff --git a/tests/test-cp.c b/tests/test-cp.c
index 26d9667..b1a6881 100644
--- a/tests/test-cp.c
+++ b/tests/test-cp.c
@@ -60,7 +60,7 @@ test (char *argv[])
 		rval = 1;
 		err = (GError*) gsf_output_error (output);
 		if (err != NULL) {
-			g_warning ("'%s' error: %s\n", argv[2], err->message);	
+			g_warning ("'%s' error: %s\n", argv[2], err->message);
 		}
 	}
 
diff --git a/tests/test-dump-msole.c b/tests/test-dump-msole.c
index 1012b91..3837394 100644
--- a/tests/test-dump-msole.c
+++ b/tests/test-dump-msole.c
@@ -52,8 +52,8 @@ clone (GsfInput *input, GsfOutput *output)
 				return;
 			}
 		}
-	} 
-	
+	}
+
 	/* See test-cp-msole.c for explanation how to distinct directories
 	 * from regular files.
 	 */
diff --git a/tests/test-gio.c b/tests/test-gio.c
index 0c93d58..c89af23 100644
--- a/tests/test-gio.c
+++ b/tests/test-gio.c
@@ -60,7 +60,7 @@ test (char *argv[])
 		rval = 1;
 		err = (GError*) gsf_output_error (output);
 		if (err != NULL) {
-			g_warning ("'%s' error: %s\n", argv[2], err->message);	
+			g_warning ("'%s' error: %s\n", argv[2], err->message);
 		}
 	}
 
diff --git a/tests/test-msole2.c b/tests/test-msole2.c
index 31d7ea6..5150824 100644
--- a/tests/test-msole2.c
+++ b/tests/test-msole2.c
@@ -38,7 +38,7 @@ ls_R (GsfInput *input)
 	gboolean is_dir = GSF_IS_INFILE (input) &&
 		(gsf_infile_num_children (GSF_INFILE (input)) >= 0);
 	/* Please see the comment on is_dir in test-cp-msole.c. */
-	
+
 	printf ("%c '%s'\t\t%" GSF_OFF_T_FORMAT "\n",
 		(is_dir ? 'd' : ' '),
 		(name != NULL) ? name : "",
diff --git a/tests/test-msvba-zip.c b/tests/test-msvba-zip.c
index 003bc13..77244f3 100644
--- a/tests/test-msvba-zip.c
+++ b/tests/test-msvba-zip.c
@@ -97,7 +97,7 @@ output_data (CompressBuf *buf, guint8 *data, gboolean compressed)
 		gsf_output_write (buf->output, 1, &buf->mask);
 		gsf_output_write (buf->output, buf->outstr->len, buf->outstr->str);
 
-#ifdef DEBUG		
+#ifdef DEBUG
 		fprintf (stderr, "Block: 0x%x '", buf->mask);
 		for (i = 0; i < buf->outstr->len; i++)
 			fprintf (stderr, "%c", byte_to_char (buf->outstr->str[i]));
@@ -126,7 +126,7 @@ output_match (CompressBuf *buf, guint cur_pos, guint pos, guint len)
 	data[0] = token & 0xff;
 	data[1] = token >> 8;
 
-#ifdef DEBUG		
+#ifdef DEBUG
 	fprintf (stderr, "shift %d, [0x%x(%d) - %d], len %d, distance %d bytes %.2x %.2x\n",
 		 shift, cur_pos, cur_pos, pos, len, distance,
 		 data[0], data[1]);
@@ -249,7 +249,7 @@ decode_dir (GsfInput *input)
 			fprintf (stderr, "** Quirk fix **\n");
 			length += 2;
 		}
-		
+
 		/* Special nasties / up-stream bugs */
 		switch (op) {
 		case 0x4:
@@ -365,7 +365,7 @@ main (int argc, char *argv[])
 				 input, output, error ? error->message : "<NoMsg>");
 			return 1;
 		}
-		
+
 		if (compress)
 			do_compress (input, output);
 		else
diff --git a/tests/test-restore-msole.c b/tests/test-restore-msole.c
index dafca84..cfd1d68 100644
--- a/tests/test-restore-msole.c
+++ b/tests/test-restore-msole.c
@@ -52,7 +52,7 @@ clone (GsfInput *input, GsfOutput *output)
 				return;
 			}
 		}
-	} 
+	}
 
 	/* See test-cp-msole.c for explanation how to distinct directories
 	 * from regular files.
diff --git a/tests/test-xml.c b/tests/test-xml.c
index 860076e..61f1a12 100644
--- a/tests/test-xml.c
+++ b/tests/test-xml.c
@@ -60,7 +60,7 @@ test (char *argv[])
 		rval = 1;
 		err = (GError*) gsf_output_error (output);
 		if (err != NULL) {
-			g_warning ("'%s' error: %s\n", argv[2], err->message);	
+			g_warning ("'%s' error: %s\n", argv[2], err->message);
 		}
 	}
 
diff --git a/tests/test-zip-out-subdirs.c b/tests/test-zip-out-subdirs.c
index a670da7..1d08a2b 100644
--- a/tests/test-zip-out-subdirs.c
+++ b/tests/test-zip-out-subdirs.c
@@ -73,7 +73,7 @@ test (int argc, char *argv[])
 	if (!gsf_output_close ((GsfOutput *) dir1))
 		return 1;
 	ch3  = gsf_outfile_new_child  (dir2, "simply.pve", FALSE);
-	
+
 	if (!test_write_once (ch1))
 		return 1;
 	if (!gsf_output_close ((GsfOutput *) ch1))
diff --git a/tests/test-zip1.c b/tests/test-zip1.c
index 1887e06..d329f69 100644
--- a/tests/test-zip1.c
+++ b/tests/test-zip1.c
@@ -32,7 +32,7 @@ ls_R (GsfInput *input)
 	int i;
 	gboolean is_dir = GSF_IS_INFILE (input) &&
 		(gsf_infile_num_children (GSF_INFILE (input)) >= 0);
-	
+
 	printf ("%c '%s' %" GSF_OFF_T_FORMAT "\n",
 		(is_dir ? 'd' : ' '),
 		gsf_input_name (GSF_INPUT (input)),
diff --git a/tests/test-zip2.c b/tests/test-zip2.c
index 96b8cda..064e8fa 100644
--- a/tests/test-zip2.c
+++ b/tests/test-zip2.c
@@ -35,7 +35,7 @@ dump_child (GsfInfile *infile, char const *childname)
 	GsfInputTextline *textinput;
 	unsigned char *res;
 	int len = 0;
-	
+
 	if (child == NULL) {
 		printf ("not an OpenOffice document\n");
 		return;
@@ -96,7 +96,7 @@ test (int argc, char *argv[])
 	}
 	g_object_unref (G_OBJECT (infile));
 	g_object_unref (G_OBJECT (input));
-	
+
 	return 0;
 }
 
diff --git a/thumbnailer/main.c b/thumbnailer/main.c
index 59bd15e..693a5a9 100644
--- a/thumbnailer/main.c
+++ b/thumbnailer/main.c
@@ -147,7 +147,7 @@ zip_thumbnail (GsfInfile *infile, const char *out_filename, int thumb_size)
 		write_thumbnail (out_filename, data, len, thumb_size);
 		g_object_unref (thumbnail);
 	/* Check MS Office Open thumbnail */
-	} else if (NULL != (thumbnail = gsf_open_pkg_open_rel_by_type (GSF_INPUT(infile), 
+	} else if (NULL != (thumbnail = gsf_open_pkg_open_rel_by_type (GSF_INPUT(infile),
 				"http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail";,
 																   NULL))) {
 		gsf_off_t len = gsf_input_remaining (thumbnail);
diff --git a/tools/gsf.c b/tools/gsf.c
index fb9a76b..714f828 100644
--- a/tools/gsf.c
+++ b/tools/gsf.c
@@ -15,7 +15,7 @@
 
 static gboolean show_version;
 
-static GOptionEntry const gsf_options [] = { 
+static GOptionEntry const gsf_options [] = {
 	{
 		"version", 'v',
 		0, G_OPTION_ARG_NONE, &show_version,
@@ -25,7 +25,7 @@ static GOptionEntry const gsf_options [] = {
 
 	/* ---------------------------------------- */
 
-	{ NULL, 0, 0, 0, NULL, NULL, NULL} 
+	{ NULL, 0, 0, 0, NULL, NULL, NULL}
 };
 
 /* ------------------------------------------------------------------------- */
@@ -34,7 +34,7 @@ static GsfInfile *
 open_archive (char const *filename)
 {
 	GsfInfile *infile;
-	GError *error = NULL;	
+	GError *error = NULL;
 	GsfInput *src;
 	char *display_name;
 
@@ -347,7 +347,7 @@ int
 main (int argc, char **argv)
 {
 	GOptionContext *ocontext;
-	GError *error = NULL;	
+	GError *error = NULL;
 	char const *usage;
 	char const *cmd;
 	char const *me = (argv[0] ? argv[0] : "gsf");