[easytag/wip/core-refactoring: 17/24] Refactor function to check if all files are saved



commit 4d2e91f89457275b7527209605644d1074ecc318
Author: David King <amigadave amigadave com>
Date:   Mon Jan 5 21:27:34 2015 +0000

    Refactor function to check if all files are saved
    
    Accept the file list as a parameter.

 src/application_window.c |    2 +-
 src/browser.c            |    2 +-
 src/file_list.c          |   26 ++++++++++++++++----------
 src/file_list.h          |    2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/src/application_window.c b/src/application_window.c
index ef44a23..5fae2f4 100644
--- a/src/application_window.c
+++ b/src/application_window.c
@@ -2674,7 +2674,7 @@ et_application_window_quit (EtApplicationWindow *self)
 
     /* Check if all files have been saved before exit */
     if (g_settings_get_boolean (MainSettings, "confirm-when-unsaved-files")
-        && ET_Check_If_All_Files_Are_Saved () != TRUE)
+        && et_file_list_check_all_saved (ETCore->ETFileList) != TRUE)
     {
         /* Some files haven't been saved */
         msgbox = gtk_message_dialog_new (GTK_WINDOW (self),
diff --git a/src/browser.c b/src/browser.c
index bb86d73..26d3e40 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -852,7 +852,7 @@ Browser_Tree_Node_Selected (EtBrowser *self, GtkTreeSelection *selection)
 
     /* Check if all files have been saved before changing the directory */
     if (g_settings_get_boolean (MainSettings, "confirm-when-unsaved-files")
-        && ET_Check_If_All_Files_Are_Saved () != TRUE)
+        && et_file_list_check_all_saved (ETCore->ETFileList) != TRUE)
     {
         GtkWidget *msgdialog;
         gint response;
diff --git a/src/file_list.c b/src/file_list.c
index 1b0b092..0c4b946 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -1390,28 +1390,34 @@ ET_Add_File_To_History_List (ET_File *ETFile)
 
     return TRUE;
 }
+
 /*
- * Ckecks if some files, in the list, had been changed but not saved.
- * Returns TRUE if all files have been saved.
- * Returns FALSE if some changes haven't been saved.
+ * et_file_list_check_all_saved:
+ * @etfilelist: (element-type ET_File) (allow-none): a list of files
+ *
+ * Checks if some files, in the list, have been changed but not saved.
+ *
+ * Returns: %TRUE if all files have been saved, %FALSE otherwise
  */
 gboolean
-ET_Check_If_All_Files_Are_Saved (void)
+et_file_list_check_all_saved (GList *etfilelist)
 {
-    /* Check if some files haven't been saved, if didn't nochange=0 */
-    if (!ETCore->ETFileList)
+    if (!etfilelist)
     {
         return TRUE;
-    }else
+    }
+    else
     {
         GList *l;
 
-        for (l = g_list_first (ETCore->ETFileList); l != NULL;
-             l = g_list_next (l))
+        for (l = g_list_first (etfilelist); l != NULL; l = g_list_next (l))
         {
-            if (ET_Check_If_File_Is_Saved ((ET_File *)l->data) == FALSE)
+            if (!ET_Check_If_File_Is_Saved ((ET_File *)l->data))
+            {
                 return FALSE;
+            }
         }
+
         return TRUE;
     }
 }
diff --git a/src/file_list.h b/src/file_list.h
index 7b05b42..5ec7cbc 100644
--- a/src/file_list.h
+++ b/src/file_list.h
@@ -34,7 +34,7 @@ gboolean ET_Free_File_List (void);
 gboolean ET_Create_Artist_Album_File_List (void);
 gboolean ET_Free_Artist_Album_File_List (void);
 
-gboolean ET_Check_If_All_Files_Are_Saved (void);
+gboolean et_file_list_check_all_saved (GList *etfilelist);
 
 GList * ET_Displayed_File_List_First (void);
 GList * ET_Displayed_File_List_Previous (void);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]