Commit 9cec8944 authored by Per Cederqvist's avatar Per Cederqvist
Browse files

(do_sub_recpt): Send async-sub-recipient immediately before removing

	the recipient, so that we know where to send it.  As a side
	effect the type is now read from the proper misc-info group.
(send_async_deleted_text): Use #if 0 instead of comments to comment out code.
parent 9d858040
/*
* $Id: text.c,v 0.67 1999/05/24 09:34:41 ceder Exp $
* $Id: text.c,v 0.68 1999/05/30 09:05:40 ceder Exp $
* Copyright (C) 1991-1999 Lysator Academic Computer Association.
*
* This file is part of the LysKOM server.
......@@ -34,7 +34,7 @@
#endif
static const char *
rcsid = "$Id: text.c,v 0.67 1999/05/24 09:34:41 ceder Exp $";
rcsid = "$Id: text.c,v 0.68 1999/05/30 09:05:40 ceder Exp $";
#include "rcs.h"
USE(rcsid);
......@@ -645,6 +645,7 @@ do_sub_recpt (Text_no text_no,
Conference * conf_s ) /* May be NULL */
{
int i;
Info_type removed;
if ( text_s == NULL )
GET_T_STAT(text_s, text_no, FAILURE);
......@@ -669,13 +670,12 @@ do_sub_recpt (Text_no text_no,
mark_conference_as_changed (conf_no);
}
removed = text_s->misc_items[i].type;
send_async_sub_recipient(text_no, text_s, conf_no, removed);
do_delete_misc ( &text_s->no_of_misc, text_s->misc_items, i );
mark_text_as_changed (text_no);
send_async_sub_recipient(text_no,
text_s,
conf_no,
text_s->misc_items[ i ].type);
return OK;
}
break;
......@@ -690,13 +690,12 @@ do_sub_recpt (Text_no text_no,
mark_conference_as_changed( conf_no );
}
removed = text_s->misc_items[i].type;
send_async_sub_recipient(text_no, text_s, conf_no, removed);
do_delete_misc( &text_s->no_of_misc, text_s->misc_items, i );
mark_text_as_changed( text_no );
send_async_sub_recipient(text_no,
text_s,
conf_no,
text_s->misc_items[ i ].type);
return OK;
}
break;
......@@ -711,13 +710,12 @@ do_sub_recpt (Text_no text_no,
mark_conference_as_changed( conf_no );
}
removed = text_s->misc_items[i].type;
send_async_sub_recipient(text_no, text_s, conf_no, removed);
do_delete_misc( &text_s->no_of_misc, text_s->misc_items, i );
mark_text_as_changed( text_no );
send_async_sub_recipient(text_no,
text_s,
conf_no,
text_s->misc_items[ i ].type);
return OK;
}
break;
......@@ -1357,13 +1355,14 @@ send_async_deleted_text (Text_no text_no, Text_stat *text_s)
}
}
#if 0
/*
* This is not strictly necessary since the text-stat is sent
* in the previous message, and the clients should be able to
* update their caches from that information.
*/
/* for (misc = text_s->misc_items;
for (misc = text_s->misc_items;
misc < text_stat->misc_items + text_stat->no_of_misc;
misc++)
{
......@@ -1399,8 +1398,7 @@ send_async_deleted_text (Text_no text_no, Text_stat *text_s)
}
}
}
*/
#endif
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment