[easytag/wip/core-refactoring: 6/7] Refactor several file list functions

[David King <davidk src gnome org>]

commit e2a68c40be05d3fbf74c28bdbbee82b504b71472
Author: David King <amigadave amigadave com>
Date:   Wed Jan 7 21:02:58 2015 +0000

    Refactor several file list functions
    
    Accept a file list as the first parameter, and return the list pointer
    as necessary.

 src/application_window.c |    4 +-
 src/browser.c            |   15 ++--
 src/easytag.c            |    6 +-
 src/file.c               |   11 ++-
 src/file_list.c          |  200 ++++++++++++++++++++++++----------------------
 src/file_list.h          |   20 ++---
 src/tag_area.c           |    2 +-
 7 files changed, 136 insertions(+), 122 deletions(-)
---
diff --git a/src/application_window.c b/src/application_window.c
index 9d9f056..42c11b1 100644
--- a/src/application_window.c
+++ b/src/application_window.c
@@ -2342,7 +2342,7 @@ et_application_window_update_actions (EtApplicationWindow *self)
         set_action_state (self, "save-force", TRUE);
 
         /* Enable undo command if there are data into main undo list (history list) */
-        if (ET_History_File_List_Has_Undo_Data ())
+        if (et_history_list_has_undo (ETCore->ETHistoryFileList))
         {
             set_action_state (self, "undo-last-changes", TRUE);
         }
@@ -2352,7 +2352,7 @@ et_application_window_update_actions (EtApplicationWindow *self)
         }
 
         /* Enable redo commands if there are data into main redo list (history list) */
-        if (ET_History_File_List_Has_Redo_Data ())
+        if (et_history_list_has_redo (ETCore->ETHistoryFileList))
         {
             set_action_state (self, "redo-last-changes", TRUE);
         }
diff --git a/src/browser.c b/src/browser.c
index f05c0ca..7ae6593 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -2608,7 +2608,7 @@ Browser_Album_List_Load_Files (EtBrowser *self,
             gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(priv->album_list), path, NULL, FALSE, 0, 0);
             gtk_tree_path_free(path);
 
-            ET_Set_Displayed_File_List(etfilelist);
+            et_displayed_file_list_set (etfilelist);
             et_browser_load_file_list (self, etfilelist, etfile_to_select);
 
             // Now that we've found the album, no need to continue searching
@@ -2627,8 +2627,8 @@ Browser_Album_List_Load_Files (EtBrowser *self,
                            -1);
         ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
 
-        // Set the attached list as "Displayed List"
-        ET_Set_Displayed_File_List(etfilelist);
+        /* Set the attached list as "Displayed List". */
+        et_displayed_file_list_set (etfilelist);
         et_browser_load_file_list (self, etfilelist, NULL);
 
         /* Displays the first item. */
@@ -2659,8 +2659,8 @@ Browser_Album_List_Row_Selected (EtBrowser *self, GtkTreeSelection *selection)
     // Save the current displayed data
     ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
 
-    // Set the attached list as "Displayed List"
-    ET_Set_Displayed_File_List(etfilelist);
+    /* Set the attached list as "Displayed List". */
+    et_displayed_file_list_set (etfilelist);
 
     et_browser_load_file_list (self, etfilelist, NULL);
 
@@ -2732,7 +2732,7 @@ et_browser_set_display_mode (EtBrowser *self,
     {
         case ET_BROWSER_MODE_FILE:
             /* Set the whole list as "Displayed list". */
-            ET_Set_Displayed_File_List (ETCore->ETFileList);
+            et_displayed_file_list_set (ETCore->ETFileList);
 
             /* Display Tree Browser. */
             gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), 0);
@@ -4526,7 +4526,8 @@ Rename_Directory (EtBrowser *self)
         return;
     }
 
-    ET_Update_Directory_Name_Into_File_List(last_path,new_path);
+    et_file_list_update_directory_name (ETCore->ETFileList, last_path,
+                                        new_path);
     Browser_Tree_Rename_Directory (self, last_path, new_path);
 
     // To update file path in the browser entry
diff --git a/src/easytag.c b/src/easytag.c
index 81442eb..e8d3db5 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -1013,8 +1013,10 @@ Read_Directory (const gchar *path_real)
         g_free(msg);
         g_free(filename_utf8);
 
-        // Warning: Do not free filename_real because ET_Add_File.. uses it for internal structures
-        ET_Add_File_To_File_List(filename_real);
+        /* Warning: Do not free filename_real because ET_Add_File.. uses it for
+         * internal structures. */
+        ETCore->ETFileList = et_file_list_add (ETCore->ETFileList,
+                                               filename_real);
 
         /* Update the progress bar. */
         fraction = (++progress_bar_index) / (double) nbrfile;
diff --git a/src/file.c b/src/file.c
index 8a93441..28c8459 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1327,7 +1327,11 @@ ET_Display_Filename_To_UI (const ET_File *ETFile)
                                                   dirname_utf8);
 
     // And refresh the number of files in this directory
-    text = g_strdup_printf(ngettext("One file","%u 
files",ET_Get_Number_Of_Files_In_Directory(dirname_utf8)),ET_Get_Number_Of_Files_In_Directory(dirname_utf8));
+    text = g_strdup_printf (ngettext ("One file", "%u files",
+                                      et_file_list_get_n_files_in_path (ETCore->ETFileList,
+                                                                        dirname_utf8)),
+                            et_file_list_get_n_files_in_path (ETCore->ETFileList,
+                                                              dirname_utf8));
     et_application_window_browser_label_set_text (ET_APPLICATION_WINDOW (MainWindow),
                                                   text);
     g_free(dirname_utf8);
@@ -1995,7 +1999,10 @@ ET_Manage_Changes_Of_File_Data (ET_File *ETFile,
      * Generate main undo (file history of modifications)
      */
     if (undo_added)
-        ET_Add_File_To_History_List(ETFile);
+    {
+        ETCore->ETHistoryFileList = et_history_list_add (ETCore->ETHistoryFileList,
+                                                         ETFile);
+    }
 
     //return TRUE;
     return undo_added;
diff --git a/src/file_list.c b/src/file_list.c
index 7c992b0..3252a4a 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -185,12 +185,16 @@ et_core_read_file_info (GFile *file,
 }
 
 /*
- * ET_Add_File_To_File_List: Add a file to the "main" list. And get all information of the file.
- * The filename passed in should be in raw format, only convert it to UTF8 when displaying it.
+ * et_file_list_add:
+ * Add a file to the "main" list. And get all information of the file.
+ * The filename passed in should be in raw format, only convert it to UTF8 when
+ * displaying it.
  */
 GList *
-ET_Add_File_To_File_List (gchar *filename)
+et_file_list_add (GList *file_list,
+                  gchar *filename)
 {
+    GList *result;
     const ET_File_Description *ETFileDescription;
     ET_File      *ETFile;
     File_Name    *FileName;
@@ -206,8 +210,7 @@ ET_Add_File_To_File_List (gchar *filename)
     GError *error = NULL;
     gboolean success;
 
-    if (!filename)
-        return ETCore->ETFileList;
+    g_return_val_if_fail (filename != NULL, file_list);
 
     file = g_file_new_for_path (filename);
 
@@ -429,7 +432,7 @@ ET_Add_File_To_File_List (gchar *filename)
     ETFile->ETFileInfo           = ETFileInfo;
 
     /* Add the item to the "main list" */
-    ETCore->ETFileList = g_list_append(ETCore->ETFileList,ETFile);
+    result = g_list_append (file_list, ETFile);
 
 
     /*
@@ -467,7 +470,7 @@ ET_Add_File_To_File_List (gchar *filename)
     //ET_Add_File_To_Artist_Album_File_List(ETFile);
 
     //ET_Debug_Print_File_List(ETCore->ETFileList,__FILE__,__LINE__,__FUNCTION__);
-    return ETCore->ETFileList;
+    return result;
 }
 
 /*
@@ -563,6 +566,7 @@ et_artist_album_list_add_file (GList *file_list,
     GList *ArtistList;
     GList *AlbumList = NULL;
     GList *etfilelist = NULL;
+    GList *result;
     ET_File *etfile = NULL;
 
     g_return_if_fail (ETFile != NULL);
@@ -642,10 +646,10 @@ et_artist_album_list_add_file (GList *file_list,
 
     /* Sort the list by ascending Artist. */
     /* TODO: Use g_list_insert_sorted() instead. */
-    file_list = g_list_sort (file_list,
-                             (GCompareFunc)ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist);
+    result = g_list_sort (file_list,
+                          (GCompareFunc)ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist);
 
-    return file_list;
+    return result;
 }
 
 GList *
@@ -727,26 +731,24 @@ ET_Remove_File_From_Artist_Album_List (ET_File *ETFile)
  * Returns the length of the list of displayed files
  */
 static guint
-ET_Displayed_File_List_Get_Length (void)
+et_displayed_file_list_length (GList *displayed_list)
 {
-    GList *list = NULL;
+    GList *list;
 
-    list = g_list_first(ETCore->ETFileDisplayedList);
-    ETCore->ETFileDisplayedList_Length = g_list_length(list);
-    return ETCore->ETFileDisplayedList_Length;
+    list = g_list_first (displayed_list);
+    return g_list_length (list);;
 }
 
 /*
  * Renumber the list of displayed files (IndexKey) from 1 to n
  */
 static void
-ET_Displayed_File_List_Number (void)
+et_displayed_file_list_renumber (GList *displayed_list)
 {
     GList *l = NULL;
     guint i = 1;
 
-    for (l = g_list_first (ETCore->ETFileDisplayedList); l != NULL;
-         l = g_list_next (l))
+    for (l = g_list_first (displayed_list); l != NULL; l = g_list_next (l))
     {
         ((ET_File *)l->data)->IndexKey = i++;
     }
@@ -755,7 +757,7 @@ ET_Displayed_File_List_Number (void)
 /*
  * Delete the corresponding file and free the allocated data. Return TRUE if deleted.
  */
-gboolean
+void
 ET_Remove_File_From_File_List (ET_File *ETFile)
 {
     GList *ETFileList = NULL;          // Item containing the ETFile to delete... (in ETCore->ETFileList)
@@ -806,11 +808,11 @@ ET_Remove_File_From_File_List (ET_File *ETFile)
     if (ETFileDisplayedList)
         g_list_free(ETFileDisplayedList);
 
-    // Recalculate length of ETFileDisplayedList list
-    ET_Displayed_File_List_Get_Length();
+    /* Recalculate length of ETFileDisplayedList list. */
+    ETCore->ETFileDisplayedList_Length = et_displayed_file_list_length (ETCore->ETFileDisplayedList);
 
-    // To number the ETFile in the list
-    ET_Displayed_File_List_Number();
+    /* To number the ETFile in the list. */
+    et_displayed_file_list_renumber (ETCore->ETFileDisplayedList);
 
     // Displaying...
     if (ETCore->ETFileDisplayedList)
@@ -830,8 +832,6 @@ ET_Remove_File_From_File_List (ET_File *ETFile)
         et_application_window_tag_area_clear (ET_APPLICATION_WINDOW (MainWindow));
         et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
     }
-
-    return TRUE;
 }
 
 /**************************
@@ -839,17 +839,6 @@ ET_Remove_File_From_File_List (ET_File *ETFile)
  **************************/
 
 /*
- * Sort the 'ETFileDisplayedList' following the 'Sorting_Type'
- * Note : Add also new sorting in 'Browser_List_Sort_Func'
- */
-void
-ET_Sort_Displayed_File_List (EtSortMode Sorting_Type)
-{
-    ETCore->ETFileDisplayedList = ET_Sort_File_List(ETCore->ETFileDisplayedList,Sorting_Type);
-}
-
-
-/*
  * Set appropriate sort order for the given column_id
  */
 static void
@@ -1145,15 +1134,14 @@ ET_Displayed_File_List_By_Etfile (const ET_File *ETFile)
  * Load the list of displayed files (calculate length, size, ...)
  * It contains part (filtrated : view by artists and albums) or full ETCore->ETFileList list
  */
-gboolean
-ET_Set_Displayed_File_List (GList *ETFileList)
+void
+et_displayed_file_list_set (GList *ETFileList)
 {
     GList *l = NULL;
 
     ETCore->ETFileDisplayedList = g_list_first(ETFileList);
 
-    //ETCore->ETFileDisplayedListPtr = ETCore->ETFileDisplayedList;
-    ETCore->ETFileDisplayedList_Length = ET_Displayed_File_List_Get_Length();
+    ETCore->ETFileDisplayedList_Length = et_displayed_file_list_length (ETCore->ETFileDisplayedList);
     ETCore->ETFileDisplayedList_TotalSize     = 0;
     ETCore->ETFileDisplayedList_TotalDuration = 0;
 
@@ -1165,13 +1153,12 @@ ET_Set_Displayed_File_List (GList *ETFileList)
     }
 
     /* Sort the file list. */
-    ET_Sort_Displayed_File_List (g_settings_get_enum (MainSettings,
-                                 "sort-mode"));
-
-    // Should renums ETCore->ETFileDisplayedList only!
-    ET_Displayed_File_List_Number();
+    ET_Sort_File_List (ETCore->ETFileDisplayedList,
+                       g_settings_get_enum (MainSettings,
+                                            "sort-mode"));
 
-    return TRUE;
+    /* Should renums ETCore->ETFileDisplayedList only! */
+    et_displayed_file_list_renumber (ETCore->ETFileDisplayedList);
 }
 
 /*
@@ -1179,26 +1166,32 @@ ET_Set_Displayed_File_List (GList *ETFileList)
  * (for ex: "/mp3/old_path/file.mp3" to "/mp3/new_path/file.mp3"
  */
 void
-ET_Update_Directory_Name_Into_File_List (const gchar *last_path,
-                                         const gchar *new_path)
+et_file_list_update_directory_name (GList *file_list,
+                                    const gchar *old_path,
+                                    const gchar *new_path)
 {
     GList *filelist;
     ET_File *file;
     GList *filenamelist;
     gchar *filename;
-    gchar *last_path_tmp;
+    gchar *old_path_tmp;
 
-    if (!ETCore->ETFileList || !last_path || !new_path ||
-        strlen(last_path) < 1 || strlen(new_path) < 1 )
-        return;
+    g_return_if_fail (file_list != NULL);
+    g_return_if_fail (old_path != NULL && *old_path != '\0');
+    g_return_if_fail (new_path != NULL && *new_path != '\0');
 
-    // Add '/' to end of path to avoid ambiguity between a directory and a filename...
-    if (last_path[strlen(last_path)-1]==G_DIR_SEPARATOR)
-        last_path_tmp = g_strdup(last_path);
+    /* Add '/' to end of path to avoid ambiguity between a directory and a
+     * filename... */
+    if (old_path[strlen (old_path) - 1] == G_DIR_SEPARATOR)
+    {
+        old_path_tmp = g_strdup (old_path);
+    }
     else
-        last_path_tmp = g_strconcat(last_path,G_DIR_SEPARATOR_S,NULL);
+    {
+        old_path_tmp = g_strconcat (old_path, G_DIR_SEPARATOR_S, NULL);
+    }
 
-    for (filelist = g_list_first (ETCore->ETFileList); filelist != NULL;
+    for (filelist = g_list_first (file_list); filelist != NULL;
          filelist = g_list_next (filelist))
     {
         if ((file = filelist->data))
@@ -1210,32 +1203,33 @@ ET_Update_Directory_Name_Into_File_List (const gchar *last_path,
 
                 if ( FileName && (filename=FileName->value) )
                 {
-                    // Replace path of filename
-                    if ( strncmp(filename,last_path_tmp,strlen(last_path_tmp))==0 )
+                    /* Replace path of filename. */
+                    if (strncmp (filename, old_path_tmp, strlen (old_path_tmp))
+                        == 0)
                     {
                         gchar *filename_tmp;
 
                         // Create the new filename
-                        filename_tmp = g_strconcat(new_path,
-                                                   (new_path[strlen(new_path)-1]==G_DIR_SEPARATOR) ? "" : 
G_DIR_SEPARATOR_S,
-                                                   &filename[strlen(last_path_tmp)],NULL);
+                        filename_tmp = g_strconcat (new_path,
+                                                    (new_path[strlen (new_path) - 1] == G_DIR_SEPARATOR) ? 
"" : G_DIR_SEPARATOR_S,
+                                                    &filename[strlen (old_path_tmp)],NULL);
 
                         /* Replace the filename (in file system encoding). */
-                        g_free(FileName->value);
+                        g_free (FileName->value);
                         FileName->value = filename_tmp;
                         /* Replace the filename (in file system encoding). */
-                        g_free(FileName->value_utf8);
-                        FileName->value_utf8 = filename_to_display(FileName->value);
-                        // Recalculate the collate key
-                        g_free(FileName->value_ck);
-                        FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
+                        g_free (FileName->value_utf8);
+                        FileName->value_utf8 = filename_to_display (FileName->value);
+                        /* Recalculate the collate key. */
+                        g_free (FileName->value_ck);
+                        FileName->value_ck = g_utf8_collate_key_for_filename (FileName->value_utf8, -1);
                     }
                 }
              }
         }
     }
 
-    g_free(last_path_tmp);
+    g_free (old_path_tmp);
 }
 
 /*
@@ -1248,8 +1242,8 @@ ET_Undo_History_File_Data (void)
     ET_File *ETFile;
     const ET_History_File *ETHistoryFile;
 
-    g_return_val_if_fail (ETCore->ETHistoryFileList != NULL ||
-                          ET_History_File_List_Has_Undo_Data (), NULL);
+    g_return_val_if_fail (ETCore->ETHistoryFileList != NULL, NULL);
+    g_return_val_if_fail (et_history_list_has_undo (ETCore->ETHistoryFileList), NULL);
 
     ETHistoryFile = (ET_History_File *)ETCore->ETHistoryFileList->data;
     ETFile        = (ET_File *)ETHistoryFile->ETFile;
@@ -1262,15 +1256,15 @@ ET_Undo_History_File_Data (void)
 }
 
 /*
- * Returns TRUE if undo file list contains undo data
+ * et_history_list_has_undo:
+ * @history_list: the end of a history list
+ *
+ * Returns: %TRUE if undo file list contains undo data, %FALSE otherwise
  */
 gboolean
-ET_History_File_List_Has_Undo_Data (void)
+et_history_list_has_undo (GList *history_list)
 {
-    if (ETCore->ETHistoryFileList && ETCore->ETHistoryFileList->prev)
-        return TRUE;
-    else
-        return FALSE;
+    return history_list && history_list->prev;
 }
 
 
@@ -1283,7 +1277,11 @@ ET_Redo_History_File_Data (void)
     ET_File *ETFile;
     ET_History_File *ETHistoryFile;
 
-    if (!ETCore->ETHistoryFileList || !ET_History_File_List_Has_Redo_Data()) return NULL;
+    if (!ETCore->ETHistoryFileList
+        || !et_history_list_has_redo (ETCore->ETHistoryFileList))
+    {
+        return NULL;
+    }
 
     ETHistoryFile = (ET_History_File *)ETCore->ETHistoryFileList->next->data;
     ETFile        = (ET_File *)ETHistoryFile->ETFile;
@@ -1295,25 +1293,27 @@ ET_Redo_History_File_Data (void)
     return ETFile;
 }
 
-
 /*
- * Returns TRUE if undo file list contains redo data
+ * et_history_list_has_redo:
+ * @history_list: the end of a history list
+ *
+ * Returns: %TRUE if undo file list contains redo data, %FALSE otherwise
  */
-gboolean ET_History_File_List_Has_Redo_Data (void)
+gboolean
+et_history_list_has_redo (GList *history_list)
 {
-    if (ETCore->ETHistoryFileList && ETCore->ETHistoryFileList->next)
-        return TRUE;
-    else
-        return FALSE;
+    return history_list && history_list->next;
 }
 
 /*
-* - * Add a ETFile item to the main undo list of files
-*   - */
-gboolean
-ET_Add_File_To_History_List (ET_File *ETFile)
+ * Add a ETFile item to the main undo list of files
+ */
+GList *
+et_history_list_add (GList *history_list,
+                     ET_File *ETFile)
 {
     ET_History_File *ETHistoryFile;
+    GList *result;
 
     g_return_val_if_fail (ETFile != NULL, FALSE);
 
@@ -1321,17 +1321,22 @@ ET_Add_File_To_History_List (ET_File *ETFile)
     ETHistoryFile->ETFile = ETFile;
 
     /* The undo list must contains one item before the 'first undo' data */
-    if (!ETCore->ETHistoryFileList)
+    if (!history_list)
     {
-        ETCore->ETHistoryFileList = g_list_append (ETCore->ETHistoryFileList,
-                                                   g_slice_new0 (ET_History_File));
+        result = g_list_append (NULL,
+                                g_slice_new0 (ET_History_File));
+    }
+    else
+    {
+        result = history_list;
     }
 
     /* Add the item to the list (cut end of list from the current element) */
-    ETCore->ETHistoryFileList = g_list_append(ETCore->ETHistoryFileList,ETHistoryFile);
-    ETCore->ETHistoryFileList = g_list_last(ETCore->ETHistoryFileList);
+    result = g_list_append (result, ETHistoryFile);
+    /* TODO: Investigate whether this is sensible. */
+    result = g_list_last (result);
 
-    return TRUE;
+    return result;
 }
 
 /*
@@ -1370,7 +1375,8 @@ et_file_list_check_all_saved (GList *etfilelist)
  * Parameter "path" should be in UTF-8
  */
 guint
-ET_Get_Number_Of_Files_In_Directory (const gchar *path_utf8)
+et_file_list_get_n_files_in_path (GList *file_list,
+                                  const gchar *path_utf8)
 {
     gchar *path_key;
     GList *l;
@@ -1380,7 +1386,7 @@ ET_Get_Number_Of_Files_In_Directory (const gchar *path_utf8)
 
     path_key = g_utf8_collate_key (path_utf8, -1);
 
-    for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
+    for (l = g_list_first (file_list); l != NULL; l = g_list_next (l))
     {
         ET_File *ETFile = (ET_File *)l->data;
         const gchar *cur_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8;
diff --git a/src/file_list.h b/src/file_list.h
index 49c199b..6630644 100644
--- a/src/file_list.h
+++ b/src/file_list.h
@@ -27,36 +27,34 @@ G_BEGIN_DECLS
 #include "file_tag.h"
 #include "setting.h"
 
-GList * ET_Add_File_To_File_List (gchar *filename);
-gboolean ET_Remove_File_From_File_List (ET_File *ETFile);
+GList * et_file_list_add (GList *file_list, gchar *filename);
+void ET_Remove_File_From_File_List (ET_File *ETFile);
+gboolean et_file_list_check_all_saved (GList *etfilelist);
+void et_file_list_update_directory_name (GList *file_list, const gchar *old_path, const gchar *new_path);
+guint et_file_list_get_n_files_in_path (GList *file_list, const gchar *path_utf8);
 void et_file_list_free (GList *file_list);
 
 GList * et_artist_album_list_new_from_file_list (GList *file_list);
 void et_artist_album_file_list_free (GList *file_list);
 
-gboolean et_file_list_check_all_saved (GList *etfilelist);
-
 GList * ET_Displayed_File_List_First (void);
 GList * ET_Displayed_File_List_Previous (void);
 GList * ET_Displayed_File_List_Next (void);
 GList * ET_Displayed_File_List_Last (void);
 GList * ET_Displayed_File_List_By_Etfile (const ET_File *ETFile);
 
-gboolean ET_Set_Displayed_File_List (GList *ETFileList);
+void et_displayed_file_list_set (GList *ETFileList);
 void et_displayed_file_list_free (GList *file_list);
 
+GList * et_history_list_add (GList *history_list, ET_File *ETFile);
 gboolean ET_Add_File_To_History_List (ET_File *ETFile);
 ET_File * ET_Undo_History_File_Data (void);
 ET_File * ET_Redo_History_File_Data (void);
-gboolean ET_History_File_List_Has_Undo_Data (void);
-gboolean ET_History_File_List_Has_Redo_Data (void);
+gboolean et_history_list_has_undo (GList *history_list);
+gboolean et_history_list_has_redo (GList *history_list);
 void et_history_file_list_free (GList *file_list);
 
-void ET_Update_Directory_Name_Into_File_List (const gchar *last_path, const gchar *new_path);
-guint ET_Get_Number_Of_Files_In_Directory (const gchar *path_utf8);
-
 GList *ET_Sort_File_List (GList *ETFileList, EtSortMode Sorting_Type);
-void ET_Sort_Displayed_File_List (EtSortMode Sorting_Type);
 
 G_END_DECLS
 
diff --git a/src/tag_area.c b/src/tag_area.c
index ad62b03..9fcd456 100644
--- a/src/tag_area.c
+++ b/src/tag_area.c
@@ -433,7 +433,7 @@ on_apply_to_selection (GObject *object,
             filename_utf8 = ((File_Name *)etfile->FileNameNew->data)->value_utf8;
             path_utf8     = g_path_get_dirname(filename_utf8);
 
-            string_to_set = et_track_number_to_string (ET_Get_Number_Of_Files_In_Directory (path_utf8));
+            string_to_set = et_track_number_to_string (et_file_list_get_n_files_in_path (ETCore->ETFileList, 
path_utf8));
 
             g_free(path_utf8);
             if (!string_to_set1)