reviewed by: Darin Adler <darin@eazel.com>

	Fixed bug 5375 (reword the 4000-file limit so it doesn't
	mention the Nautilus Preview Release)

	* libnautilus-extensions/nautilus-directory.c:
	* libnautilus-extensions/nautilus-directory.h:
	Move the #define for the limit to a public place.

	* src/file-manager/fm-directory-view.c:
	(check_for_directory_hard_limit):
	Reword the dialog so it doesn't promise to go away
	soon. Also, use #define for the limit in case it
	changes, which is likely.

6 files changed, 43 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 835c5a9dc..a9497482e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2001-01-02  John Sullivan  <sullivan@eazel.com>
+
+	reviewed by: Darin Adler  <darin@eazel.com>
+
+	Fixed bug 5375 (reword the 4000-file limit so it doesn't
+	mention the Nautilus Preview Release)
+
+	* libnautilus-extensions/nautilus-directory.c:
+	* libnautilus-extensions/nautilus-directory.h:
+	Move the #define for the limit to a public place.
+	
+	* src/file-manager/fm-directory-view.c:
+	(check_for_directory_hard_limit):
+	Reword the dialog so it doesn't promise to go away
+	soon. Also, use #define for the limit in case it
+	changes, which is likely.
+
 2001-01-02  Ali Abdin  <aliabdin@aucegypt.edu>
 
         A minor attempt at deallocating things correctly before we exit (so
diff --git a/libnautilus-extensions/nautilus-directory.c b/libnautilus-extensions/nautilus-directory.c
index aeddeb230..8a687dbb6 100644
--- a/libnautilus-extensions/nautilus-directory.c
+++ b/libnautilus-extensions/nautilus-directory.c
@@ -62,9 +62,6 @@ static guint signals[LAST_SIGNAL];
          | GNOME_VFS_PERM_GROUP_ALL \
 	 | GNOME_VFS_PERM_OTHER_ALL)
 
-/* Hack for PR2 to prevent use of too many resources */
-#define NAUTILUS_DIRECTORY_FILE_LIST_HARD_LIMIT     4000
-
 static GHashTable *directories;
 
 static void               nautilus_directory_destroy          (GtkObject              *object);
diff --git a/libnautilus-extensions/nautilus-directory.h b/libnautilus-extensions/nautilus-directory.h
index 716244c70..ee260ca1c 100644
--- a/libnautilus-extensions/nautilus-directory.h
+++ b/libnautilus-extensions/nautilus-directory.h
@@ -60,6 +60,11 @@
 typedef struct NautilusFile NautilusFile;
 #endif
 
+/* FIXME bugzilla.eazel.com 5382:
+ * Increase or remove this limit? 
+ */
+#define NAUTILUS_DIRECTORY_FILE_LIST_HARD_LIMIT     4000
+
 typedef struct NautilusDirectoryDetails NautilusDirectoryDetails;
 
 typedef struct
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index aeddeb230..8a687dbb6 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -62,9 +62,6 @@ static guint signals[LAST_SIGNAL];
          | GNOME_VFS_PERM_GROUP_ALL \
 	 | GNOME_VFS_PERM_OTHER_ALL)
 
-/* Hack for PR2 to prevent use of too many resources */
-#define NAUTILUS_DIRECTORY_FILE_LIST_HARD_LIMIT     4000
-
 static GHashTable *directories;
 
 static void               nautilus_directory_destroy          (GtkObject              *object);
diff --git a/libnautilus-private/nautilus-directory.h b/libnautilus-private/nautilus-directory.h
index 716244c70..ee260ca1c 100644
--- a/libnautilus-private/nautilus-directory.h
+++ b/libnautilus-private/nautilus-directory.h
@@ -60,6 +60,11 @@
 typedef struct NautilusFile NautilusFile;
 #endif
 
+/* FIXME bugzilla.eazel.com 5382:
+ * Increase or remove this limit? 
+ */
+#define NAUTILUS_DIRECTORY_FILE_LIST_HARD_LIMIT     4000
+
 typedef struct NautilusDirectoryDetails NautilusDirectoryDetails;
 
 typedef struct
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 7b0a0cd37..4894f624a 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -1386,19 +1386,27 @@ static void
 check_for_directory_hard_limit (FMDirectoryView *view)
 {
 	NautilusDirectory *directory;
+	NautilusFile *file;
 	GnomeDialog *dialog;
+	char *directory_name;
+	char *message;
 
 	directory = view->details->model;
 	if (nautilus_directory_file_list_length_reached (directory)) {
-		/* FIXME bugzilla.eazel.com 5037: This says Preview Release explicitly. Must remove for real thing. */
-		dialog = nautilus_warning_dialog (_("We're sorry, but the folder you're viewing has more files than "
-						    "we're able to display. As a result, we are only able to show you the "
-						    "first 4000 files it contains."
-						    "\n"
-						    "This is a temporary limitation in this Preview Release of Nautilus, "
-						    "and will not be present in the final version."),
-						  _("Too many Files"),
+		file = nautilus_directory_get_corresponding_file (directory);
+		directory_name = nautilus_file_get_name (file);
+		nautilus_file_unref (file);
+		message = g_strdup_printf (_("The folder \"%s\" contains more files than "
+				             "Nautilus can handle. Only the first %d files "
+				             "will be displayed."), 
+				           directory_name, 
+				           NAUTILUS_DIRECTORY_FILE_LIST_HARD_LIMIT);
+		g_free (directory_name);
+
+		dialog = nautilus_warning_dialog (message,
+						  _("Too Many Files"),
 						  get_containing_window (view));
+		g_free (message);
 	}
 
 }