From: Automerge script <automerge@asterisk.org>
Date: Wed, 31 May 2006 21:05:23 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.9.1-netsec~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98b7b027bef098e47b06fb8955545480b8856a56;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@31157 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index c167db2ba9..09b06aee0a 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6338,18 +6338,18 @@ static int handle_init_event(struct zt_pvt *i, int event)
 	case ZT_EVENT_NOALARM:
 		i->inalarm = 0;
 		ast_log(LOG_NOTICE, "Alarm cleared on channel %d\n", i->channel);
+		manager_event(EVENT_FLAG_SYSTEM, "AlarmClear",
+		              "Channel: %d\r\n", i->channel);
 		break;
-               manager_event(EVENT_FLAG_SYSTEM, "AlarmClear",
-                                                       "Channel: %d\r\n", i->channel);
 	case ZT_EVENT_ALARM:
 		i->inalarm = 1;
 		res = get_alarms(i);
 		ast_log(LOG_WARNING, "Detected alarm on channel %d: %s\n", i->channel, alarm2str(res));
+		manager_event(EVENT_FLAG_SYSTEM, "Alarm",
+		              "Alarm: %s\r\n"
+		              "Channel: %d\r\n",
+		              alarm2str(res), i->channel);
 		/* fall thru intentionally */
-               manager_event(EVENT_FLAG_SYSTEM, "Alarm",
-                                                       "Alarm: %s\r\n"
-                                                       "Channel: %d\r\n",
-                                                       alarm2str(res), i->channel);
 	case ZT_EVENT_ONHOOK:
 		if (i->radio) break;
 		/* Back on hook.  Hang up. */