diff options
| -rw-r--r-- | ChangeLog | 26 | ||||
| -rwxr-xr-x | check-FIXME.pl | 2 | ||||
| -rwxr-xr-x | check-config-h.pl | 2 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-directory-async.c | 6 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-directory.c | 85 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-directory-async.c | 6 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-directory.c | 85 |
7 files changed, 25 insertions, 187 deletions
@@ -1,3 +1,20 @@ +2000-05-08 Darin Adler <darin@eazel.com> + + * check-FIXME.pl: + * check-config-h.pl: Added "." parameter to "find" so it works + with non-GNU versions of find. This was for Morten, who wanted + to run check-config-h.pl on Gnumeric. + + * libnautilus-extensions/nautilus-directory-async.c: + (start_getting_top_lefts): Turn embedded text back on. + + * libnautilus-extensions/nautilus-directory.c: + (nautilus_directory_get_metadata): Fixed a bug that was showing + up in "make check". + (nautilus_self_check_directory): Got rid of GNOME VFS tests, + since I moved the same tests into test-async-cancel in the + gnome-vfs module. + 2000-05-08 Ramiro Estrugo <ramiro@eazel.com> * libnautilus/nautilus-clipboard.c: @@ -8,12 +25,11 @@ trying to use a view that has already been trashed. Thanks to Carbamide <linuxfan@ionet.net> for finding the problem. - 2000-05-08 Ramiro Estrugo <ramiro@eazel.com> * configure.in, - HACKING: Remove libglade check and hacking blurb. We dont + * HACKING: Remove libglade check and hacking blurb. We don't use libglade no more, 2000-05-08 Andy Hertzfeld <andy@eazel.com> @@ -27,14 +43,14 @@ new image to serve as goback button in browser title bar * icons/Makefile.am: added new image to Makefile - + 2000-05-08 Gene Z. Ragan <gzr@eazel.com> * libnautilus-extensions/nautilus-icon-container.c: (key_press_event): Fixed bug introduced by Pavel's new super cool keyboard icon - selection feature. An icon in renaming mode no longer received - keyboard events. A check is now made to see if the icon container + selection feature. An icon in renaming mode no longer received + keyboard events. A check is now made to see if the icon container is in renaming mode before processing event for icon selection. 2000-05-08 Maciej Stachowiak <mjs@eazel.com> diff --git a/check-FIXME.pl b/check-FIXME.pl index e0606b253..e672a2caa 100755 --- a/check-FIXME.pl +++ b/check-FIXME.pl @@ -33,7 +33,7 @@ use strict; my %skip_files; if (!@ARGV) { - @ARGV = `find -name '*' -and ! \\( -name '*~' -or -name '#*' -or -name 'ChangeLog*' -or -name 'Entries' \\) -print`; + @ARGV = `find . -name '*' -and ! \\( -name '*~' -or -name '#*' -or -name 'ChangeLog*' -or -name 'Entries' \\) -print`; %skip_files = ( "./TODO" => 1, diff --git a/check-config-h.pl b/check-config-h.pl index 187d3480f..d83a59738 100755 --- a/check-config-h.pl +++ b/check-config-h.pl @@ -37,7 +37,7 @@ my $edit = 0; # default to all the files starting from the current directory if (!@ARGV) { - @ARGV = `find -name '*.c' -print`; + @ARGV = `find . -name '*.c' -print`; } # locate all of the target lines diff --git a/libnautilus-extensions/nautilus-directory-async.c b/libnautilus-extensions/nautilus-directory-async.c index 941456f45..f934ea9e9 100644 --- a/libnautilus-extensions/nautilus-directory-async.c +++ b/libnautilus-extensions/nautilus-directory-async.c @@ -1559,12 +1559,6 @@ start_getting_top_lefts (NautilusDirectory *directory) NautilusFile *file; char *uri; - /* FIXME bugzilla.eazel.com 830: The GNOME VFS bug that leaks - * file descriptors makes it impractical to do so much async. - * I/O, so we just don't do any of this work for now. - */ - return; /* Arrgh! */ - /* If there's already a read in progress, check to be sure * it's still wanted. */ diff --git a/libnautilus-extensions/nautilus-directory.c b/libnautilus-extensions/nautilus-directory.c index fedb2291d..6ba2deda7 100644 --- a/libnautilus-extensions/nautilus-directory.c +++ b/libnautilus-extensions/nautilus-directory.c @@ -500,7 +500,7 @@ nautilus_directory_get_metadata (NautilusDirectory *directory, { /* It's legal to call this on a NULL directory. */ if (directory == NULL) { - return NULL; + return g_strdup (default_metadata); } g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL); @@ -1265,9 +1265,6 @@ static int data_dummy; static guint file_count; static gboolean got_metadata_flag; static gboolean got_files_flag; -static gboolean file_open_flag; -static gboolean file_closed_flag; -GnomeVFSAsyncHandle *file_handle; static void get_files_callback (NautilusDirectory *directory, GList *files, gpointer callback_data) @@ -1299,30 +1296,6 @@ got_files_callback (NautilusDirectory *directory, GList *files, gpointer callbac got_files_flag = TRUE; } -static void -file_open_callback (GnomeVFSAsyncHandle *handle, - GnomeVFSResult result, - gpointer callback_data) -{ - g_assert (file_handle == handle); - g_assert (result == GNOME_VFS_OK); - g_assert (callback_data == &data_dummy); - - file_open_flag = TRUE; -} - -static void -file_close_callback (GnomeVFSAsyncHandle *handle, - GnomeVFSResult result, - gpointer callback_data) -{ - g_assert (file_handle == handle); - g_assert (result == GNOME_VFS_OK); - g_assert (callback_data == &data_dummy); - - file_closed_flag = TRUE; -} - /* Return the number of extant NautilusDirectories */ int nautilus_directory_number_outstanding (void) @@ -1330,67 +1303,11 @@ nautilus_directory_number_outstanding (void) return g_hash_table_size (directory_objects); } -static void -open_and_close_one (void) -{ - file_open_flag = FALSE; - gnome_vfs_async_open (&file_handle, - "file:///etc/passwd", - GNOME_VFS_OPEN_READ, - file_open_callback, - &data_dummy); - while (!file_open_flag) { - gtk_main_iteration (); - } - file_closed_flag = FALSE; - gnome_vfs_async_close (file_handle, - file_close_callback, - &data_dummy); - while (!file_closed_flag) { - gtk_main_iteration (); - } -} - void nautilus_self_check_directory (void) { NautilusDirectory *directory; GList *keys, *attributes; - int available_before, file_descriptors_consumed; - GnomeVFSHandle *file_handle; - - available_before = nautilus_get_available_file_descriptor_count (); - gnome_vfs_open (&file_handle, - "file:///etc/passwd", - GNOME_VFS_OPEN_READ); - gnome_vfs_close (file_handle); - file_descriptors_consumed = available_before - - nautilus_get_available_file_descriptor_count (); - NAUTILUS_CHECK_INTEGER_RESULT (file_descriptors_consumed, 0); - - /* GNOME VFS test here (wrong place for it, but...) */ - open_and_close_one (); - open_and_close_one (); - - available_before = nautilus_get_available_file_descriptor_count (); - open_and_close_one (); - file_descriptors_consumed = available_before - - nautilus_get_available_file_descriptor_count (); - NAUTILUS_CHECK_INTEGER_RESULT (file_descriptors_consumed, 0); - - available_before = nautilus_get_available_file_descriptor_count (); - open_and_close_one (); - file_descriptors_consumed = available_before - - nautilus_get_available_file_descriptor_count (); - NAUTILUS_CHECK_INTEGER_RESULT (file_descriptors_consumed, 0); - - available_before = nautilus_get_available_file_descriptor_count (); - open_and_close_one (); - file_descriptors_consumed = available_before - - nautilus_get_available_file_descriptor_count (); - NAUTILUS_CHECK_INTEGER_RESULT (file_descriptors_consumed, 0); - - /* END GNOME VFS test */ keys = g_list_prepend (NULL, "TEST"); diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index 941456f45..f934ea9e9 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -1559,12 +1559,6 @@ start_getting_top_lefts (NautilusDirectory *directory) NautilusFile *file; char *uri; - /* FIXME bugzilla.eazel.com 830: The GNOME VFS bug that leaks - * file descriptors makes it impractical to do so much async. - * I/O, so we just don't do any of this work for now. - */ - return; /* Arrgh! */ - /* If there's already a read in progress, check to be sure * it's still wanted. */ diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c index fedb2291d..6ba2deda7 100644 --- a/libnautilus-private/nautilus-directory.c +++ b/libnautilus-private/nautilus-directory.c @@ -500,7 +500,7 @@ nautilus_directory_get_metadata (NautilusDirectory *directory, { /* It's legal to call this on a NULL directory. */ if (directory == NULL) { - return NULL; + return g_strdup (default_metadata); } g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL); @@ -1265,9 +1265,6 @@ static int data_dummy; static guint file_count; static gboolean got_metadata_flag; static gboolean got_files_flag; -static gboolean file_open_flag; -static gboolean file_closed_flag; -GnomeVFSAsyncHandle *file_handle; static void get_files_callback (NautilusDirectory *directory, GList *files, gpointer callback_data) @@ -1299,30 +1296,6 @@ got_files_callback (NautilusDirectory *directory, GList *files, gpointer callbac got_files_flag = TRUE; } -static void -file_open_callback (GnomeVFSAsyncHandle *handle, - GnomeVFSResult result, - gpointer callback_data) -{ - g_assert (file_handle == handle); - g_assert (result == GNOME_VFS_OK); - g_assert (callback_data == &data_dummy); - - file_open_flag = TRUE; -} - -static void -file_close_callback (GnomeVFSAsyncHandle *handle, - GnomeVFSResult result, - gpointer callback_data) -{ - g_assert (file_handle == handle); - g_assert (result == GNOME_VFS_OK); - g_assert (callback_data == &data_dummy); - - file_closed_flag = TRUE; -} - /* Return the number of extant NautilusDirectories */ int nautilus_directory_number_outstanding (void) @@ -1330,67 +1303,11 @@ nautilus_directory_number_outstanding (void) return g_hash_table_size (directory_objects); } -static void -open_and_close_one (void) -{ - file_open_flag = FALSE; - gnome_vfs_async_open (&file_handle, - "file:///etc/passwd", - GNOME_VFS_OPEN_READ, - file_open_callback, - &data_dummy); - while (!file_open_flag) { - gtk_main_iteration (); - } - file_closed_flag = FALSE; - gnome_vfs_async_close (file_handle, - file_close_callback, - &data_dummy); - while (!file_closed_flag) { - gtk_main_iteration (); - } -} - void nautilus_self_check_directory (void) { NautilusDirectory *directory; GList *keys, *attributes; - int available_before, file_descriptors_consumed; - GnomeVFSHandle *file_handle; - - available_before = nautilus_get_available_file_descriptor_count (); - gnome_vfs_open (&file_handle, - "file:///etc/passwd", - GNOME_VFS_OPEN_READ); - gnome_vfs_close (file_handle); - file_descriptors_consumed = available_before - - nautilus_get_available_file_descriptor_count (); - NAUTILUS_CHECK_INTEGER_RESULT (file_descriptors_consumed, 0); - - /* GNOME VFS test here (wrong place for it, but...) */ - open_and_close_one (); - open_and_close_one (); - - available_before = nautilus_get_available_file_descriptor_count (); - open_and_close_one (); - file_descriptors_consumed = available_before - - nautilus_get_available_file_descriptor_count (); - NAUTILUS_CHECK_INTEGER_RESULT (file_descriptors_consumed, 0); - - available_before = nautilus_get_available_file_descriptor_count (); - open_and_close_one (); - file_descriptors_consumed = available_before - - nautilus_get_available_file_descriptor_count (); - NAUTILUS_CHECK_INTEGER_RESULT (file_descriptors_consumed, 0); - - available_before = nautilus_get_available_file_descriptor_count (); - open_and_close_one (); - file_descriptors_consumed = available_before - - nautilus_get_available_file_descriptor_count (); - NAUTILUS_CHECK_INTEGER_RESULT (file_descriptors_consumed, 0); - - /* END GNOME VFS test */ keys = g_list_prepend (NULL, "TEST"); |