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
This commit is contained in:
Bradford Hovinen 2001-06-20 17:21:33 +00:00 committed by Bradford Hovinen (Gdict maintainer)
parent efc06f6cc7
commit c39d6dff02
4 changed files with 36 additions and 16 deletions

View file

@ -237,10 +237,10 @@ archive_load (gboolean is_global)
return GTK_OBJECT (user_archive);
if (is_global)
prefix = CONFIGDIR "/ximian-config";
prefix = "/var/ximian-setup-tools";
else
prefix = g_concat_dir_and_file (g_get_home_dir (),
".gnome/ximian-config");
".gnome/ximian-setup-tools");
object = gtk_object_new (archive_get_type (),
"prefix", prefix,
@ -565,11 +565,11 @@ archive_set_current_location_id (Archive *archive, const gchar *locid)
if (archive->is_global)
gnome_config_set_string
("/ximian-config/config/current/global-location",
("/ximian-setup-tools/config/current/global-location",
archive->current_location_id);
else
gnome_config_set_string
("/ximian-config/config/current/location",
("/ximian-setup-tools/config/current/location",
archive->current_location_id);
gnome_config_sync ();
@ -597,11 +597,11 @@ archive_get_current_location_id (Archive *archive)
if (archive->is_global)
archive->current_location_id =
gnome_config_get_string_with_default
("/ximian-config/config/current/global-location=default", &def);
("/ximian-setup-tools/config/current/global-location=default", &def);
else
archive->current_location_id =
gnome_config_get_string_with_default
("/ximian-config/config/current/location=default", &def);
("/ximian-setup-tools/config/current/location=default", &def);
/* Create default location if it does not exist */
if (def && archive_get_location