From e629d558496cc873d9a0c844ceeacf45eaee87a0 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@NoWheyCreamery.com>
Date: Tue, 23 Aug 2016 07:51:53 -0400
Subject: [PATCH] gui/treeview: Add an init function

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
---
 gui/ocarina.c          |  2 ++
 gui/treeview.c         | 11 +++++++++++
 gui/view.c             |  2 --
 include/gui/treeview.h |  4 ++++
 tests/gui/playlist.c   |  2 ++
 tests/gui/treeview.c   |  4 ++++
 6 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 gui/treeview.c

diff --git a/gui/ocarina.c b/gui/ocarina.c
index 83fe3441..c85dbe62 100644
--- a/gui/ocarina.c
+++ b/gui/ocarina.c
@@ -12,6 +12,7 @@
 #include <gui/playlist.h>
 #include <gui/queue.h>
 #include <gui/sidebar.h>
+#include <gui/treeview.h>
 #include <gui/view.h>
 #include <gui/window.h>
 
@@ -105,6 +106,7 @@ static void __ocarina_startup(GApplication *application, gpointer data)
 	gui_window_init(icon);
 	gui_model_init();
 	gui_filter_init();
+	gui_treeview_init();
 	gui_view_init();
 	gui_queue_init();
 	gui_sidebar_init();
diff --git a/gui/treeview.c b/gui/treeview.c
new file mode 100644
index 00000000..e28b408d
--- /dev/null
+++ b/gui/treeview.c
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2016 (c) Anna Schumaker.
+ */
+#include <gui/filter.h>
+#include <gui/treeview.h>
+
+void gui_treeview_init()
+{
+	gtk_tree_view_set_model(gui_treeview(),
+				GTK_TREE_MODEL(gui_filter_get()));
+}
diff --git a/gui/view.c b/gui/view.c
index 559ab221..16a85924 100644
--- a/gui/view.c
+++ b/gui/view.c
@@ -390,8 +390,6 @@ void gui_view_init()
 		if (col && pos > 0)
 			gtk_tree_view_column_set_fixed_width(col, pos);
 	}
-
-	gtk_tree_view_set_model(view_treeview, GTK_TREE_MODEL(gui_filter_get()));
 }
 
 void gui_view_set_playlist(struct playlist *playlist)
diff --git a/include/gui/treeview.h b/include/gui/treeview.h
index de5ea532..03bbd863 100644
--- a/include/gui/treeview.h
+++ b/include/gui/treeview.h
@@ -3,6 +3,10 @@
  */
 #ifndef OCARINA_GUI_TREEVIEW_H
 #define OCARINA_GUI_TREEVIEW_H
+#include <gui/builder.h>
+
+/* Called to initialize the treeview widget. */
+void gui_treeview_init();
 
 /* Called to access the treeview widget. */
 static inline GtkTreeView *gui_treeview()
diff --git a/tests/gui/playlist.c b/tests/gui/playlist.c
index 12436c53..50563ce5 100644
--- a/tests/gui/playlist.c
+++ b/tests/gui/playlist.c
@@ -7,6 +7,7 @@
 #include <gui/filter.h>
 #include <gui/model.h>
 #include <gui/playlist.h>
+#include <gui/treeview.h>
 #include <gui/view.h>
 #include <gui/window.h>
 #include <tests/test.h>
@@ -109,6 +110,7 @@ int main(int argc, char **argv)
 	core_init(&argc, NULL, &init_data);
 	gui_model_init();
 	gui_filter_init();
+	gui_treeview_init();
 	gui_view_init();
 	gui_playlist_init();
 	playlist_new(PL_LIBRARY, "tests/Music/Hyrule Symphony");
diff --git a/tests/gui/treeview.c b/tests/gui/treeview.c
index c75ebaa5..b7cae247 100644
--- a/tests/gui/treeview.c
+++ b/tests/gui/treeview.c
@@ -14,6 +14,9 @@ void test_treeview()
 {
 	g_assert_nonnull(gui_treeview());
 	g_assert_true(GTK_IS_TREE_VIEW(gui_treeview()));
+
+	g_assert(gtk_tree_view_get_model(gui_treeview()) ==
+		 GTK_TREE_MODEL(gui_filter_get()));
 }
 
 int main(int argc, char **argv)
@@ -25,6 +28,7 @@ int main(int argc, char **argv)
 	gui_builder_init("share/ocarina/ocarina.ui");
 	gui_model_init();
 	gui_filter_init();
+	gui_treeview_init();
 	while (idle_run_task()) {}
 
 	g_test_init(&argc, &argv, NULL);