Coding style and whitespace cleanup.

7 files changed, 54 insertions, 44 deletions

diff --git a/shell/e-shell-meego.c b/shell/e-shell-meego.c
index e339a1ff0d..4833ab5154 100644
--- a/shell/e-shell-meego.c
+++ b/shell/e-shell-meego.c
@@ -61,7 +61,7 @@ e_shell_detect_meego (gboolean *is_meego,
 
 	*is_meego = *small_screen = FALSE;
 
-	moblin_string = (guchar *)g_getenv ("EVO_MEEGO");
+	moblin_string = (guchar *) g_getenv ("EVO_MEEGO");
 	if (!moblin_string) {
 		GdkScreen *screen;
 		GdkDisplay *display;
@@ -82,8 +82,9 @@ e_shell_detect_meego (gboolean *is_meego,
 		if (!module)
 			return;
 		g_module_symbol (module, "XFree", (gpointer) &fns.XFree);
-		g_module_symbol (module, "XGetWindowProperty",
-				 (gpointer) &fns.XGetWindowProperty);
+		g_module_symbol (
+			module, "XGetWindowProperty",
+			(gpointer) &fns.XGetWindowProperty);
 		if (!fns.XFree || !fns.XGetWindowProperty) {
 			fprintf (stderr, "defective X server\n");
 			goto exit;
@@ -127,12 +128,13 @@ e_shell_detect_meego (gboolean *is_meego,
 		/* use meego theming tweaks */
 		*is_meego = TRUE;
 
-		props = g_strsplit ((gchar *)moblin_string, ":", -1);
+		props = g_strsplit ((gchar *) moblin_string, ":", -1);
 		for (i = 0; props && props[i]; i++) {
 			gchar **pair = g_strsplit (props[i], "=", 2);
 
-			g_warning ("pair '%s'='%s'", pair ? pair[0] : "<null>",
-				   pair && pair[0] ? pair[1] : "<null>");
+			g_warning (
+				"pair '%s'='%s'", pair ? pair[0] : "<null>",
+				pair && pair[0] ? pair[1] : "<null>");
 
 			/* Hunt for session-type=small-screen */
 			if (pair && pair[0] && !g_ascii_strcasecmp (pair[0], "session-type"))
diff --git a/shell/e-shell-settings.c b/shell/e-shell-settings.c
index a5952be887..22ba9c8e5e 100644
--- a/shell/e-shell-settings.c
+++ b/shell/e-shell-settings.c
@@ -58,10 +58,11 @@ shell_settings_value_equal (const GValue *v1,
 
 	if (G_VALUE_HOLDS_STRING (v1) &&
 	    G_VALUE_HOLDS_STRING (v2)) {
-		return g_strcmp0 (g_value_get_string (v1),
-				  g_value_get_string (v2)) == 0;
+		return g_strcmp0 (
+			g_value_get_string (v1),
+			g_value_get_string (v2)) == 0;
 	} else if (G_VALUE_HOLDS_UCHAR (v1) &&
-		   G_VALUE_HOLDS_UCHAR (v2)) {
+			G_VALUE_HOLDS_UCHAR (v2)) {
 		return g_value_get_uchar (v1) == g_value_get_uchar (v2);
 	} else if (G_VALUE_HOLDS_CHAR (v1) &&
 		   G_VALUE_HOLDS_CHAR (v2)) {
@@ -96,8 +97,11 @@ shell_settings_value_equal (const GValue *v1,
 	}
 
 	if (is_debug)
-		g_debug ("%s: Cannot compare '%s' with '%s'",
-			G_STRFUNC, G_VALUE_TYPE_NAME (v1), G_VALUE_TYPE_NAME (v2));
+		g_debug (
+			"%s: Cannot compare '%s' with '%s'",
+			G_STRFUNC,
+			G_VALUE_TYPE_NAME (v1),
+			G_VALUE_TYPE_NAME (v2));
 
 	return FALSE;
 }
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index a8e47d4691..1e7e27b87b 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -904,7 +904,7 @@ e_shell_view_class_init (EShellViewClass *class)
 			"shell-content",
 			"Shell Content Widget",
 			"The content widget appears in "
-			  "a shell window's right pane",
+			"a shell window's right pane",
 			E_TYPE_SHELL_CONTENT,
 			G_PARAM_READABLE));
 
@@ -921,7 +921,7 @@ e_shell_view_class_init (EShellViewClass *class)
 			"shell-sidebar",
 			"Shell Sidebar Widget",
 			"The sidebar widget appears in "
-			  "a shell window's left pane",
+			"a shell window's left pane",
 			E_TYPE_SHELL_SIDEBAR,
 			G_PARAM_READABLE));
 
@@ -937,7 +937,7 @@ e_shell_view_class_init (EShellViewClass *class)
 			"shell-taskbar",
 			"Shell Taskbar Widget",
 			"The taskbar widget appears at "
-			  "the bottom of a shell window",
+			"the bottom of a shell window",
 			E_TYPE_SHELL_TASKBAR,
 			G_PARAM_READABLE));
 
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index bfc1ca9557..247b3814cc 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -655,7 +655,7 @@ action_about_cb (GtkAction *action,
 		"documenters", documenters,
 		"translator-credits", translator_credits,
 		"logo-icon-name", "evolution",
-	        "license-type", GTK_LICENSE_GPL_2_0,
+		"license-type", GTK_LICENSE_GPL_2_0,
 		NULL);
 }
 
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index ede1400fcb..8193b52da3 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -101,7 +101,8 @@ shell_window_toolbar_update_new_menu (EShellWindow *shell_window,
 		EShellView *shell_view;
 		EShellBackend *shell_backend;
 
-		shell_view = e_shell_window_peek_shell_view (shell_window,
+		shell_view = e_shell_window_peek_shell_view (
+			shell_window,
 			e_shell_window_get_active_view (shell_window));
 		g_return_if_fail (shell_view != NULL);
 
@@ -130,7 +131,8 @@ shell_window_backend_prefer_item_changed_cb (EShellBackend *backend,
 	EShellView *shell_view;
 	EShellBackend *shell_backend;
 
-	shell_view = e_shell_window_peek_shell_view (shell_window,
+	shell_view = e_shell_window_peek_shell_view (
+		shell_window,
 		e_shell_window_get_active_view (shell_window));
 	g_return_if_fail (shell_view != NULL);
 
@@ -138,7 +140,8 @@ shell_window_backend_prefer_item_changed_cb (EShellBackend *backend,
 	if (shell_backend != backend)
 		return;
 
-	e_shell_window_set_toolbar_new_prefer_item (shell_window,
+	e_shell_window_set_toolbar_new_prefer_item (
+		shell_window,
 		e_shell_backend_get_prefer_new_item (shell_backend));
 }
 
@@ -753,8 +756,9 @@ shell_window_realize (GtkWidget *widget)
 	EShellWindow *shell_window;
 
 	shell_window = E_SHELL_WINDOW (widget);
-	e_shell_adapt_window_size (shell_window->priv->shell,
-				   GTK_WINDOW (widget));
+	e_shell_adapt_window_size (
+		shell_window->priv->shell,
+		GTK_WINDOW (widget));
 
 	/* Chain up to parent's dispose() method. */
 	GTK_WIDGET_CLASS (e_shell_window_parent_class)->realize (widget);
@@ -933,7 +937,7 @@ e_shell_window_class_init (EShellWindowClass *class)
 			"switcher-visible",
 			"Switcher Visible",
 			"Whether the shell window's "
-			  "switcher buttons are visible",
+			"switcher buttons are visible",
 			TRUE,
 			G_PARAM_READWRITE));
 
diff --git a/shell/es-event.c b/shell/es-event.c
index 3ca16f9fe5..4dc3a5ad25 100644
--- a/shell/es-event.c
+++ b/shell/es-event.c
@@ -61,7 +61,7 @@ es_event_peek (void)
 		 *
 		 * This is the hook point which emits shell events.
 		 */
-		e_event_construct(&es_event->event, "org.gnome.evolution.shell.events");
+		e_event_construct (&es_event->event, "org.gnome.evolution.shell.events");
 	}
 
 	return es_event;
diff --git a/shell/main.c b/shell/main.c
index 93b22b1701..c954b820bd 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -182,20 +182,20 @@ show_development_warning (void)
 		/* xgettext:no-c-format */
 		/* Preview/Alpha/Beta version warning message */
 		_("Hi.  Thanks for taking the time to download this preview release\n"
-		  "of the Evolution groupware suite.\n"
-		  "\n"
-		  "This version of Evolution is not yet complete. It is getting close,\n"
-		  "but some features are either unfinished or do not work properly.\n"
-		  "\n"
-		  "If you want a stable version of Evolution, we urge you to uninstall\n"
-		  "this version, and install version %s instead.\n"
-		  "\n"
-		  "If you find bugs, please report them to us at bugzilla.gnome.org.\n"
-		  "This product comes with no warranty and is not intended for\n"
-		  "individuals prone to violent fits of anger.\n"
-		  "\n"
-		  "We hope that you enjoy the results of our hard work, and we\n"
-		  "eagerly await your contributions!\n"),
+		"of the Evolution groupware suite.\n"
+		"\n"
+		"This version of Evolution is not yet complete. It is getting close,\n"
+		"but some features are either unfinished or do not work properly.\n"
+		"\n"
+		"If you want a stable version of Evolution, we urge you to uninstall\n"
+		"this version, and install version %s instead.\n"
+		"\n"
+		"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+		"This product comes with no warranty and is not intended for\n"
+		"individuals prone to violent fits of anger.\n"
+		"\n"
+		"We hope that you enjoy the results of our hard work, and we\n"
+		"eagerly await your contributions!\n"),
 		STABLE_VERSION);
 	label = gtk_label_new (text);
 	g_free (text);
@@ -205,8 +205,7 @@ show_development_warning (void)
 
 	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
 
-	label = gtk_label_new (_("Thanks\n"
-				 "The Evolution Team\n"));
+	label = gtk_label_new (_("Thanks\nThe Evolution Team\n"));
 	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
 	gtk_misc_set_alignment (GTK_MISC (label), 1, .5);
 
@@ -558,8 +557,9 @@ main (gint argc,
 		 * language, so don't bother with the localisations
 		 * provided by other things then either. Reset thread
 		 * locale to "en-US" and C library locale to "C". */
-		SetThreadLocale (MAKELCID (MAKELANGID (LANG_ENGLISH, SUBLANG_ENGLISH_US),
-					   SORT_DEFAULT));
+		SetThreadLocale (
+			MAKELCID (MAKELANGID (LANG_ENGLISH, SUBLANG_ENGLISH_US),
+			SORT_DEFAULT));
 		setlocale (LC_ALL, "C");
 	}
 #endif
@@ -567,14 +567,14 @@ main (gint argc,
 	if (start_online && start_offline) {
 		g_printerr (
 			_("%s: --online and --offline cannot be used "
-			  "together.\n  Run '%s --help' for more "
-			  "information.\n"), argv[0], argv[0]);
+			"together.\n  Run '%s --help' for more "
+			"information.\n"), argv[0], argv[0]);
 		exit (1);
 	} else if (force_online && start_offline) {
 		g_printerr (
 			_("%s: --force-online and --offline cannot be used "
-			  "together.\n  Run '%s --help' for more "
-			  "information.\n"), argv[0], argv[0]);
+			"together.\n  Run '%s --help' for more "
+			"information.\n"), argv[0], argv[0]);
 		exit (1);
 	}