diff options
| author | Bradford Hovinen <hovinen@ximian.com> | 2001-07-30 14:25:57 +0000 |
|---|---|---|
| committer | Bradford Hovinen (Gdict maintainer) <hovinen@src.gnome.org> | 2001-07-30 14:25:57 +0000 |
| commit | aed49db337958200ddf659ff1ca72e2092347be6 (patch) | |
| tree | 62f9413889c6e1a67db223ddfe293b5c950cba37 /archiver | |
| parent | bd3a67e6b680a9535c13bfb511b1fe221a77263b (diff) | |
| download | gnome-control-center-aed49db337958200ddf659ff1ca72e2092347be6.tar.gz | |
Always retrieve the location id from gnome_config
2001-07-30 Bradford Hovinen <hovinen@ximian.com>
* archive.c (archive_get_current_location_id): Always retrieve
the location id from gnome_config
Diffstat (limited to 'archiver')
| -rw-r--r-- | archiver/ChangeLog | 2 | ||||
| -rw-r--r-- | archiver/archive.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/archiver/ChangeLog b/archiver/ChangeLog index 8ac48e791..12f8ac0d5 100644 --- a/archiver/ChangeLog +++ b/archiver/ChangeLog @@ -3,6 +3,8 @@ * archive.c (archive_set_current_location_id): Use capplet-archive/config/current/location for current location to avoid conflicting with control-center + (archive_get_current_location_id): Always retrieve the location id + from gnome_config * config-log.c (socket_data_cb): Close the socket if we couldn't load the log entry diff --git a/archiver/archive.c b/archiver/archive.c index f1e68edb3..dd3220eea 100644 --- a/archiver/archive.c +++ b/archiver/archive.c @@ -515,7 +515,9 @@ 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 @@ -540,7 +542,9 @@ archive_get_current_location_id (Archive *archive) return NULL; } } +#if 0 } +#endif return archive->current_location_id; } |