[nautilus] Remove remnants of old file-limit preference

[Alexander Larsson <alexl src gnome org>]

commit f202dab6902b28fdf1deaad7e4d259c50ef6b575
Author: Alexander Larsson <alexl redhat com>
Date:   Fri Jul 23 11:17:41 2010 +0200

    Remove remnants of old file-limit preference

 libnautilus-private/nautilus-directory-async.c |    9 ++--
 libnautilus-private/nautilus-directory.c       |   24 ------------
 libnautilus-private/nautilus-directory.h       |    1 -
 src/file-manager/fm-directory-view.c           |   49 +-----------------------
 src/file-manager/fm-directory-view.h           |    9 ----
 5 files changed, 5 insertions(+), 87 deletions(-)
---
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index dbee42e..a669439 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -2086,7 +2086,7 @@ more_files_callback (GObject *source_object,
 	}
 
 	directory = nautilus_directory_ref (state->directory);
-	
+
 	g_assert (directory->details->directory_load_in_progress != NULL);
 	g_assert (directory->details->directory_load_in_progress == state);
 
@@ -2100,8 +2100,7 @@ more_files_callback (GObject *source_object,
 		g_object_unref (info);
 	}
 
-	if (nautilus_directory_file_list_length_reached (directory) ||
-	    files == NULL) {
+	if (files == NULL) {
 		directory_load_done (directory, error);
 		directory_load_state_free (state);
 	} else {
@@ -2114,11 +2113,11 @@ more_files_callback (GObject *source_object,
 	}
 
 	nautilus_directory_unref (directory);
-	
+
 	if (error) {
 		g_error_free (error);
 	}
-	
+
 	g_list_free (files);
 }
 
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index ffe2ac4..5bc89c7 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -678,30 +678,6 @@ nautilus_directory_remove_file (NautilusDirectory *directory, NautilusFile *file
 	}
 }
 
-#define NAUTILUS_DIRECTORY_FILE_LIST_DEFAULT_LIMIT 4000
-
-gboolean
-nautilus_directory_file_list_length_reached (NautilusDirectory *directory)
-{
-	static gboolean inited = FALSE;
-	static int directory_limit = 0;
-
-	if (!inited) {
-		eel_preferences_add_auto_integer
-			("/apps/nautilus/preferences/directory_limit",
-			 &directory_limit);
-		inited = TRUE;
-	}
-	if (directory_limit < 0) {  /* unlimited */
-		return FALSE;
-	}
-	if (directory_limit == 0) { /* dead gconfd */
-		directory_limit = NAUTILUS_DIRECTORY_FILE_LIST_DEFAULT_LIMIT;
-	}
-
-	return directory->details->confirmed_file_count >= directory_limit;
-}
-
 GList *
 nautilus_directory_begin_file_name_change (NautilusDirectory *directory,
 					   NautilusFile *file)
diff --git a/libnautilus-private/nautilus-directory.h b/libnautilus-private/nautilus-directory.h
index 2b7bab7..65225a4 100644
--- a/libnautilus-private/nautilus-directory.h
+++ b/libnautilus-private/nautilus-directory.h
@@ -222,7 +222,6 @@ gboolean           nautilus_directory_is_in_trash              (NautilusDirector
  * Only valid if directory is monitored. Used by the Trash monitor.
  */
 gboolean           nautilus_directory_is_not_empty             (NautilusDirectory         *directory);
-gboolean           nautilus_directory_file_list_length_reached (NautilusDirectory         *directory);
 
 /* Convenience functions for dealing with a list of NautilusDirectory objects that each have a ref.
  * These are just convenient names for functions that work on lists of GtkObject *.
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 54c549c..c9af161 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -2365,51 +2365,6 @@ fm_directory_view_stop_loading (NautilusView *nautilus_view)
 	fm_directory_view_stop (FM_DIRECTORY_VIEW (nautilus_view));
 }
 
-static void
-fm_directory_view_file_limit_reached (FMDirectoryView *view)
-{
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-
-	EEL_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view,
-		 	       file_limit_reached, (view));
-}
-
-static void
-real_file_limit_reached (FMDirectoryView *view)
-{
-	NautilusFile *file;
-	GtkDialog *dialog;
-	char *directory_name;
-	char *message;
-
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-
-	file = fm_directory_view_get_directory_as_file (view);
-	directory_name = nautilus_file_get_display_name (file);
-
-	/* Note that the number of items actually displayed varies somewhat due
-	 * to the way files are collected in batches. So you can't assume that
-	 * no more than the constant limit are displayed.
-	 */
-	message = g_strdup_printf (_("The folder \"%s\" contains more files than "
-			             "Nautilus can handle."), 
-			           directory_name);
-	g_free (directory_name);
-
-	dialog = eel_show_warning_dialog (message,
-					  _("Some files will not be displayed."),
-					  fm_directory_view_get_containing_window (view));
-	g_free (message);
-}
-
-static void
-check_for_directory_hard_limit (FMDirectoryView *view)
-{
-	if (nautilus_directory_file_list_length_reached (view->details->model)) {
-		fm_directory_view_file_limit_reached (view);
-	}
-}
-
 static gboolean
 reveal_selection_idle_callback (gpointer data)
 {
@@ -2443,13 +2398,12 @@ done_loading (FMDirectoryView *view,
 
 		schedule_update_menus (view);
 		schedule_update_status (view);
-		check_for_directory_hard_limit (view);
 		reset_update_interval (view);
 
 		locations_selected = view->details->pending_locations_selected;
 		if (locations_selected != NULL && all_files_seen) {
 			view->details->pending_locations_selected = NULL;
-			
+
 			selection = file_list_from_location_list (locations_selected);
 
 			view->details->selection_change_is_due_to_shell = TRUE;
@@ -10735,7 +10689,6 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
 		              G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY);
 
 	klass->accepts_dragged_files = real_accepts_dragged_files;
-	klass->file_limit_reached = real_file_limit_reached;
 	klass->file_still_belongs = real_file_still_belongs;
 	klass->get_emblem_names_to_exclude = real_get_emblem_names_to_exclude;
 	klass->get_selected_icon_locations = real_get_selected_icon_locations;
diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h
index f8f0dd7..68754a9 100644
--- a/src/file-manager/fm-directory-view.h
+++ b/src/file-manager/fm-directory-view.h
@@ -245,15 +245,6 @@ struct FMDirectoryViewClass {
 	 */
 	char ** (* get_emblem_names_to_exclude)	(FMDirectoryView *view);
 
-	/* file_limit_reached is a function pointer that subclasses may
-	 * override to control what happens when a directory is loaded
-	 * that has more files than Nautilus can handle. The default
-	 * implmentation puts up a dialog box that is appropriate to
-	 * display when the user explicitly tried to visit a location that
-	 * they would think of as a normal directory.
-	 */
-	void (* file_limit_reached)		(FMDirectoryView *view);
-
 	/* supports_properties is a function pointer that subclasses may
 	 * override to control whether the "Show Properties" menu item
 	 * should be enabled for selected items. The default implementation