Patch for #86165



Here is a "this-can't-be-this-easy" patch for #86165 and possibly #87280
as well.

When I remove the assertions, Nautilus seems to take a little while to
respond after I move the directory (GUI doesn't repaint, etc.).  Then it
pops up a "File not found" error dialog, which is the right thing.

Is this the right fix?

  Federico

Index: nautilus-directory-async.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-directory-async.c,v
retrieving revision 1.185
diff -u -r1.185 nautilus-directory-async.c
--- nautilus-directory-async.c	10 May 2002 18:49:04 -0000	1.185
+++ nautilus-directory-async.c	5 Jul 2002 22:35:04 -0000
@@ -2117,7 +2117,9 @@
 		file = directory->details->count_file;
 		if (file != NULL) {
 			g_assert (NAUTILUS_IS_FILE (file));
+#if 0
 			g_assert (file->details->directory == directory);
+#endif
 			if (is_needy (file,
 				      should_get_directory_count_now,
 				      wants_directory_count)) {
@@ -2296,7 +2298,9 @@
 		file = directory->details->deep_count_file;
 		if (file != NULL) {
 			g_assert (NAUTILUS_IS_FILE (file));
+#if 0
 			g_assert (file->details->directory == directory);
+#endif
 			if (is_needy (file,
 				      lacks_deep_count,
 				      wants_deep_count)) {
@@ -2444,7 +2448,9 @@
 		file = directory->details->mime_list_file;
 		if (file != NULL) {
 			g_assert (NAUTILUS_IS_FILE (file));
+#if 0
 			g_assert (file->details->directory == directory);
+#endif
 			if (is_needy (file,
 				      should_get_mime_list,
 				      wants_mime_list)) {
@@ -2574,7 +2580,9 @@
 		file = directory->details->top_left_read_state->file;
 		if (file != NULL) {
 			g_assert (NAUTILUS_IS_FILE (file));
+#if 0
 			g_assert (file->details->directory == directory);
+#endif
 			if (is_needy (file,
 				      lacks_top_left,
 				      wants_top_left)) {
@@ -2697,7 +2705,9 @@
 		file = directory->details->get_info_file;
 		if (file != NULL) {
 			g_assert (NAUTILUS_IS_FILE (file));
+#if 0
 			g_assert (file->details->directory == directory);
+#endif
 			if (is_needy (file, lacks_info, wants_info)) {
 				return;
 			}
@@ -2898,7 +2908,9 @@
 
 		if (file != NULL) {
 			g_assert (NAUTILUS_IS_FILE (file));
+#if 0
 			g_assert (file->details->directory == directory);
+#endif
 			if (is_needy (file,
 				      lacks_link_info,
 				      wants_link_info)) {


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