Coding style and whitespace cleanup.

5 files changed, 150 insertions, 150 deletions

diff --git a/modules/text-highlight/e-mail-display-popup-text-highlight.c b/modules/text-highlight/e-mail-display-popup-text-highlight.c
index 18476c17bc..bd5d82a690 100644
--- a/modules/text-highlight/e-mail-display-popup-text-highlight.c
+++ b/modules/text-highlight/e-mail-display-popup-text-highlight.c
@@ -46,7 +46,7 @@ typedef struct _EMailDisplayPopupTextHighlightClass {
 
 #define E_MAIL_DISPLAY_POPUP_TEXT_HIGHLIGHT(obj) \
 	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), e_mail_display_popup_text_highlight_get_type(), EMailDisplayPopupTextHighlight))
+	((obj), e_mail_display_popup_text_highlight_get_type (), EMailDisplayPopupTextHighlight))
 
 GType e_mail_display_popup_text_highlight_get_type (void);
 static void e_mail_display_popup_extension_interface_init (EMailDisplayPopupExtensionInterface *iface);
@@ -109,8 +109,8 @@ static GtkActionEntry entries[] = {
 
 static void
 reformat (GtkAction *old,
-	  GtkAction *action,
-	  gpointer user_data)
+          GtkAction *action,
+          gpointer user_data)
 {
 	EMailDisplayPopupTextHighlight *th_extension;
 	WebKitDOMDocument *doc;
@@ -120,7 +120,6 @@ reformat (GtkAction *old,
 	GHashTable *query;
 	gchar *uri;
 
-
 	th_extension = E_MAIL_DISPLAY_POPUP_TEXT_HIGHLIGHT (user_data);
 	doc = th_extension->document;
 	if (!doc)
@@ -163,7 +162,7 @@ exit:
 	th_extension->document = NULL;
 }
 
-static GtkActionGroup*
+static GtkActionGroup *
 create_group (EMailDisplayPopupExtension *extension)
 {
 	EExtensible *extensible;
@@ -217,7 +216,8 @@ create_group (EMailDisplayPopupExtension *extension)
 				NULL, NULL, action_index);
 		action_index++;
 		gtk_action_group_add_action (group, GTK_ACTION (action));
-		g_signal_connect (action, "changed",
+		g_signal_connect (
+			action, "changed",
 			G_CALLBACK (reformat), extension);
 		gtk_radio_action_set_group (action, radio_group);
 		radio_group = gtk_radio_action_get_group (action);
@@ -226,15 +226,15 @@ create_group (EMailDisplayPopupExtension *extension)
 
 		gtk_ui_manager_add_ui (
 			ui_manager, merge_id,
-			 "/context/custom-actions-2/format-as-menu/format-as-actions",
+			"/context/custom-actions-2/format-as-menu/format-as-actions",
 			languages[i].action_name, languages[i].action_name,
-			 GTK_UI_MANAGER_AUTO, FALSE);
+			GTK_UI_MANAGER_AUTO, FALSE);
 
 		gtk_ui_manager_add_ui (
 			shell_ui_manager, shell_merge_id,
 			"/mail-preview-popup/mail-preview-popup-actions/format-as-menu/format-as-actions",
 			languages[i].action_name, languages[i].action_name,
-			 GTK_UI_MANAGER_AUTO, FALSE);
+			GTK_UI_MANAGER_AUTO, FALSE);
 	}
 
 	languages = get_additinal_languages (&len);
@@ -247,7 +247,8 @@ create_group (EMailDisplayPopupExtension *extension)
 				NULL, NULL, action_index);
 		action_index++;
 		gtk_action_group_add_action (group, GTK_ACTION (action));
-		g_signal_connect (action, "changed",
+		g_signal_connect (
+			action, "changed",
 			G_CALLBACK (reformat), extension);
 
 		gtk_radio_action_set_group (action, radio_group);
@@ -257,15 +258,15 @@ create_group (EMailDisplayPopupExtension *extension)
 
 		gtk_ui_manager_add_ui (
 			ui_manager, merge_id,
-			 "/context/custom-actions-2/format-as-menu/format-as-other-menu",
+			"/context/custom-actions-2/format-as-menu/format-as-other-menu",
 			languages[i].action_name, languages[i].action_name,
-			 GTK_UI_MANAGER_AUTO, FALSE);
+			GTK_UI_MANAGER_AUTO, FALSE);
 
 		gtk_ui_manager_add_ui (
 			shell_ui_manager, shell_merge_id,
 			"/mail-preview-popup/mail-preview-popup-actions/format-as-menu/format-as-other-menu",
 			languages[i].action_name, languages[i].action_name,
-			 GTK_UI_MANAGER_AUTO, FALSE);
+			GTK_UI_MANAGER_AUTO, FALSE);
 	}
 
 	return group;
@@ -273,7 +274,7 @@ create_group (EMailDisplayPopupExtension *extension)
 
 static void
 update_actions (EMailDisplayPopupExtension *extension,
-		WebKitHitTestResult *context)
+                WebKitHitTestResult *context)
 {
 	EMailDisplayPopupTextHighlight *th_extension;
 	WebKitDOMNode *node;
@@ -283,7 +284,7 @@ update_actions (EMailDisplayPopupExtension *extension,
 	th_extension = E_MAIL_DISPLAY_POPUP_TEXT_HIGHLIGHT (extension);
 
 	if (th_extension->action_group == NULL) {
-		th_extension->action_group = create_group(extension);
+		th_extension->action_group = create_group (extension);
 	}
 
 	th_extension->document = NULL;
@@ -291,7 +292,6 @@ update_actions (EMailDisplayPopupExtension *extension,
 	document = webkit_dom_node_get_owner_document (node);
 	uri = webkit_dom_document_get_document_uri (document);
 
-
 	/* If the part below context menu was made by text-highlight formatter,
 	 * then try to check what formatter it's using at the moment and set
 	 * it as active in the popup menu */
@@ -326,7 +326,7 @@ update_actions (EMailDisplayPopupExtension *extension,
 		}
 
 	} else {
-		gtk_action_group_set_visible(
+		gtk_action_group_set_visible (
 			th_extension->action_group, FALSE);
 	}
 
diff --git a/modules/text-highlight/e-mail-formatter-text-highlight.c b/modules/text-highlight/e-mail-formatter-text-highlight.c
index 643e54b7f4..b9ce34dc6b 100644
--- a/modules/text-highlight/e-mail-formatter-text-highlight.c
+++ b/modules/text-highlight/e-mail-formatter-text-highlight.c
@@ -82,7 +82,7 @@ get_default_font (void)
 
 static gchar *
 get_syntax (EMailPart *part,
-	    const gchar *uri)
+            const gchar *uri)
 {
 	gchar *syntax = NULL;
 	CamelContentType *ct = NULL;
@@ -152,7 +152,6 @@ emfe_text_highlight_format (EMailFormatterExtension *extension,
 			return FALSE;
 	}
 
-
 	if (context->mode == E_MAIL_FORMATTER_MODE_PRINTING) {
 
 		CamelDataWrapper *dw;
@@ -245,10 +244,12 @@ emfe_text_highlight_format (EMailFormatterExtension *extension,
 			g_free (font);
 		}
 
-		font_family = g_strdup_printf ("--font='%s'",
-				pango_font_description_get_family (fd));
-		font_size = g_strdup_printf ("--font-size=%d",
-				pango_font_description_get_size (fd) / PANGO_SCALE);
+		font_family = g_strdup_printf (
+			"--font='%s'",
+			pango_font_description_get_family (fd));
+		font_size = g_strdup_printf (
+			"--font-size=%d",
+			pango_font_description_get_size (fd) / PANGO_SCALE);
 
 		argv[1] = font_family;
 		argv[2] = font_size;
diff --git a/modules/text-highlight/e-mail-parser-text-highlight.c b/modules/text-highlight/e-mail-parser-text-highlight.c
index 328e590f6d..69aa1ccff2 100644
--- a/modules/text-highlight/e-mail-parser-text-highlight.c
+++ b/modules/text-highlight/e-mail-parser-text-highlight.c
@@ -60,10 +60,10 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 
 static GSList *
 empe_text_highlight_parse (EMailParserExtension *extension,
-			   EMailParser *parser,
-			   CamelMimePart *part,
-			   GString *part_id,
-			   GCancellable *cancellable)
+                           EMailParser *parser,
+                           CamelMimePart *part,
+                           GString *part_id,
+                           GCancellable *cancellable)
 {
 	GSList *parts;
 	gint len;
diff --git a/modules/text-highlight/languages.c b/modules/text-highlight/languages.c
index 957b0aded9..7875cd6e1d 100644
--- a/modules/text-highlight/languages.c
+++ b/modules/text-highlight/languages.c
@@ -30,21 +30,21 @@ G_LOCK_DEFINE_STATIC (mime_types);
 static Language languages[] = {
 
 	{ "txt", N_("_Plain text"),
-	  (const gchar* []) { (gchar[]) { "text" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/plain" },
+	  (const gchar *[]) { (gchar[]) { "text" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/plain" },
 			      (gchar[]) { "text/*" }, NULL }
 	},
 
 	{ "assembler", N_("_Assembler"),
-	  (const gchar* []) { (gchar[]) { "asm" } , NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-asm" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "asm" } , NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-asm" }, NULL }
 	},
 
 	{ "sh", N_("_Bash"),
-	  (const gchar* []) { (gchar[]) { "bash" }, (gchar[]) { "sh" },
+	  (const gchar *[]) { (gchar[]) { "bash" }, (gchar[]) { "sh" },
 			      (gchar[]) { "ebuild" },  (gchar[])  {"eclass" },
 			      NULL },
-	  (const gchar* []) { (gchar[]) { "application/x-bsh" },
+	  (const gchar *[]) { (gchar[]) { "application/x-bsh" },
 			      (gchar[]) { "application/x-sh" },
 			      (gchar[]) { "application/x-shar" },
 			      (gchar[]) { "application/x-shellscript" },
@@ -52,112 +52,112 @@ static Language languages[] = {
 	},
 
 	{ "c", N_("_C/C++"),
-	  (const gchar* []) { (gchar[]) { "c" }, (gchar[]) { "c++" },
+	  (const gchar *[]) { (gchar[]) { "c" }, (gchar[]) { "c++" },
 			      (gchar[]) { "cc" }, (gchar[]) { "cpp" },
 			      (gchar[]) { "cu" }, (gchar[]) { "cxx" },
 			      (gchar[]) { "h" }, (gchar[]) { "hh" },
 			      (gchar[]) { "hpp" }, (gchar[]) { "hxx" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-c" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "text/x-c" }, NULL }
 	},
 
 	{ "csharp", N_("_C#"),
-	  (const gchar* []) { (gchar[]) { "cs" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-csharp" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "cs" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-csharp" }, NULL }
 	},
 
 	{ "css", N_("_Cascade Style Sheet"),
-	  (const gchar* []) { (gchar[]) { "css" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/css" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "css" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/css" }, NULL }
 	},
 
 	{ "html", N_("_HTML"),
-	  (const gchar* []) { (gchar[]) { "html" }, (gchar[]) { "html" },
+	  (const gchar *[]) { (gchar[]) { "html" }, (gchar[]) { "html" },
 			      (gchar[]) { "xhtml" }, (gchar[]) { "dhtml" }, NULL },
-	  (const gchar* []) { NULL } /* Don't register text-highlight as formatter
-	  				or parser of text/html as it would break
-	  				all text/html emails. */
+	  (const gchar *[]) { NULL } /* Don't register text-highlight as formatter
+					or parser of text / html as it would break
+					all text / html emails. */
 	},
 
 	{ "java", N_("_Java"),
-	  (const gchar* []) { (gchar[]) { "java" }, (gchar[]) { "groovy" },
+	  (const gchar *[]) { (gchar[]) { "java" }, (gchar[]) { "groovy" },
 			      (gchar[]) { "grv" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/java-source" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "text/java-source" }, NULL }
 	},
 
 	{ "js", N_("_JavaScript"),
-	  (const gchar* []) { (gchar[]) { "js" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/javascript" },
+	  (const gchar *[]) { (gchar[]) { "js" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/javascript" },
 			      (gchar[]) { "application/x-javascript" }, NULL }
 	},
 
 	{ "diff", N_("_Patch/diff"),
-	  (const gchar* []) { (gchar[]) { "diff" }, (gchar[]) { "patch" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-diff" },
-	  		      (gchar[]) { "text/x-patch" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "diff" }, (gchar[]) { "patch" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-diff" },
+			      (gchar[]) { "text/x-patch" }, NULL }
 	},
 
 	{ "perl", N_("_Perl"),
-	  (const gchar* []) { (gchar[]) { "perl" }, (gchar[]) { "cgi"},
+	  (const gchar *[]) { (gchar[]) { "perl" }, (gchar[]) { "cgi"},
 			      (gchar[]) { "perl" }, (gchar[]) { "pl" },
 			      (gchar[]) { "plex" }, (gchar[]) { "plx" },
 			      (gchar[]) { "pm" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-script.perl" },
+	  (const gchar *[]) { (gchar[]) { "text/x-script.perl" },
 			      (gchar[]) { "text/x-script.perl-module" },
 			      (gchar[]) { "application/x-pixclscript" },
 			      (gchar[]) { "application/x-xpixmap" }, NULL }
 	},
 
 	{ "php", N_("_PHP"),
-	  (const gchar* []) { (gchar[]) { "php" }, (gchar[]) { "php3" },
+	  (const gchar *[]) { (gchar[]) { "php" }, (gchar[]) { "php3" },
 			      (gchar[]) { "php4" }, (gchar[]) { "php5" },
 			      (gchar[]) { "php6" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/php" },
-	  		      (gchar[]) { "text/x-php" },
-	  		      (gchar[]) { "application/php" },
-	  		      (gchar[]) { "application/x-php" },
-	  		      (gchar[]) { "application/x-httpd-php" },
-	  		      (gchar[]) { "application/x-httpd-php-source" },
-	  		      NULL }
+	  (const gchar *[]) { (gchar[]) { "text/php" },
+			      (gchar[]) { "text/x-php" },
+			      (gchar[]) { "application/php" },
+			      (gchar[]) { "application/x-php" },
+			      (gchar[]) { "application/x-httpd-php" },
+			      (gchar[]) { "application/x-httpd-php-source" },
+			      NULL }
 	},
 
 	{ "python", N_("_Python"),
-	  (const gchar* []) { (gchar[]) { "py" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-script.python" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "py" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-script.python" }, NULL }
 	},
 
 	{ "ruby", N_("_Ruby"),
-	  (const gchar* []) { (gchar[]) { "ruby" }, (gchar[]) { "pp" },
+	  (const gchar *[]) { (gchar[]) { "ruby" }, (gchar[]) { "pp" },
 			      (gchar[]) { "rb" }, (gchar[]) { "rjs" },
 			      (gchar[]) { "ruby" }, NULL },
-	  (const gchar* []) { (gchar[]) { "application/x-ruby" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "application/x-ruby" }, NULL }
 	},
 
 	{ "tcl", N_("_Tcl/Tk"),
-	  (const gchar* []) { (gchar[]) { "tcl" }, (gchar[]) { "ictl" },
+	  (const gchar *[]) { (gchar[]) { "tcl" }, (gchar[]) { "ictl" },
 			      (gchar[]) { "wish" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-tcl" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "text/x-tcl" }, NULL }
 	},
 
 	{ "tex", N_("_TeX/LaTeX"),
-	  (const gchar* []) { (gchar[]) { "tex" }, (gchar[]) { "csl" },
+	  (const gchar *[]) { (gchar[]) { "tex" }, (gchar[]) { "csl" },
 			      (gchar[]) { "sty" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-tex" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "text/x-tex" }, NULL }
 	},
 
 	{ "vala", N_("_Vala"),
-	  (const gchar* []) { (gchar[]) { "vala" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-vala" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "vala" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-vala" }, NULL }
 	},
 
 	{ "vb", N_("_Visual Basic"),
-	  (const gchar* []) { (gchar[]) { "vb" }, (gchar[]) { "bas" },
+	  (const gchar *[]) { (gchar[]) { "vb" }, (gchar[]) { "bas" },
 			      (gchar[]) { "basic" }, (gchar[]) { "bi" },
 			      (gchar[]) { "vbs" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "xml", N_("_XML"),
-	  (const gchar* []) { (gchar[]) { "xml" }, (gchar[]) { "dtd" },
+	  (const gchar *[]) { (gchar[]) { "xml" }, (gchar[]) { "dtd" },
 			      (gchar[]) { "ecf" }, (gchar[]) { "ent" },
 			      (gchar[]) { "hdr" }, (gchar[]) { "hub" },
 			      (gchar[]) { "jnlp" }, (gchar[]) { "nrm" },
@@ -166,7 +166,7 @@ static Language languages[] = {
 			      (gchar[]) { "tld" }, (gchar[]) { "vxml" },
 			      (gchar[]) { "wml" }, (gchar[]) { "xsd" },
 			      (gchar[]) { "xsl" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/xml" },
+	  (const gchar *[]) { (gchar[]) { "text/xml" },
 			      (gchar[]) { "application/xml" },
 			      (gchar[]) { "application/x-xml" }, NULL }
 	}
@@ -175,186 +175,186 @@ static Language languages[] = {
 static struct Language other_languages[] = {
 
 	{ "actionscript", N_("_ActionScript"),
-	  (const gchar* []) { (gchar[]) { "as" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "as" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "ada", N_("_ADA95"),
-	  (const gchar* []) { (gchar[]) { "a" }, (gchar[]) { "adb" },
-		              (gchar[]) { "ads" }, (gchar[]) { "gnad" },
-		              NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-adasrc" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "a" }, (gchar[]) { "adb" },
+			      (gchar[]) { "ads" }, (gchar[]) { "gnad" },
+			      NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-adasrc" }, NULL }
 	},
 
 	{ "algol", N_("_ALGOL 68"),
-	  (const gchar* []) { (gchar[]) { "alg" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "alg" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "awk", N_("(_G)AWK"),
-	  (const gchar* []) { (gchar[]) { "awk" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-awk" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "awk" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-awk" }, NULL }
 	},
 
 	{ "cobol", N_("_COBOL"),
-	  (const gchar* []) { (gchar[]) { "cbl" }, (gchar[]) { "cob" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-cobol" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "cbl" }, (gchar[]) { "cob" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-cobol" }, NULL }
 	},
 
 	{ "bat", N_("_DOS Batch"),
-	  (const gchar* []) { (gchar[]) { "bat" }, (gchar[]) { "cmd" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "bat" }, (gchar[]) { "cmd" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "d", N_("_D"),
-	  (const gchar* []) { (gchar[]) { "d" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "d" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "erlang", N_("_Erlang"),
-	  (const gchar* []) { (gchar[]) { "erl" }, (gchar[]) { "hrl" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-erlang" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "erl" }, (gchar[]) { "hrl" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-erlang" }, NULL }
 	},
 
 	{ "fortran77", N_("_FORTRAN 77"),
-	  (const gchar* []) { (gchar[]) { "f" }, (gchar[]) { "for" },
+	  (const gchar *[]) { (gchar[]) { "f" }, (gchar[]) { "for" },
 			      (gchar[]) { "ftn" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-fortran" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "text/x-fortran" }, NULL }
 	},
 
 	{ "fortran90", N_("_FORTRAN 90"),
-	  (const gchar* []) { (gchar[]) { "f90" }, (gchar[]) { "f95" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-fortran" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "f90" }, (gchar[]) { "f95" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-fortran" }, NULL }
 	},
 
 	{ "fsharp", N_("_F#"),
-	  (const gchar* []) { (gchar[]) { "fs" }, (gchar[]) { "fsx" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "fs" }, (gchar[]) { "fsx" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "go", N_("_Go"),
-	  (const gchar* []) { (gchar[]) { "go" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-go" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "go" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-go" }, NULL }
 	},
 
 	{ "haskell", N_("_Haskell"),
-	  (const gchar* []) { (gchar[]) { "hs" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-haskell" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "hs" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-haskell" }, NULL }
 	},
 
 	{ "jsp", N_("_JSP"),
-	  (const gchar* []) { (gchar[]) { "jsp" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-jsp" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "jsp" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-jsp" }, NULL }
 	},
 
 	{ "lisp", N_("_Lisp"),
-	  (const gchar* []) { (gchar[]) { "cl" }, (gchar[]) { "clisp" },
+	  (const gchar *[]) { (gchar[]) { "cl" }, (gchar[]) { "clisp" },
 			      (gchar[]) { "el" }, (gchar[]) { "lsp" },
 			      (gchar[]) { "sbcl"}, (gchar[]) { "scom" },
 			      NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-emacs-lisp" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "text/x-emacs-lisp" }, NULL }
 	},
 
 	{ "lotus", N_("_Lotus"),
-	  (const gchar* []) { (gchar[]) { "ls" }, NULL },
-	  (const gchar* []) { (gchar[]) { "application/vnd.lotus-1-2-3" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "ls" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "application/vnd.lotus-1-2-3" }, NULL }
 	},
 
 	{ "lua", N_("_Lua"),
-	  (const gchar* []) { (gchar[]) { "lua" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-lua" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "lua" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-lua" }, NULL }
 	},
 
 	{ "maple", N_("_Maple"),
-	  (const gchar* []) { (gchar[]) { "mpl" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "mpl" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "matlab", N_("_Matlab"),
-	  (const gchar* []) { (gchar[]) { "m" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-matlab" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "m" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-matlab" }, NULL }
 	},
 
 	{ "maya", N_("_Maya"),
-	  (const gchar* []) { (gchar[]) { "mel" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "mel" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "oberon", N_("_Oberon"),
-	  (const gchar* []) { (gchar[]) { "ooc" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "ooc" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "objc", N_("_Objective C"),
-	  (const gchar* []) { (gchar[]) { "objc" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-objchdr" },
+	  (const gchar *[]) { (gchar[]) { "objc" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-objchdr" },
 			      (gchar[]) { "text/x-objcsrc" }, NULL }
 	},
 
 	{ "ocaml", N_("_OCaml"),
-	  (const gchar* []) { (gchar[]) { "ml" }, (gchar[]) { "mli" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-ocaml" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "ml" }, (gchar[]) { "mli" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-ocaml" }, NULL }
 	},
 
 	{ "octave", N_("_Octave"),
-	  (const gchar* []) { (gchar[]) { "octave" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "octave" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "os", N_("_Object Script"),
-	  (const gchar* []) { (gchar[]) { "os" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "os" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "pascal", N_("_Pascal"),
-	  (const gchar* []) { (gchar[]) { "pas" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-pascal" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "pas" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-pascal" }, NULL }
 	},
 
 	{ "pov", N_("_POV-Ray"),
-	  (const gchar* []) { (gchar[]) { "pov" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "pov" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "pro", N_("_Prolog"),
-	  (const gchar* []) { (gchar[]) { "pro" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "pro" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "ps", N_("_PostScript"),
-	  (const gchar* []) { (gchar[]) { "ps" } , NULL },
-	  (const gchar* []) { (gchar[]) { "application/postscript" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "ps" } , NULL },
+	  (const gchar *[]) { (gchar[]) { "application/postscript" }, NULL }
 	},
 
 	{ "r", N_("_R"),
-	  (const gchar* []) { (gchar[]) { "r" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "r" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "spec", N_("_RPM Spec"),
-	  (const gchar* []) { (gchar[]) { "spec" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-rpm-spec" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "spec" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-rpm-spec" }, NULL }
 	},
 
 	{ "scala", N_("_Scala"),
-	  (const gchar* []) { (gchar[]) { "scala" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-scala" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "scala" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-scala" }, NULL }
 	},
 
 	{ "smalltalk", N_("_Smalltalk"),
-	  (const gchar* []) { (gchar[]) { "gst" }, (gchar[]) { "sq" },
+	  (const gchar *[]) { (gchar[]) { "gst" }, (gchar[]) { "sq" },
 			      (gchar[]) { "st" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "tcsh", N_("_TCSH"),
-	  (const gchar* []) { (gchar[]) { "tcsh" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "tcsh" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "vhd", N_("_VHDL"),
-	  (const gchar* []) { (gchar[]) { "vhd" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-vhdl" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "vhd" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-vhdl" }, NULL }
 	}
 };
 
@@ -379,7 +379,7 @@ get_additinal_languages (gsize *len)
 }
 
 const gchar *
-get_syntax_for_ext(const gchar *extension)
+get_syntax_for_ext (const gchar *extension)
 {
 	gint i;
 	gint j;
@@ -422,7 +422,7 @@ get_syntax_for_ext(const gchar *extension)
 }
 
 const gchar *
-get_syntax_for_mime_type(const gchar *mime_type)
+get_syntax_for_mime_type (const gchar *mime_type)
 {
 	gint i;
 	gint j;
@@ -464,7 +464,6 @@ get_syntax_for_mime_type(const gchar *mime_type)
 	return NULL;
 }
 
-
 const gchar **
 get_mime_types (void)
 {
diff --git a/modules/text-highlight/languages.h b/modules/text-highlight/languages.h
index 03f1442531..c530cc5148 100644
--- a/modules/text-highlight/languages.h
+++ b/modules/text-highlight/languages.h
@@ -28,7 +28,7 @@ typedef struct Language {
 	const gchar **mime_types;
 } Language;
 
-const gchar *	get_syntax_for_ext 		(const gchar *extension);
+const gchar *	get_syntax_for_ext		(const gchar *extension);
 const gchar *	get_syntax_for_mime_type	(const gchar *mime_type);
 
 Language *	get_default_langauges		(gsize *len);