>From 997fec7aceb15fb8f7df7e5e1f660fdb05114231 Mon Sep 17 00:00:00 2001 From: Andreas Winkelmann Date: Mon, 26 May 2014 18:22:12 +0200 Subject: [PATCH 3/3] Some cosmetic changes Browser_List_Refresh_File_In_List() Made iterations simpler, avoids a few functions/conversions --- src/browser.c | 74 ++++++++++++++++++++++++----------------------------------- 1 file changed, 30 insertions(+), 44 deletions(-) diff --git a/src/browser.c b/src/browser.c index 7db96fc..c38e172 100644 --- a/src/browser.c +++ b/src/browser.c @@ -1347,58 +1347,44 @@ void Browser_List_Refresh_File_In_List (ET_File *ETFile) gchar *current_artist = ((File_Tag *)ETFile->FileTag->data)->artist; gchar *current_album = ((File_Tag *)ETFile->FileTag->data)->album; - for (row=0; row < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(artistListModel), NULL); row++) + valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(artistListModel), &selectedIter); + while (valid) { - if (row == 0) - currentPath = gtk_tree_path_new_first(); - else - gtk_tree_path_next(currentPath); - - valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(artistListModel), &selectedIter, currentPath); - if (valid) - { - gtk_tree_model_get(GTK_TREE_MODEL(artistListModel), &selectedIter, ARTIST_NAME, &artist, -1); - - if ( (!current_artist && !artist) - || (current_artist && artist && g_utf8_collate(current_artist,artist)==0) ) - { - // Set color of the row - Browser_Artist_List_Set_Row_Appearance(&selectedIter); - g_free(artist); - break; - } - g_free(artist); - } + gtk_tree_model_get(GTK_TREE_MODEL(artistListModel), &selectedIter, ARTIST_NAME, &artist, -1); + + if ( (!current_artist && !artist) + || (current_artist && artist && g_utf8_collate(current_artist,artist)==0) ) + { + // Set color of the row + Browser_Artist_List_Set_Row_Appearance(&selectedIter); + g_free(artist); + break; + } + g_free(artist); + + valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(artistListModel), &selectedIter); } - gtk_tree_path_free(currentPath); currentPath = NULL; // // FIX ME : see also if we must add a new line / or change list of the ETFile // - for (row=0; row < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(albumListModel), NULL); row++) + valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(albumListModel), &selectedIter); + while( valid ) { - if (row == 0) - currentPath = gtk_tree_path_new_first(); - else - gtk_tree_path_next(currentPath); - - valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(albumListModel), &selectedIter, currentPath); - if (valid) - { - gtk_tree_model_get(GTK_TREE_MODEL(albumListModel), &selectedIter, ALBUM_NAME, &album, -1); - - if ( (!current_album && !album) - || (current_album && album && g_utf8_collate(current_album,album)==0) ) - { - // Set color of the row - Browser_Album_List_Set_Row_Appearance(&selectedIter); - g_free(album); - break; - } - g_free(album); - } + gtk_tree_model_get(GTK_TREE_MODEL(albumListModel), &selectedIter, ALBUM_NAME, &album, -1); + + if ( (!current_album && !album) + || (current_album && album && g_utf8_collate(current_album,album)==0) ) + { + // Set color of the row + Browser_Album_List_Set_Row_Appearance(&selectedIter); + g_free(album); + break; + } + g_free(album); + + valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(albumListModel), &selectedIter); } - gtk_tree_path_free(currentPath); currentPath = NULL; // // FIX ME : see also if we must add a new line / or change list of the ETFile -- 1.8.4.5