kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't add Attendees during copy, replace them

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@223053 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2009-10-09 15:00:49 +00:00
parent a75ba8d1a9
commit d81a8e34dd
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_calendar.c
View File

@@ -637,7 +637,7 @@ static int calendar_event_notify(const void *data)
tmp++; tmp++;
ast_copy_string(dest, tmp, sizeof(dest)); ast_copy_string(dest, tmp, sizeof(dest));
} else { } else {
ast_log(LOG_WARNING, "Channel should be in form Tech/Dest\n"); ast_log(LOG_WARNING, "Channel should be in form Tech/Dest (was '%s')\n", tech);
goto notify_cleanup; goto notify_cleanup;
} }
@@ -753,6 +753,12 @@ static void copy_event_data(struct ast_calendar_event *dst, struct ast_calendar_
dst->alarm = src->alarm; dst->alarm = src->alarm;
dst->busy_state = src->busy_state; dst->busy_state = src->busy_state;
/* Delete any existing attendees */
while ((attendee = AST_LIST_REMOVE_HEAD(&dst->attendees, next))) {
ast_free(attendee);
}
/* Copy over the new attendees */
while ((attendee = AST_LIST_REMOVE_HEAD(&src->attendees, next))) { while ((attendee = AST_LIST_REMOVE_HEAD(&src->attendees, next))) {
AST_LIST_INSERT_TAIL(&dst->attendees, attendee, next); AST_LIST_INSERT_TAIL(&dst->attendees, attendee, next);
} }