summaryrefslogtreecommitdiff
path: root/libnautilus-private
diff options
context:
space:
mode:
authorDarin Adler <darin@src.gnome.org>2001-05-17 22:28:41 +0000
committerDarin Adler <darin@src.gnome.org>2001-05-17 22:28:41 +0000
commit57db5dd3c9e66922064e600a65709b0b05a5eceb (patch)
tree7eb6c976aba313e5a9ac6f1d782bb916867d040a /libnautilus-private
parent30ae0b243687bdc1c08898863c71bb854378fc04 (diff)
downloadnautilus-57db5dd3c9e66922064e600a65709b0b05a5eceb.tar.gz
Yoann and I did some more debugging and analysis and we stumbled
over a bug that was responsible for some big slowdowns. * libnautilus-private/nautilus-directory-async.c: (activation_uri_start): Fixed bug that was causing activation URI reads to work strangely. * src/file-manager/nautilus-directory-view-ui.xml: * src/file-manager/fm-directory-view.c: (delete_callback), (bonobo_control_activate_callback), (fm_directory_view_destroy): * src/nautilus-shell-ui.xml: * src/nautilus-window.c: (nautilus_window_initialize_class), (nautilus_window_realize): Rip out keybinding hack and use Bonobo's (undocumented as far as I can tell) keybinding machinery instead. * libnautilus-private/nautilus-metafile.c: (schedule_next_read): Use (void), not ().
Diffstat (limited to 'libnautilus-private')
-rw-r--r--libnautilus-private/nautilus-directory-async.c4
-rw-r--r--libnautilus-private/nautilus-metafile.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 8e13cfe75..7d473845a 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -2820,7 +2820,9 @@ activation_uri_start (NautilusDirectory *directory)
if (file != NULL) {
g_assert (NAUTILUS_IS_FILE (file));
g_assert (file->details->directory == directory);
- if (is_needy (file, lacks_info, wants_info)) {
+ if (is_needy (file,
+ lacks_activation_uri,
+ wants_activation_uri)) {
return;
}
}
diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c
index 1df4b2f2f..bd2f0d324 100644
--- a/libnautilus-private/nautilus-metafile.c
+++ b/libnautilus-private/nautilus-metafile.c
@@ -380,7 +380,7 @@ GList *pending_reads;
#endif
static void
-schedule_next_read ()
+schedule_next_read (void)
{
const int kMaxAsyncReads = 10;