Coding style and whitespace cleanups.

4 files changed, 16 insertions, 13 deletions

diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 1ae493c30d..c6c9fa5673 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -687,12 +687,9 @@ e_cal_shell_view_private_dispose (ECalShellView *cal_shell_view)
 	ECalShellViewPrivate *priv = cal_shell_view->priv;
 	gint i;
 
-	/* Calling calendar's save state from here, because it is too late in its dispose */
-	if (priv->cal_shell_content)
-		e_cal_shell_content_save_state (priv->cal_shell_content);
-
-	/* Calling calendar's save state from here, because it is too late in its dispose */
-	if (priv->cal_shell_content)
+	/* Calling calendar's save state from here,
+	 * because it is too late in its dispose. */
+	if (priv->cal_shell_content != NULL)
 		e_cal_shell_content_save_state (priv->cal_shell_content);
 
 	DISPOSE (priv->cal_shell_backend);
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index 1706fa0a5f..1d7269cd55 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -235,15 +235,19 @@ get_attendee_prop (icalcomponent *icalcomp, const gchar *address)
 	if (!(address && *address))
 		return NULL;
 
-	for (prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY);
-			prop;
-			prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTENDEE_PROPERTY)) {
+	prop = icalcomponent_get_first_property (
+		icalcomp, ICAL_ATTENDEE_PROPERTY);
+
+	while (prop != NULL) {
 		const gchar *attendee = icalproperty_get_attendee (prop);
 
-		if (g_str_equal (itip_strip_mailto (attendee), address)) {
+		if (g_str_equal (itip_strip_mailto (attendee), address))
 			return prop;
-		}
+
+		prop = icalcomponent_get_next_property (
+			icalcomp, ICAL_ATTENDEE_PROPERTY);
 	}
+
 	return NULL;
 }
 
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c
index 5c964fc505..9f7d0768b9 100644
--- a/modules/calendar/e-memo-shell-content.c
+++ b/modules/calendar/e-memo-shell-content.c
@@ -624,7 +624,8 @@ memo_shell_content_class_init (EMemoShellContentClass *class)
 
 	shell_content_class = E_SHELL_CONTENT_CLASS (class);
 	shell_content_class->check_state = memo_shell_content_check_state;
-	shell_content_class->focus_search_results = memo_shell_content_focus_search_results;
+	shell_content_class->focus_search_results =
+		memo_shell_content_focus_search_results;
 
 	g_object_class_install_property (
 		object_class,
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index 2287ee893c..0ffa6fb5a3 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -647,7 +647,8 @@ task_shell_content_class_init (ETaskShellContentClass *class)
 
 	shell_content_class = E_SHELL_CONTENT_CLASS (class);
 	shell_content_class->check_state = task_shell_content_check_state;
-	shell_content_class->focus_search_results = task_shell_content_focus_search_results;
+	shell_content_class->focus_search_results =
+		task_shell_content_focus_search_results;
 
 	g_object_class_install_property (
 		object_class,