From b1953951acd7aa2ae7f55251c7b93ec24ad9128b Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Fri, 14 Jan 2005 05:10:00 +0000
Subject: [PATCH] Change option '6' back to more logical option '3' (bug #2491)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4790 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 apps/app_meetme.c         |  21 ++++++++++-----------
 sounds/conf-adminmenu.gsm | Bin 15642 -> 16236 bytes
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index f0dabb0f86..d9d9a67221 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -917,8 +917,8 @@ zapretry:
 											ast_waitstream(chan, "");
 									}
 									break;
-                                                                case '6': /* Eject last user */
-				                                        menu_active = 0;
+								case '3': /* Eject last user */
+									menu_active = 0;
 									usr = conf->lastuser;
 									if ((usr->chan->name == chan->name)||(usr->userflags & CONFFLAG_ADMIN)) {
 										if(!ast_streamfile(chan, "conf-errormenu", chan->language))
@@ -1550,15 +1550,14 @@ static int admin_exec(struct ast_channel *chan, void *data) {
 						}
 					}
 					break;
-                                case 101: /* e: Eject last user*/
-                                        user = cnf->lastuser;
-                                                if (!(user->userflags & CONFFLAG_ADMIN)) {
-                                                        user->adminflags |= ADMINFLAG_KICKME;
-                                                        break;
-                                                } else
-							ast_log(LOG_NOTICE, "Not kicking last user, is an Admin!\n");
-                                        break;
-
+				case 101: /* e: Eject last user*/
+					user = cnf->lastuser;
+					if (!(user->userflags & CONFFLAG_ADMIN)) {
+						user->adminflags |= ADMINFLAG_KICKME;
+						break;
+					} else
+						ast_log(LOG_NOTICE, "Not kicking last user, is an Admin!\n");
+					break;
 				case 77: /* M: Mute */ 
 					if (user) {
 						user->adminflags |= ADMINFLAG_MUTED;
diff --git a/sounds/conf-adminmenu.gsm b/sounds/conf-adminmenu.gsm
index 3222995b5e0b99099b73afddf2d46477f4c7677a..ab63bfdf3b8c21632df88c5bf01cec472376fc4b 100755
GIT binary patch
delta 1164
zcmV;71ateEdhC9%vM+zyEaj<WP(ZgNu|ShiV9&BqBsWySXrpl`@`Ryc+m<y{+U>om
z9D!k%CZWY*gMnTt^rs<QqAPPuODfqzCu>kkW!mh`C1k%s4MJ<;rCh>B{I63FokEzT
zSn=i8Bv9mWSf<+Tq*&^5rPP}17Mx<k+8wdk8ocC4>&#2p;>CX#>`irw+9s3LYLMqU
zD6Y8VRD-KnYfD<~WJQuvd@$1FY0@XoMA>4CVQPS-In-4*FN&m+em%H{WQE)Vzp~TG
zYsngN)?eCaTUBJQtQ!#SR$gw47sRGa+^&ZOMUcr{?9C?Pmwd?9=uw)q=}{EE)h3dK
zP<dK*ww8|&Sb~4ml)I5H#H5KXE!J#F;w+GkCnQZr<CKeL(QZE~-pVGMHTPTM>cr8{
zx~kM?YbK<bMM4!HThikM<rz;`%Hc%@Ve82v;U%TsRJcgf>02@^-D^oKjyBiXsl(K9
z#@vwy+}v#u*Vm>s6=?I_)oD8RD~+Y6TuJ?njmS3Ceer))jfJwg>D1|q>ZandIM>%F
zI~O{Os2Sj`G(C%}cASYP+RqE6QzUn+i)koOujeM%<ODM6(McjA|0?Ox>YnOK$lQ$z
zXX{nemD37a4SA&(*x?MjS&b+~T|}Yoj|b|ID<5>#XtI#b`s3M0f=|0T;@Ke#x0KmR
zA}rQBB9ni{5Nmn;8{H@gZPVC6;fVE1nZ+g8;01Ej<q3@<k|ds)MSQ|`q<!ZIc*Axw
zrs-$YtdSJ_*j^4clkFpjex!mS@aFk!Xc1?lgbJ)pxf@etdo788Vb+;0eu}9Ed7Y6Y
z)>j1gL7Ji*S0ndax+F=c<mvBvR)E%+HaeTHBME=r-rJ$Eq$Ec+M|QQN5M**n>s{dr
zU2gdx*xdzwqhX{vgb_C9X9xJ~NCur@C275t#!AG+w|D+X)7c#bKgh_$5>$J8RLsK^
zoNY(v&f>#LJT%4Af<Bodhb`G$1i#p8;kQIhNpRT%RYWZ%E$*XwT1gN~Z^5HqsW+3@
z+Xa6*+jBxy84~?tj>9zC0H%}WB0a6DR>F7TW`?pDRoPtx_SElTLJW?OP3vOa^K!PF
zeS!L#b=MnnLQPo?$cWgQ1%H5jK}~aM#VmVZyQWMhKi<MSVoFNLfndje__)*983sQA
zbfGY0i4bRr0a`?@B({YBhE=m&B7(rUiD`eNBH0`TdYgsd&3&=7NPnRcl14Q)iJ-Kz
z0qVhjfQaLcxSQD=1ukQGV6;F5I01d(DI%Lzk$)j4B){m~aX`x1AOzaj83cZue<0f9
zu_Q|HprtO3UG(2z$l66n&~ISNnh7~2*jWR+TiGDpYHBFc%^;@Jjk!J2fTWW}N#uWd
zVBHx`MB3O|12@y<KtJVj#+zk8w#iP|+~+_fTuCRqV<1Uv*WBsYTLXJb>VOv<cWWc?
zpcb2H%Pi=CX)A6@qwqi|+m*>9+GPQzn`nSXD~-n+?jTs(a>ZPd07lz!$mFV^OB;>H
eRM#cNA`sl-NP|{4TE1aR8@92f@PV_}F+&R*?MmPP

delta 545
zcmV++0^a@Xewuo)vM+zsAyjtMh{j(e0^O|DEJY-?#>Z(*N|R@|8*7VbIdVA%)uKag
zjcbUR!=>$TYiu>MsW?8Nthn2)^xWC(L+VOS4c8%CZ$od)$s=Sh`f;qX2YaY&b5Q9c
zjv=IXZ5Zi3See$}WHW=c4R{Y$sPDTpx}<VQ#)z;z4RMp@(Jp^MW=$<E*B@K&1KTeN
zBTZ*3olHqfX?YRxO-a&apKGr$i7Rci?be)BuY$bnQ0m3P1YHg6CQ>@xV+#joHaQw+
zD{$${DU{XUWa@-#OGf5OBEI0uwxo^6!gnpkpK-Y(gDghlUZzde-d$=^l1W<yw7A@&
z?71Foq^HVAPX>RMCnB8aIOJ^yp3@?ZHWRvMRy4J?({zQiI+<LO(m~4`=~}J6LAhj+
zTzu0VT<#0pAsPUU*{o#27dcK#Y--_F+);+D)*!}hewQrN*<5Pa?!hA4c1a|Jz`N8X
z*_81B-&Lg7b80}Qv}RW&*EFpgW{jZ8B$7r!SI|i#ayNg4cTDgQHpwHTCnX^=8SdF@
z-KAr$N;h1S+g;u#d&Y^D@l_~9ie^)<(yKJwjNTmCE3@Y-TC3LujkfH!3{YE_Fk@he
zSKFz%<Bo?UqqSET+32+9^S-CmUCRP@R_QDyt*L%^r$!FuEm)4mS!oTKXW8hq-QnmY
j3c@v;JmwT+5qFTOE8fDKo!v()-)8k1awep+6f{^1mSqh~