5 files changed, 12 insertions, 9 deletions
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index 799df0d4fe..af318b8582 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -260,7 +260,8 @@ shell_content_forall (GtkContainer *container,
 
 	priv = E_SHELL_CONTENT_GET_PRIVATE (container);
 
-	if (include_internals && priv->searchbar != NULL && container == (GtkContainer *)priv->searchbar->parent)
+	if (include_internals && priv->searchbar != NULL &&
+		container == GTK_CONTAINER (priv->searchbar->parent))
 		callback (priv->searchbar, callback_data);
 
 	/* Chain up to parent's forall() method. */
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index c37a09a2ff..7d09589f7f 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -392,7 +392,7 @@ shell_searchbar_get_property (GObject *object,
 				value, e_shell_searchbar_get_label_visible (
 				E_SHELL_SEARCHBAR (object)));
 			return;
-			
+
 		case PROP_FILTER_VISIBLE:
 			g_value_set_boolean (
 				value, e_shell_searchbar_get_filter_visible (
diff --git a/shell/e-shell-searchbar.h b/shell/e-shell-searchbar.h
index 6bb402bf53..79b593b1cd 100644
--- a/shell/e-shell-searchbar.h
+++ b/shell/e-shell-searchbar.h
@@ -103,12 +103,11 @@ gboolean	e_shell_searchbar_get_search_visible
 void		e_shell_searchbar_set_search_visible
 						(EShellSearchbar *searchbar,
 						 gboolean search_visible);
-gboolean	e_shell_searchbar_get_label_visible 
+gboolean	e_shell_searchbar_get_label_visible
 						(EShellSearchbar *searchbar);
-void		e_shell_searchbar_set_label_visible 
+void		e_shell_searchbar_set_label_visible
 						(EShellSearchbar *searchbar,
-                                      		 gboolean label_visible);
-
+						 gboolean label_visible);
 EActionComboBox *
 		e_shell_searchbar_get_scope_combo_box
 						(EShellSearchbar *searchbar);
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index e1ed8606e5..ec4f23ce53 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -127,7 +127,9 @@ shell_switcher_layout_actions (EShellSwitcher *switcher)
 		y -= max_height;
 		len = g_list_length (rows[i]);
 		if (!icons_only)
-			extra_width = (allocation->width - (len * max_width ) - (len * H_PADDING)) / len;
+			extra_width =
+				(allocation->width - (len * max_width) -
+				(len * H_PADDING)) / len;
 		else
 			extra_width = 0;
 		for (p = rows [i]; p != NULL; p = p->next) {
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index 70638ec2dd..f954492a0c 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -308,9 +308,10 @@ e_shell_utils_import_uris (EShell *shell, gchar **uris, gboolean preview)
 
 		gtk_widget_show (assistant);
 	} else {
-		g_warning ("%s: Cannot %s any of the given URIs", G_STRFUNC, preview ? "preview" : "import");
+		g_warning (
+			"%s: Cannot %s any of the given URIs",
+			G_STRFUNC, preview ? "preview" : "import");
 	}
 
-	/* like when all of them */
 	return g_strv_length (uris);
 }