diff options
| author | Bradford Hovinen <hovinen@ximian.com> | 2001-06-20 17:58:45 +0000 |
|---|---|---|
| committer | Bradford Hovinen (Gdict maintainer) <hovinen@src.gnome.org> | 2001-06-20 17:58:45 +0000 |
| commit | 1f701fce3b779e113e4ec5676bef1dc15ffe5d1c (patch) | |
| tree | df7f8814f1a879096c778ba01a415c72172bee75 /archiver/config-log.c | |
| parent | 3f08be4e5779bca710451a514c94127277f728ca (diff) | |
| download | gnome-control-center-1f701fce3b779e113e4ec5676bef1dc15ffe5d1c.tar.gz | |
Dump the log after loading it from the slave (dump_log): Set first_old to
2001-06-20 Bradford Hovinen <hovinen@ximian.com>
* config-log.c (slave_data_cb): Dump the log after loading it from
the slave
(dump_log): Set first_old to the beginning of the list after the dump
(do_load): Don't call do_unload
(socket_data_cb): Check for hang up first
(do_load): Don't call reset_filenames
* archive.c, Makefile.am: Replace all instances of ximian-config
with ximian-setup-tools
* config-log.c (slave_new): Don't apprise slave of new data
(config_log_write_entry): Dump log after every write
Diffstat (limited to 'archiver/config-log.c')
| -rw-r--r-- | archiver/config-log.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/archiver/config-log.c b/archiver/config-log.c index 7b21c17b0..5bbca935d 100644 --- a/archiver/config-log.c +++ b/archiver/config-log.c @@ -331,6 +331,7 @@ config_log_open (Location *location) "location", location, NULL); + config_log_reset_filenames (CONFIG_LOG (object)); do_load (CONFIG_LOG (object)); connect_socket (CONFIG_LOG (object)); @@ -635,6 +636,7 @@ config_log_reload (ConfigLog *config_log) g_return_if_fail (IS_CONFIG_LOG (config_log)); do_unload (config_log, FALSE); + config_log_reset_filenames (config_log); do_load (config_log); } @@ -891,17 +893,13 @@ do_load (ConfigLog *config_log) g_return_val_if_fail (config_log->p->location != NULL, FALSE); g_return_val_if_fail (IS_LOCATION (config_log->p->location), FALSE); - config_log_reset_filenames (config_log); - fd = open (config_log->p->filename, O_RDONLY); if (fd != -1) config_log->p->file_buffer = io_buffer_new (g_io_channel_unix_new (fd), FALSE); - else { - g_warning ("Could not open config log: %s", g_strerror (errno)); + else config_log->p->file_buffer = NULL; - } return TRUE; } |