Uncrustifyuncrustify

For a better future. Apologies when your 'git blame' resolves to this.

I'm actually really impressed how well uncrustify works. This required
only a little one-time manual work to avoid extra space in 'else   {'.

This breaks function prototype alignment, but we should get rid of most
of those anyway.

We decided to start aligning function parameters, like other GNOME
applications. It looks nicer this way, and I couldn't teach uncrustify
the previous Epiphany style.

1 files changed, 81 insertions, 83 deletions

diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c
index 82d0441dc..96037f45c 100644
--- a/lib/widgets/ephy-tree-model-sort.c
+++ b/lib/widgets/ephy-tree-model-sort.c
@@ -37,19 +37,18 @@
 static void ephy_tree_model_sort_finalize (GObject *object);
 static void ephy_tree_model_sort_multi_drag_source_interface_init (EggTreeMultiDragSourceIface *iface);
 static gboolean ephy_tree_model_sort_multi_row_draggable (EggTreeMultiDragSource *drag_source,
-							  GList *path_list);
+                                                          GList                  *path_list);
 static gboolean ephy_tree_model_sort_multi_drag_data_get (EggTreeMultiDragSource *drag_source,
-							  GList *path_list,
-							  GtkSelectionData *selection_data);
+                                                          GList                  *path_list,
+                                                          GtkSelectionData       *selection_data);
 static gboolean ephy_tree_model_sort_multi_drag_data_delete (EggTreeMultiDragSource *drag_source,
-							     GList *path_list);
+                                                             GList                  *path_list);
 
-struct _EphyTreeModelSort
-{
-	GtkTreeModelSort parent_instance;
-	char *str_list;
-	int base_drag_column_id;
-	int extra_drag_column_id;
+struct _EphyTreeModelSort {
+  GtkTreeModelSort parent_instance;
+  char *str_list;
+  int base_drag_column_id;
+  int extra_drag_column_id;
 };
 
 G_DEFINE_TYPE_WITH_CODE (EphyTreeModelSort, ephy_tree_model_sort, GTK_TYPE_TREE_MODEL_SORT,
@@ -59,26 +58,26 @@ G_DEFINE_TYPE_WITH_CODE (EphyTreeModelSort, ephy_tree_model_sort, GTK_TYPE_TREE_
 static void
 ephy_tree_model_sort_class_init (EphyTreeModelSortClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class->finalize = ephy_tree_model_sort_finalize;
+  object_class->finalize = ephy_tree_model_sort_finalize;
 }
 
 static void
 ephy_tree_model_sort_init (EphyTreeModelSort *ma)
 {
-	ma->base_drag_column_id = -1;
-	ma->extra_drag_column_id = -1;
+  ma->base_drag_column_id = -1;
+  ma->extra_drag_column_id = -1;
 }
 
 static void
 ephy_tree_model_sort_finalize (GObject *object)
 {
-	EphyTreeModelSort *model = EPHY_TREE_MODEL_SORT (object);
+  EphyTreeModelSort *model = EPHY_TREE_MODEL_SORT (object);
 
-	g_free (model->str_list);
+  g_free (model->str_list);
 
-	G_OBJECT_CLASS (ephy_tree_model_sort_parent_class)->finalize (object);
+  G_OBJECT_CLASS (ephy_tree_model_sort_parent_class)->finalize (object);
 }
 
 /**
@@ -89,32 +88,32 @@ ephy_tree_model_sort_finalize (GObject *object)
  *
  * Returns: a new #EphyTreeModelSort, as a #GtkWidget
  **/
-GtkTreeModel*
+GtkTreeModel *
 ephy_tree_model_sort_new (GtkTreeModel *child_model)
 {
-	GtkTreeModel *model;
+  GtkTreeModel *model;
 
-	g_return_val_if_fail (child_model != NULL, NULL);
+  g_return_val_if_fail (child_model != NULL, NULL);
 
-	model = GTK_TREE_MODEL (g_object_new (EPHY_TYPE_TREE_MODEL_SORT,
-					      "model", child_model,
-					      NULL));
+  model = GTK_TREE_MODEL (g_object_new (EPHY_TYPE_TREE_MODEL_SORT,
+                                        "model", child_model,
+                                        NULL));
 
-	return model;
+  return model;
 }
 
 static void
 ephy_tree_model_sort_multi_drag_source_interface_init (EggTreeMultiDragSourceIface *iface)
 {
-	iface->row_draggable    = ephy_tree_model_sort_multi_row_draggable;
-	iface->drag_data_get    = ephy_tree_model_sort_multi_drag_data_get;
-	iface->drag_data_delete = ephy_tree_model_sort_multi_drag_data_delete;
+  iface->row_draggable = ephy_tree_model_sort_multi_row_draggable;
+  iface->drag_data_get = ephy_tree_model_sort_multi_drag_data_get;
+  iface->drag_data_delete = ephy_tree_model_sort_multi_drag_data_delete;
 }
 
 static gboolean
 ephy_tree_model_sort_multi_row_draggable (EggTreeMultiDragSource *drag_source, GList *path_list)
 {
-	return (EPHY_TREE_MODEL_SORT (drag_source)->base_drag_column_id >= 0);
+  return (EPHY_TREE_MODEL_SORT (drag_source)->base_drag_column_id >= 0);
 }
 
 /**
@@ -126,9 +125,9 @@ ephy_tree_model_sort_multi_row_draggable (EggTreeMultiDragSource *drag_source, G
  **/
 void
 ephy_tree_model_sort_set_base_drag_column_id (EphyTreeModelSort *ms,
-				              int id)
+                                              int                id)
 {
-	ms->base_drag_column_id = id;
+  ms->base_drag_column_id = id;
 }
 
 /**
@@ -140,76 +139,75 @@ ephy_tree_model_sort_set_base_drag_column_id (EphyTreeModelSort *ms,
  **/
 void
 ephy_tree_model_sort_set_extra_drag_column_id (EphyTreeModelSort *ms,
-					       int id)
+                                               int                id)
 {
-	ms->extra_drag_column_id = id;
+  ms->extra_drag_column_id = id;
 }
 
 static gboolean
 ephy_tree_model_sort_multi_drag_data_delete (EggTreeMultiDragSource *drag_source,
-					     GList *path_list)
+                                             GList                  *path_list)
 {
-	return TRUE;
+  return TRUE;
 }
 
 static void
 each_property_get_data_binder (EphyDragEachSelectedItemDataGet iteratee,
-			       gpointer iterator_context, gpointer data)
+                               gpointer iterator_context, gpointer data)
 {
-	gpointer *context = (gpointer *) iterator_context;
-	GList *path_list = (GList *) (context[0]);
-	GList *i;
-	EphyTreeModelSort *model = EPHY_TREE_MODEL_SORT (context[1]);
-	GValue base_value = {0, }, extra_value = {0, };
-
-	for (i = path_list; i != NULL; i = i->next)
-	{
-		GtkTreeIter iter;
-		GtkTreePath *path = NULL;
-		const char *base_data, *extra_data;
-
-		path = gtk_tree_row_reference_get_path (i->data);
-		gtk_tree_model_get_iter (GTK_TREE_MODEL (model), &iter, path);
-
-		gtk_tree_model_get_value (GTK_TREE_MODEL (model), &iter,
-					  model->base_drag_column_id,
-					  &base_value);
-		base_data = g_value_get_string (&base_value);
-
-		if (model->extra_drag_column_id >= 0) {
-			gtk_tree_model_get_value (GTK_TREE_MODEL (model), &iter,
-						  model->extra_drag_column_id,
-						  &extra_value);
-			extra_data = g_value_get_string (&extra_value);
-		} else
-			extra_data = NULL;
-
-		g_return_if_fail (base_data != NULL);
-
-		LOG ("Data get %s (%s)", base_data, extra_data);
-
-		iteratee (base_data, extra_data, data);
-
-		gtk_tree_path_free (path);
-		g_value_unset (&base_value);
-
-		if (model->extra_drag_column_id >= 0)
-			g_value_unset (&extra_value);
-	}
+  gpointer *context = (gpointer *)iterator_context;
+  GList *path_list = (GList *)(context[0]);
+  GList *i;
+  EphyTreeModelSort *model = EPHY_TREE_MODEL_SORT (context[1]);
+  GValue base_value = { 0, }, extra_value = { 0, };
+
+  for (i = path_list; i != NULL; i = i->next) {
+    GtkTreeIter iter;
+    GtkTreePath *path = NULL;
+    const char *base_data, *extra_data;
+
+    path = gtk_tree_row_reference_get_path (i->data);
+    gtk_tree_model_get_iter (GTK_TREE_MODEL (model), &iter, path);
+
+    gtk_tree_model_get_value (GTK_TREE_MODEL (model), &iter,
+                              model->base_drag_column_id,
+                              &base_value);
+    base_data = g_value_get_string (&base_value);
+
+    if (model->extra_drag_column_id >= 0) {
+      gtk_tree_model_get_value (GTK_TREE_MODEL (model), &iter,
+                                model->extra_drag_column_id,
+                                &extra_value);
+      extra_data = g_value_get_string (&extra_value);
+    } else
+      extra_data = NULL;
+
+    g_return_if_fail (base_data != NULL);
+
+    LOG ("Data get %s (%s)", base_data, extra_data);
+
+    iteratee (base_data, extra_data, data);
+
+    gtk_tree_path_free (path);
+    g_value_unset (&base_value);
+
+    if (model->extra_drag_column_id >= 0)
+      g_value_unset (&extra_value);
+  }
 }
 
 static gboolean
 ephy_tree_model_sort_multi_drag_data_get (EggTreeMultiDragSource *drag_source,
-					  GList *path_list,
-					  GtkSelectionData *selection_data)
+                                          GList                  *path_list,
+                                          GtkSelectionData       *selection_data)
 {
-	gpointer icontext[2];
+  gpointer icontext[2];
 
-	icontext[0] = path_list;
-	icontext[1] = drag_source;
+  icontext[0] = path_list;
+  icontext[1] = drag_source;
 
-	ephy_dnd_drag_data_get (NULL, NULL, selection_data,
-				0, &icontext, each_property_get_data_binder);
+  ephy_dnd_drag_data_get (NULL, NULL, selection_data,
+                          0, &icontext, each_property_get_data_binder);
 
-	return TRUE;
+  return TRUE;
 }