From bbac5e23be86cab505d2d1631a051a22174bf581 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@NoWheyCreamery.com>
Date: Thu, 25 Aug 2016 07:56:20 -0400
Subject: [PATCH] gui/sidebar: Add a function for getting the sidebar treeview

And rename the treeview from "o_playlist_view" to "sidebar_treeview"

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
---
 gui/playlist.c           | 7 +++----
 include/gui/sidebar.h    | 6 ++++++
 share/ocarina/ocarina.ui | 2 +-
 tests/gui/playlist.c     | 4 ++--
 tests/gui/sidebar.c      | 3 +++
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gui/playlist.c b/gui/playlist.c
index d95a1f6b..69888970 100644
--- a/gui/playlist.c
+++ b/gui/playlist.c
@@ -314,7 +314,7 @@ bool __gui_playlist_init_idle()
 	GtkTreeIter iter;
 
 	filter    = GTK_TREE_MODEL(gui_sidebar_filter());
-	treeview  = GTK_TREE_VIEW(gui_builder_widget("o_playlist_view"));
+	treeview  = gui_sidebar_treeview();
 	selection = gtk_tree_view_get_selection(treeview);
 	gtk_tree_model_get_iter_first(filter, &iter);
 	gtk_tree_selection_select_iter(selection, &iter);
@@ -339,7 +339,7 @@ void gui_playlist_init()
 	GtkTreeIter parent;
 
 	filter    = gui_sidebar_filter();
-	treeview  = GTK_TREE_VIEW(gui_builder_widget("o_playlist_view"));
+	treeview  = gui_sidebar_treeview();
 
 	gtk_tree_model_filter_set_visible_func(filter, __playlist_visible_func,
 						NULL, NULL);
@@ -403,8 +403,7 @@ void gui_playlist_add_library(struct library *library)
 		g_free(name);
 	}
 
-	gtk_tree_view_expand_all(
-		GTK_TREE_VIEW(gui_builder_widget("o_playlist_view")));
+	gtk_tree_view_expand_all(gui_sidebar_treeview());
 }
 
 void gui_playlist_add_artist(struct artist *artist)
diff --git a/include/gui/sidebar.h b/include/gui/sidebar.h
index 93937885..6cb00dd9 100644
--- a/include/gui/sidebar.h
+++ b/include/gui/sidebar.h
@@ -32,4 +32,10 @@ static inline GtkTreeModelFilter *gui_sidebar_filter()
 	return GTK_TREE_MODEL_FILTER(gui_builder_object("sidebar_filter"));
 }
 
+/* Called to get the sidebar treeview. */
+static inline GtkTreeView *gui_sidebar_treeview()
+{
+	return GTK_TREE_VIEW(gui_builder_widget("sidebar_treeview"));
+}
+
 #endif /* OCARINA_GUI_SIDEBAR_H */
diff --git a/share/ocarina/ocarina.ui b/share/ocarina/ocarina.ui
index a7316157..0d0b1f86 100644
--- a/share/ocarina/ocarina.ui
+++ b/share/ocarina/ocarina.ui
@@ -740,7 +740,7 @@ audio-volume-medium</property>
                     <property name="vexpand">True</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkTreeView" id="o_playlist_view">
+                      <object class="GtkTreeView" id="sidebar_treeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="model">sidebar_filter</property>
diff --git a/tests/gui/playlist.c b/tests/gui/playlist.c
index 0e321fe4..233dc7a6 100644
--- a/tests/gui/playlist.c
+++ b/tests/gui/playlist.c
@@ -25,9 +25,9 @@ static void test_playlist_sidebar()
 	GtkTreePath *path;
 	GtkTreeIter iter;
 
-	g_assert_true(GTK_IS_TREE_VIEW(GTK_TREE_VIEW(gui_builder_widget("o_playlist_view"))));
+	g_assert_true(GTK_IS_TREE_VIEW(gui_sidebar_treeview()));
 
-	treeview  = GTK_TREE_VIEW(gui_builder_widget("o_playlist_view"));
+	treeview  = gui_sidebar_treeview();
 	selection = gtk_tree_view_get_selection(treeview);
 	model     = gui_sidebar_model();
 
diff --git a/tests/gui/sidebar.c b/tests/gui/sidebar.c
index 7a2f0738..a6ec9d80 100644
--- a/tests/gui/sidebar.c
+++ b/tests/gui/sidebar.c
@@ -15,6 +15,9 @@ static void test_sidebar()
 
 	g_assert_nonnull(gui_sidebar_filter());
 	g_assert_true(GTK_IS_TREE_MODEL_FILTER(gui_sidebar_filter()));
+
+	g_assert_nonnull(gui_sidebar_treeview());
+	g_assert_true(GTK_IS_TREE_VIEW(gui_sidebar_treeview()));
 }
 
 static void test_sidebar_pos()