From d30dd82590de969a7bc6c3af5e7cb3a0b6dcf3ae Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Tue, 31 Jul 2001 17:19:46 +0000 Subject: [PATCH] Re-enable caching mechanism 2001-07-31 Bradford Hovinen * archive.c (archive_get_current_location_id): Re-enable caching mechanism --- archiver/ChangeLog | 3 +++ archiver/archive.c | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/archiver/ChangeLog b/archiver/ChangeLog index ac28641b5..7810c2985 100644 --- a/archiver/ChangeLog +++ b/archiver/ChangeLog @@ -1,5 +1,8 @@ 2001-07-31 Bradford Hovinen + * archive.c (archive_get_current_location_id): Re-enable caching + mechanism + * bonobo-config-archiver.c (pb_get_fn): Use location_get_config_log rather than config_log_open; don't destroy the log diff --git a/archiver/archive.c b/archiver/archive.c index dd3220eea..f1e68edb3 100644 --- a/archiver/archive.c +++ b/archiver/archive.c @@ -515,9 +515,7 @@ archive_get_current_location_id (Archive *archive) g_return_val_if_fail (archive != NULL, NULL); g_return_val_if_fail (IS_ARCHIVE (archive), NULL); -#if 0 if (archive->current_location_id == NULL) { -#endif if (archive->is_global) archive->current_location_id = gnome_config_get_string_with_default @@ -542,9 +540,7 @@ archive_get_current_location_id (Archive *archive) return NULL; } } -#if 0 } -#endif return archive->current_location_id; }