applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Close the socket if we couldn't load the log entry (config_log_destroy):

Browse source 
2001-07-30  Bradford Hovinen  <hovinen@ximian.com>

	* config-log.c (socket_data_cb): Close the socket if we couldn't
	load the log entry
	(config_log_destroy):
	(config_log_open): Disable socket sync system
This commit is contained in:
Bradford Hovinen 2001-07-30 13:23:57 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent ae7524ab3c
commit a817c23277
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
archiver/ChangeLog
View file

@ -1,3 +1,10 @@
2001-07-30 Bradford Hovinen <hovinen@ximian.com>
* config-log.c (socket_data_cb): Close the socket if we couldn't
load the log entry
(config_log_destroy):
(config_log_open): Disable socket sync system
2001-07-27 Bradford Hovinen <hovinen@ximian.com> 2001-07-27 Bradford Hovinen <hovinen@ximian.com>
* bonobo-config-archiver.c (bonobo_config_archiver_destroy): Don't * bonobo-config-archiver.c (bonobo_config_archiver_destroy): Don't

17
archiver/config-log.c
View file

@ -295,7 +295,9 @@ config_log_destroy (GtkObject *object)
config_log = CONFIG_LOG (object); config_log = CONFIG_LOG (object);
do_unload (config_log, !config_log->p->deleted); do_unload (config_log, !config_log->p->deleted);
#if 0
disconnect_socket (config_log); disconnect_socket (config_log);
#endif
GTK_OBJECT_CLASS (parent_class)->destroy (GTK_OBJECT (config_log)); GTK_OBJECT_CLASS (parent_class)->destroy (GTK_OBJECT (config_log));
} }
@ -332,7 +334,9 @@ config_log_open (Location *location)
config_log_reset_filenames (CONFIG_LOG (object)); config_log_reset_filenames (CONFIG_LOG (object));
do_load (CONFIG_LOG (object)); do_load (CONFIG_LOG (object));
#if 0
connect_socket (CONFIG_LOG (object)); connect_socket (CONFIG_LOG (object));
#endif
return object; return object;
} }
@ -530,7 +534,9 @@ config_log_write_entry (ConfigLog *config_log, gchar *backend_id,
g_list_prepend (config_log->p->log_data, entry); g_list_prepend (config_log->p->log_data, entry);
if (config_log->p->socket_owner) { if (config_log->p->socket_owner) {
#if 0
slave_broadcast_data (NULL, config_log); slave_broadcast_data (NULL, config_log);
#endif
dump_log (config_log); dump_log (config_log);
if (config_log->p->file_buffer) if (config_log->p->file_buffer)
io_buffer_destroy (config_log->p->file_buffer); io_buffer_destroy (config_log->p->file_buffer);
@ -917,7 +923,7 @@ do_unload (ConfigLog *config_log, gboolean write_log)
g_return_if_fail (config_log != NULL); g_return_if_fail (config_log != NULL);
g_return_if_fail (IS_CONFIG_LOG (config_log)); g_return_if_fail (IS_CONFIG_LOG (config_log));
if (write_log && config_log->p->socket_owner) dump_log (config_log); if (write_log) dump_log (config_log);
if (config_log->p->file_buffer) { if (config_log->p->file_buffer) {
io_buffer_destroy (config_log->p->file_buffer); io_buffer_destroy (config_log->p->file_buffer);
@ -1289,8 +1295,13 @@ socket_data_cb (GIOChannel *channel, GIOCondition condition,
return FALSE; return FALSE;
} }
else if (condition & G_IO_IN) { else if (condition & G_IO_IN) {
load_log_entry (config_log, TRUE, if (load_log_entry (config_log, TRUE,
config_log->p->socket_buffer, NULL); config_log->p->socket_buffer, NULL) == NULL) {
DEBUG_MSG ("Connection closing");
disconnect_socket (config_log);
connect_socket (config_log);
return FALSE;
}
} }
DEBUG_MSG ("Exit"); DEBUG_MSG ("Exit");