Coding style and whitespace cleanups.

4 files changed, 31 insertions, 16 deletions

diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c
index b0b151dd6d..917d306ced 100644
--- a/widgets/misc/e-selection-model-simple.c
+++ b/widgets/misc/e-selection-model-simple.c
@@ -30,7 +30,9 @@
 
 static gint esms_get_row_count (ESelectionModelArray *esma);
 
-G_DEFINE_TYPE (ESelectionModelSimple, e_selection_model_simple, e_selection_model_array_get_type())
+G_DEFINE_TYPE (
+	ESelectionModelSimple, e_selection_model_simple,
+	E_SELECTION_MODEL_ARRAY_TYPE)
 
 static void
 e_selection_model_simple_init (ESelectionModelSimple *selection)
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index 974ead48c1..e4881ff755 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -79,7 +79,10 @@ etc_dispose (GObject *object)
 }
 
 static void
-etc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+etc_set_property (GObject *object,
+                  guint prop_id,
+                  const GValue *value,
+                  GParamSpec *pspec)
 {
 	ETableCol *etc = E_TABLE_COL (object);
 
@@ -93,7 +96,10 @@ etc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpe
 }
 
 static void
-etc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+etc_get_property (GObject *object,
+                  guint prop_id,
+                  GValue *value,
+                  GParamSpec *pspec)
 {
 	ETableCol *etc = E_TABLE_COL (object);
 
@@ -147,9 +153,9 @@ e_table_col_init (ETableCol *etc)
  * @priority: FIXME
  *
  * The ETableCol represents a column to be used inside an ETable.  The
- * ETableCol objects are inserted inside an ETableHeader (which is just a collection
- * of ETableCols).  The ETableHeader is the definition of the order in which
- * columns are shown to the user.
+ * ETableCol objects are inserted inside an ETableHeader (which is just a
+ * collection of ETableCols).  The ETableHeader is the definition of the
+ * order in which columns are shown to the user.
  *
  * The @text argument is the the text that will be shown as a header to the
  * user. @col_idx reflects where the data for this ETableCol object will
@@ -157,11 +163,12 @@ e_table_col_init (ETableCol *etc)
  * of the columns being viewed (the ETableCols in the ETableHeader), the
  * column will always point to the same column inside the ETableModel.
  *
- * The @ecell argument is an ECell object that needs to know how to render the
- * data in the ETableModel for this specific row.
+ * The @ecell argument is an ECell object that needs to know how to
+ * render the data in the ETableModel for this specific row.
  *
- * Data passed to @compare can be (if not %NULL) a cmp_cache, which can be accessed
- * by @ref e_table_sorting_utils_add_to_cmp_cache and @ref e_table_sorting_utils_lookup_cmp_cache.
+ * Data passed to @compare can be (if not %NULL) a cmp_cache, which
+ * can be accessed by e_table_sorting_utils_add_to_cmp_cache() and
+ * e_table_sorting_utils_lookup_cmp_cache().
  *
  * Returns: the newly created ETableCol object.
  */
diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c
index e11510371a..c7cb5d8b57 100644
--- a/widgets/table/e-table-search.c
+++ b/widgets/table/e-table-search.c
@@ -50,10 +50,11 @@ enum {
 static guint e_table_search_signals [LAST_SIGNAL] = { 0, };
 
 static gboolean
-e_table_search_search (ETableSearch *e_table_search, gchar *string, ETableSearchFlags flags)
+e_table_search_search (ETableSearch *e_table_search,
+                       gchar *string,
+                       ETableSearchFlags flags)
 {
 	gboolean ret_val;
-	g_return_val_if_fail (e_table_search != NULL, FALSE);
 	g_return_val_if_fail (E_IS_TABLE_SEARCH (e_table_search), FALSE);
 
 	g_signal_emit (G_OBJECT (e_table_search),
@@ -66,7 +67,6 @@ e_table_search_search (ETableSearch *e_table_search, gchar *string, ETableSearch
 static void
 e_table_search_accept (ETableSearch *e_table_search)
 {
-	g_return_if_fail (e_table_search != NULL);
 	g_return_if_fail (E_IS_TABLE_SEARCH (e_table_search));
 
 	g_signal_emit (G_OBJECT (e_table_search),
@@ -193,7 +193,8 @@ e_table_search_input_character (ETableSearch *ets, gunichar character)
 	}
 
 	if (character == ets->priv->last_character) {
-		if (ets->priv->search_string && e_table_search_search (ets, ets->priv->search_string, 0)) {
+		if (ets->priv->search_string &&
+			e_table_search_search (ets, ets->priv->search_string, 0)) {
 			add_timeout (ets);
 		}
 	}
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index f3bce34487..2f4939edcb 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -33,7 +33,9 @@
 #include "e-table-header-utils.h"
 
 ETableHeader *
-e_table_state_to_header (GtkWidget *widget, ETableHeader *full_header, ETableState *state)
+e_table_state_to_header (GtkWidget *widget,
+                         ETableHeader *full_header,
+                         ETableState *state)
 {
 	ETableHeader *nh;
 	GtkStyle *style;
@@ -172,7 +174,10 @@ check_col (ETableCol *col, gpointer user_data)
 }
 
 ETableCol *
-e_table_util_calculate_current_search_col (ETableHeader *header, ETableHeader *full_header, ETableSortInfo *sort_info, gboolean always_search)
+e_table_util_calculate_current_search_col (ETableHeader *header,
+                                           ETableHeader *full_header,
+                                           ETableSortInfo *sort_info,
+                                           gboolean always_search)
 {
 	gint i;
 	gint count;