[devhelp/wip/swilmet/various-code-improvements] book-tree: move static functions to avoid prototypes

[Sébastien Wilmet <swilmet src gnome org>]

commit 5c7f81a2bafe5c03bcd74ab5ebe323cb684b037d
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Wed Nov 11 12:54:22 2015 +0100

    book-tree: move static functions to avoid prototypes

 src/dh-book-tree.c |  183 +++++++++++++++++++++++++---------------------------
 1 files changed, 87 insertions(+), 96 deletions(-)
---
diff --git a/src/dh-book-tree.c b/src/dh-book-tree.c
index 86da962..ca41d58 100644
--- a/src/dh-book-tree.c
+++ b/src/dh-book-tree.c
@@ -36,15 +36,6 @@ typedef struct {
         DhLink        *selected_link;
 } DhBookTreePrivate;
 
-static void book_tree_add_columns          (DhBookTree       *tree);
-static void book_tree_setup_selection      (DhBookTree       *tree);
-static void book_tree_insert_node          (DhBookTree       *tree,
-                                            GNode            *node,
-                                            GtkTreeIter      *current_iter,
-                                            DhBook           *book);
-static void book_tree_selection_changed_cb (GtkTreeSelection *selection,
-                                            DhBookTree       *tree);
-
 enum {
         LINK_SELECTED,
         LAST_SIGNAL
@@ -117,30 +108,6 @@ dh_book_tree_set_property (GObject      *object,
 }
 
 static void
-dh_book_tree_init (DhBookTree *tree)
-{
-        DhBookTreePrivate *priv;
-
-        priv = dh_book_tree_get_instance_private (tree);
-
-        priv->store = gtk_tree_store_new (N_COLUMNS,
-                                          G_TYPE_STRING,
-                                          G_TYPE_POINTER,
-                                          G_TYPE_OBJECT,
-                                          PANGO_TYPE_WEIGHT,
-                                          PANGO_TYPE_UNDERLINE);
-        priv->selected_link = NULL;
-        gtk_tree_view_set_model (GTK_TREE_VIEW (tree),
-                                 GTK_TREE_MODEL (priv->store));
-
-        gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree), FALSE);
-
-        book_tree_add_columns (tree);
-
-        book_tree_setup_selection (tree);
-}
-
-static void
 book_tree_add_columns (DhBookTree *tree)
 {
         GtkCellRenderer   *cell;
@@ -163,6 +130,29 @@ book_tree_add_columns (DhBookTree *tree)
 }
 
 static void
+book_tree_selection_changed_cb (GtkTreeSelection *selection,
+                                DhBookTree       *tree)
+{
+        DhBookTreePrivate *priv = dh_book_tree_get_instance_private (tree);
+        GtkTreeIter     iter;
+
+        if (gtk_tree_selection_get_selected (selection, NULL, &iter)) {
+                DhLink *link;
+
+                gtk_tree_model_get (GTK_TREE_MODEL (priv->store),
+                                    &iter,
+                                    COL_LINK, &link,
+                                    -1);
+                if (link) {
+                        if (link != priv->selected_link) {
+                                g_signal_emit (tree, signals[LINK_SELECTED], 0, link);
+                        }
+                        priv->selected_link = link;
+                }
+        }
+}
+
+static void
 book_tree_setup_selection (DhBookTree *tree)
 {
         GtkTreeSelection *selection;
@@ -178,6 +168,30 @@ book_tree_setup_selection (DhBookTree *tree)
                                  0);
 }
 
+static void
+dh_book_tree_init (DhBookTree *tree)
+{
+        DhBookTreePrivate *priv;
+
+        priv = dh_book_tree_get_instance_private (tree);
+
+        priv->store = gtk_tree_store_new (N_COLUMNS,
+                                          G_TYPE_STRING,
+                                          G_TYPE_POINTER,
+                                          G_TYPE_OBJECT,
+                                          PANGO_TYPE_WEIGHT,
+                                          PANGO_TYPE_UNDERLINE);
+        priv->selected_link = NULL;
+        gtk_tree_view_set_model (GTK_TREE_VIEW (tree),
+                                 GTK_TREE_MODEL (priv->store));
+
+        gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree), FALSE);
+
+        book_tree_add_columns (tree);
+
+        book_tree_setup_selection (tree);
+}
+
 /* Tries to find:
  *  - An exact match of the language group
  *  - Or the language group which should be just after our given language group.
@@ -318,6 +332,46 @@ book_tree_find_book (DhBookTree        *tree,
 }
 
 static void
+book_tree_insert_node (DhBookTree  *tree,
+                       GNode       *node,
+                       GtkTreeIter *current_iter,
+                       DhBook      *book)
+
+{
+        DhBookTreePrivate *priv = dh_book_tree_get_instance_private (tree);
+        DhLink         *link;
+        PangoWeight     weight;
+        GNode          *child;
+
+        link = node->data;
+
+        if (dh_link_get_link_type (link) == DH_LINK_TYPE_BOOK) {
+                weight = PANGO_WEIGHT_BOLD;
+        } else {
+                weight = PANGO_WEIGHT_NORMAL;
+        }
+
+        gtk_tree_store_set (priv->store,
+                            current_iter,
+                            COL_TITLE, dh_link_get_name (link),
+                            COL_LINK, link,
+                            COL_BOOK, book,
+                            COL_WEIGHT, weight,
+                            COL_UNDERLINE, PANGO_UNDERLINE_NONE,
+                            -1);
+
+        for (child = g_node_first_child (node);
+             child;
+             child = g_node_next_sibling (child)) {
+                GtkTreeIter iter;
+
+                /* Append new iter */
+                gtk_tree_store_append (priv->store, &iter, current_iter);
+                book_tree_insert_node (tree, child, &iter, NULL);
+        }
+}
+
+static void
 book_tree_add_book_to_store (DhBookTree *tree,
                              DhBook     *book,
                              gboolean    group_by_language)
@@ -553,69 +607,6 @@ book_tree_book_deleted_or_disabled_cb (DhBookManager *book_manager,
 }
 
 static void
-book_tree_insert_node (DhBookTree  *tree,
-                       GNode       *node,
-                       GtkTreeIter *current_iter,
-                       DhBook      *book)
-
-{
-        DhBookTreePrivate *priv = dh_book_tree_get_instance_private (tree);
-        DhLink         *link;
-        PangoWeight     weight;
-        GNode          *child;
-
-        link = node->data;
-
-        if (dh_link_get_link_type (link) == DH_LINK_TYPE_BOOK) {
-                weight = PANGO_WEIGHT_BOLD;
-        } else {
-                weight = PANGO_WEIGHT_NORMAL;
-        }
-
-        gtk_tree_store_set (priv->store,
-                            current_iter,
-                            COL_TITLE, dh_link_get_name (link),
-                            COL_LINK, link,
-                            COL_BOOK, book,
-                            COL_WEIGHT, weight,
-                            COL_UNDERLINE, PANGO_UNDERLINE_NONE,
-                            -1);
-
-        for (child = g_node_first_child (node);
-             child;
-             child = g_node_next_sibling (child)) {
-                GtkTreeIter iter;
-
-                /* Append new iter */
-                gtk_tree_store_append (priv->store, &iter, current_iter);
-                book_tree_insert_node (tree, child, &iter, NULL);
-        }
-}
-
-static void
-book_tree_selection_changed_cb (GtkTreeSelection *selection,
-                                DhBookTree       *tree)
-{
-        DhBookTreePrivate *priv = dh_book_tree_get_instance_private (tree);
-        GtkTreeIter     iter;
-
-        if (gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-                DhLink *link;
-
-                gtk_tree_model_get (GTK_TREE_MODEL (priv->store),
-                                    &iter,
-                                    COL_LINK, &link,
-                                    -1);
-                if (link) {
-                        if (link != priv->selected_link) {
-                                g_signal_emit (tree, signals[LINK_SELECTED], 0, link);
-                        }
-                        priv->selected_link = link;
-                }
-        }
-}
-
-static void
 book_tree_group_by_language_cb (GObject    *object,
                                 GParamSpec *pspec,
                                 gpointer    user_data)