Coding style and whitespace cleanups.

3 files changed, 38 insertions, 29 deletions

diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index c2c21bdd78..30720513d0 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -395,19 +395,24 @@ addressbook_model_idle_cb (EAddressbookModel *model)
 		remove_book_view (model);
 
 		if (model->priv->first_get_view) {
+			gboolean do_initial_query;
+
 			model->priv->first_get_view = FALSE;
 
-			if (e_book_check_static_capability (model->priv->book, "do-initial-query")) {
+			do_initial_query = e_book_check_static_capability (
+				model->priv->book, "do-initial-query");
+
+			if (do_initial_query) {
 				e_book_get_book_view_async (
 					model->priv->book, model->priv->query,
 					NULL, limit, book_view_loaded, model);
 			} else {
 				free_data (model);
 
-				g_signal_emit (model,
-					       signals[MODEL_CHANGED], 0);
-				g_signal_emit (model,
-					       signals[STOP_STATE_CHANGED], 0);
+				g_signal_emit (
+					model, signals[MODEL_CHANGED], 0);
+				g_signal_emit (
+					model, signals[STOP_STATE_CHANGED], 0);
 			}
 		} else
 			e_book_get_book_view_async (
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 1508e0690f..4421b1a739 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -399,13 +399,14 @@ e_minicard_view_widget_realize (GtkWidget *widget)
 	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET (widget);
 	GtkStyle *style = gtk_widget_get_style (widget);
 
-	view->background = gnome_canvas_item_new (gnome_canvas_root ( GNOME_CANVAS (view) ),
-						 e_canvas_background_get_type (),
-						 "fill_color_gdk", &style->base[GTK_STATE_NORMAL],
-						 NULL );
+	view->background = gnome_canvas_item_new (
+		gnome_canvas_root (GNOME_CANVAS (view)),
+		e_canvas_background_get_type (),
+		"fill_color_gdk", &style->base[GTK_STATE_NORMAL],
+		NULL );
 
 	view->emv = gnome_canvas_item_new (
-		gnome_canvas_root ( GNOME_CANVAS (view) ),
+		gnome_canvas_root (GNOME_CANVAS (view)),
 		e_minicard_view_get_type (),
 		"height", (double) 100,
 		"minimum_width", (double) 100,
@@ -413,24 +414,26 @@ e_minicard_view_widget_realize (GtkWidget *widget)
 		"column_width", view->column_width,
 		NULL );
 
-	g_signal_connect (E_REFLOW (view->emv)->selection,
-			  "selection_changed",
-			  G_CALLBACK (selection_change), view);
-	g_signal_connect (E_REFLOW (view->emv)->selection,
-			  "selection_row_changed",
-			  G_CALLBACK (selection_row_change), view);
-	g_signal_connect (view->emv,
-			  "column_width_changed",
-			  G_CALLBACK (column_width_changed), view);
-	g_signal_connect (view->emv,
-			  "create-contact",
-			  G_CALLBACK (create_contact), view);
-	g_signal_connect (view->emv,
-			  "create-contact-list",
-			  G_CALLBACK (create_contact_list), view);
-	g_signal_connect (view->emv,
-			  "right_click",
-			  G_CALLBACK (right_click), view);
+	g_signal_connect (
+		E_REFLOW (view->emv)->selection,
+		"selection_changed",
+		G_CALLBACK (selection_change), view);
+	g_signal_connect (
+		E_REFLOW (view->emv)->selection,
+		"selection_row_changed",
+		G_CALLBACK (selection_row_change), view);
+	g_signal_connect (
+		view->emv, "column_width_changed",
+		G_CALLBACK (column_width_changed), view);
+	g_signal_connect (
+		view->emv, "create-contact",
+		G_CALLBACK (create_contact), view);
+	g_signal_connect (
+		view->emv, "create-contact-list",
+		G_CALLBACK (create_contact_list), view);
+	g_signal_connect (
+		view->emv, "right_click",
+		G_CALLBACK (right_click), view);
 
 	if (GTK_WIDGET_CLASS (parent_class)->realize)
 		GTK_WIDGET_CLASS (parent_class)->realize (widget);
diff --git a/addressbook/gui/widgets/ea-addressbook.c b/addressbook/gui/widgets/ea-addressbook.c
index 20bca97948..b67d876139 100644
--- a/addressbook/gui/widgets/ea-addressbook.c
+++ b/addressbook/gui/widgets/ea-addressbook.c
@@ -79,7 +79,8 @@ ea_addressbook_focus_watcher (GSignalInvocationHint *ihint,
 		GnomeCanvasItem *item = GNOME_CANVAS_ITEM (object);
 		ea_event = atk_gobject_accessible_for_object (object);
 		if (event->type == GDK_FOCUS_CHANGE) {
-			if ((event->focus_change.in) && (E_IS_MINICARD (item->canvas->focused_item)))
+			if ((event->focus_change.in) &&
+			    (E_IS_MINICARD (item->canvas->focused_item)))
 				atk_focus_tracker_notify (ea_event);
 		}
 	}