diff --git a/gui/playlist.c b/gui/playlist.c index 2d593995..3c768214 100644 --- a/gui/playlist.c +++ b/gui/playlist.c @@ -8,7 +8,6 @@ enum playlist_sidebar_columns { P_SB_IMAGE, - P_SB_IMAGE_SZ, P_SB_NAME, P_SB_PLAYLIST, }; @@ -16,13 +15,11 @@ enum playlist_sidebar_columns { static GtkTreeStore *p_store; static enum playlist_t p_cur; -static void __playlist_set(GtkTreeIter *iter, const gchar *name, - const gchar *image, GtkIconSize size, - enum playlist_t plist) +static void __playlist_set(GtkTreeIter *iter, const gchar *name, + const gchar *image, enum playlist_t plist) { gtk_tree_store_set(p_store, iter, P_SB_NAME, name, P_SB_IMAGE, image, - P_SB_IMAGE_SZ, size, P_SB_PLAYLIST, plist, -1); } @@ -31,7 +28,7 @@ static void __playlist_add(GtkTreeIter *parent, const gchar *name, { GtkTreeIter iter; gtk_tree_store_insert(p_store, &iter, parent, -1); - __playlist_set(&iter, name, image, GTK_ICON_SIZE_MENU, plist); + __playlist_set(&iter, name, image, plist); } void __playlist_selection_changed(GtkTreeSelection *selection, gpointer data) @@ -60,7 +57,7 @@ void gui_playlist_init() gtk_tree_store_insert(p_store, &parent, NULL, -1); gtk_tree_store_insert(p_store, &parent, NULL, -1); __playlist_set(&parent, "Playlists", - "emblem-documents", GTK_ICON_SIZE_LARGE_TOOLBAR, 0); + "emblem-documents", 0); /* Add playlists. */ __playlist_add(&parent, "Favorites", "emblem-favorite", PL_FAVORITED); diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade index 3979b179..0ff4a7b2 100644 --- a/share/ocarina/ocarina6.glade +++ b/share/ocarina/ocarina6.glade @@ -230,8 +230,6 @@ - - @@ -719,10 +717,11 @@ Image - + + 1 + 0 - 1 @@ -733,7 +732,7 @@ - 2 + 1