From 12432b9b9e19018695fac5540b6d8e5789a5263e Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 26 Feb 2007 01:05:15 +0000 Subject: Merged revisions 56740 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r56740 | russell | 2007-02-25 19:04:40 -0600 (Sun, 25 Feb 2007) | 2 lines Move a comment to be in the correct struct. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56742 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/app_meetme.c') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 2449edb42..862db9927 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -400,9 +400,6 @@ struct sla_trunk { /*! Number of stations that have this trunk on hold. */ unsigned int hold_stations; struct ast_channel *chan; - /*! Ring timeout to use when this trunk is ringing on this specific - * station. This takes higher priority than a ring timeout set at - * the station level. */ unsigned int ring_timeout; }; @@ -411,6 +408,9 @@ struct sla_trunk_ref { struct sla_trunk *trunk; enum sla_trunk_state state; struct ast_channel *chan; + /*! Ring timeout to use when this trunk is ringing on this specific + * station. This takes higher priority than a ring timeout set at + * the station level. */ unsigned int ring_timeout; }; -- cgit v1.2.3