Author: knhor Date: Tue Dec 19 22:12:48 2006 New Revision: 3750 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: hand merge 3705 and 3742 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Dec 19 22:12:48 2006 @@ -2274,6 +2274,7 @@ switch_clear_flag(member, MFLAG_RUNNING); switch_set_flag(member, MFLAG_KICKED); switch_mutex_unlock(member->flag_mutex); + switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); if(stream != NULL) { stream->write_function(stream, "OK kicked %u\n", member->id); @@ -2438,7 +2439,10 @@ switch_hash_this(hi, NULL, NULL, &val); conference = (conference_obj_t *) val; - stream->write_function(stream, "Conference %s (%u members)\n", conference->name, conference->count); + stream->write_function(stream, "Conference %s (%u member%s)\n", + conference->name, + conference->count, + conference->count == 1 ? "" : ""); conference_list(conference, stream, d); }