3 files changed, 1 insertions, 30 deletions
diff --git a/libcaja-private/caja-directory-async.c b/libcaja-private/caja-directory-async.c
index 17e16598..e1a44353 100644
--- a/libcaja-private/caja-directory-async.c
+++ b/libcaja-private/caja-directory-async.c
@@ -2324,8 +2324,7 @@ more_files_callback (GObject *source_object,
         g_object_unref (info);
     }
 
-    if (caja_directory_file_list_length_reached (directory) ||
-            files == NULL)
+    if (files == NULL)
     {
         directory_load_done (directory, error);
         directory_load_state_free (state);
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c
index faa6a22c..6479b38a 100644
--- a/libcaja-private/caja-directory.c
+++ b/libcaja-private/caja-directory.c
@@ -718,33 +718,6 @@ caja_directory_remove_file (CajaDirectory *directory, CajaFile *file)
     }
 }
 
-#define CAJA_DIRECTORY_FILE_LIST_DEFAULT_LIMIT 4000
-
-gboolean
-caja_directory_file_list_length_reached (CajaDirectory *directory)
-{
-    static gboolean inited = FALSE;
-    static int directory_limit = 0;
-
-    if (!inited)
-    {
-        eel_preferences_add_auto_integer
-        ("/apps/caja/preferences/directory_limit",
-         &directory_limit);
-        inited = TRUE;
-    }
-    if (directory_limit < 0)    /* unlimited */
-    {
-        return FALSE;
-    }
-    if (directory_limit == 0)   /* dead mateconfd */
-    {
-        directory_limit = CAJA_DIRECTORY_FILE_LIST_DEFAULT_LIMIT;
-    }
-
-    return directory->details->confirmed_file_count >= directory_limit;
-}
-
 GList *
 caja_directory_begin_file_name_change (CajaDirectory *directory,
                                        CajaFile *file)
diff --git a/libcaja-private/caja-directory.h b/libcaja-private/caja-directory.h
index 7dfff85b..8136d08e 100644
--- a/libcaja-private/caja-directory.h
+++ b/libcaja-private/caja-directory.h
@@ -222,7 +222,6 @@ gboolean           caja_directory_is_in_trash              (CajaDirectory
  * Only valid if directory is monitored. Used by the Trash monitor.
  */
 gboolean           caja_directory_is_not_empty             (CajaDirectory         *directory);
-gboolean           caja_directory_file_list_length_reached (CajaDirectory         *directory);
 
 /* Convenience functions for dealing with a list of CajaDirectory objects that each have a ref.
  * These are just convenient names for functions that work on lists of GtkObject *.