diff --git a/gui/playlist.c b/gui/playlist.c
index 8ddda531..d95a1f6b 100644
--- a/gui/playlist.c
+++ b/gui/playlist.c
@@ -24,9 +24,8 @@ static void __playlist_update_sizes(struct queue *);
static inline void __playlist_filter_get_iter(GtkTreeIter *iter, GtkTreeIter *child)
{
- gtk_tree_model_filter_convert_iter_to_child_iter(
- GTK_TREE_MODEL_FILTER(gui_builder_object("o_playlist_filter")),
- child, iter);
+ gtk_tree_model_filter_convert_iter_to_child_iter(gui_sidebar_filter(),
+ child, iter);
}
static inline enum playlist_type_t __playlist_type(GtkTreeIter *iter)
{
@@ -167,7 +166,7 @@ void __playlist_row_activated(GtkTreeView *treeview, GtkTreePath *path,
type = settings_get("core.playlist.cur.type");
id = settings_get("core.playlist.cur.id");
- model = GTK_TREE_MODEL(gui_builder_object("o_playlist_filter"));
+ model = GTK_TREE_MODEL(gui_sidebar_filter());
gtk_tree_model_get_iter(model, &iter, path);
__playlist_filter_get_iter(&iter, &child);
@@ -234,7 +233,7 @@ static void __playlist_update_sizes(struct queue *queue)
} while (gtk_tree_model_iter_next(gui_sidebar_model(), &parent));
out:
- filter = GTK_TREE_MODEL_FILTER(gui_builder_object("o_playlist_filter"));
+ filter = gui_sidebar_filter();
gtk_tree_model_filter_refilter(filter);
}
@@ -314,7 +313,7 @@ bool __gui_playlist_init_idle()
GtkTreeModel *filter;
GtkTreeIter iter;
- filter = GTK_TREE_MODEL(gui_builder_object("o_playlist_filter"));
+ filter = GTK_TREE_MODEL(gui_sidebar_filter());
treeview = GTK_TREE_VIEW(gui_builder_widget("o_playlist_view"));
selection = gtk_tree_view_get_selection(treeview);
gtk_tree_model_get_iter_first(filter, &iter);
@@ -339,7 +338,7 @@ void gui_playlist_init()
GtkTreeView *treeview;
GtkTreeIter parent;
- filter = GTK_TREE_MODEL_FILTER(gui_builder_object("o_playlist_filter"));
+ filter = gui_sidebar_filter();
treeview = GTK_TREE_VIEW(gui_builder_widget("o_playlist_view"));
gtk_tree_model_filter_set_visible_func(filter, __playlist_visible_func,
diff --git a/include/gui/sidebar.h b/include/gui/sidebar.h
index 0dbcaa71..93937885 100644
--- a/include/gui/sidebar.h
+++ b/include/gui/sidebar.h
@@ -26,4 +26,10 @@ static inline GtkTreeModel *gui_sidebar_model()
return GTK_TREE_MODEL(gui_builder_object("sidebar_store"));
}
+/* Called to get the sidebar filter model. */
+static inline GtkTreeModelFilter *gui_sidebar_filter()
+{
+ return GTK_TREE_MODEL_FILTER(gui_builder_object("sidebar_filter"));
+}
+
#endif /* OCARINA_GUI_SIDEBAR_H */
diff --git a/share/ocarina/ocarina.ui b/share/ocarina/ocarina.ui
index 8fb3af55..a7316157 100644
--- a/share/ocarina/ocarina.ui
+++ b/share/ocarina/ocarina.ui
@@ -93,7 +93,7 @@
-