[asterisk-commits] snuffy: branch snuffy/ao2_jabber r155507 - in /team/snuffy/ao2_jabber: ./ agi...

Fri Nov 7 23:56:46 CST 2008

Author: snuffy
Date: Fri Nov  7 23:56:44 2008
New Revision: 155507

URL: http://svn.digium.com/view/asterisk?view=rev&rev=155507
Log:
merge old rev..

Added:
    team/snuffy/ao2_jabber/autoconf/
      - copied from r155467, trunk/autoconf/
    team/snuffy/ao2_jabber/autoconf/acx_pthread.m4
      - copied unchanged from r155467, trunk/autoconf/acx_pthread.m4
    team/snuffy/ao2_jabber/autoconf/ast_c_compile_check.m4
      - copied unchanged from r155467, trunk/autoconf/ast_c_compile_check.m4
    team/snuffy/ao2_jabber/autoconf/ast_c_define_check.m4
      - copied unchanged from r155467, trunk/autoconf/ast_c_define_check.m4
    team/snuffy/ao2_jabber/autoconf/ast_check_gnu_make.m4
      - copied unchanged from r155467, trunk/autoconf/ast_check_gnu_make.m4
    team/snuffy/ao2_jabber/autoconf/ast_check_mandatory.m4
      - copied unchanged from r155467, trunk/autoconf/ast_check_mandatory.m4
    team/snuffy/ao2_jabber/autoconf/ast_check_openh323.m4
      - copied unchanged from r155467, trunk/autoconf/ast_check_openh323.m4
    team/snuffy/ao2_jabber/autoconf/ast_check_pwlib.m4
      - copied unchanged from r155467, trunk/autoconf/ast_check_pwlib.m4
    team/snuffy/ao2_jabber/autoconf/ast_ext_lib.m4
      - copied unchanged from r155467, trunk/autoconf/ast_ext_lib.m4
    team/snuffy/ao2_jabber/autoconf/ast_ext_tool_check.m4
      - copied unchanged from r155467, trunk/autoconf/ast_ext_tool_check.m4
    team/snuffy/ao2_jabber/autoconf/ast_func_fork.m4
      - copied unchanged from r155467, trunk/autoconf/ast_func_fork.m4
    team/snuffy/ao2_jabber/autoconf/ast_gcc_attribute.m4
      - copied unchanged from r155467, trunk/autoconf/ast_gcc_attribute.m4
    team/snuffy/ao2_jabber/autoconf/ast_prog_egrep.m4
      - copied unchanged from r155467, trunk/autoconf/ast_prog_egrep.m4
    team/snuffy/ao2_jabber/autoconf/ast_prog_ld.m4
      - copied unchanged from r155467, trunk/autoconf/ast_prog_ld.m4
    team/snuffy/ao2_jabber/autoconf/ast_prog_ld_gnu.m4
      - copied unchanged from r155467, trunk/autoconf/ast_prog_ld_gnu.m4
    team/snuffy/ao2_jabber/autoconf/ast_prog_sed.m4
      - copied unchanged from r155467, trunk/autoconf/ast_prog_sed.m4
    team/snuffy/ao2_jabber/build_tools/get_documentation
      - copied unchanged from r155467, trunk/build_tools/get_documentation
    team/snuffy/ao2_jabber/codecs/ex_adpcm.h
      - copied unchanged from r155467, trunk/codecs/ex_adpcm.h
    team/snuffy/ao2_jabber/codecs/ex_alaw.h
      - copied unchanged from r155467, trunk/codecs/ex_alaw.h
    team/snuffy/ao2_jabber/codecs/ex_g722.h
      - copied unchanged from r155467, trunk/codecs/ex_g722.h
    team/snuffy/ao2_jabber/codecs/ex_g726.h
      - copied unchanged from r155467, trunk/codecs/ex_g726.h
    team/snuffy/ao2_jabber/codecs/ex_gsm.h
      - copied unchanged from r155467, trunk/codecs/ex_gsm.h
    team/snuffy/ao2_jabber/codecs/ex_ilbc.h
      - copied unchanged from r155467, trunk/codecs/ex_ilbc.h
    team/snuffy/ao2_jabber/codecs/ex_lpc10.h
      - copied unchanged from r155467, trunk/codecs/ex_lpc10.h
    team/snuffy/ao2_jabber/codecs/ex_speex.h
      - copied unchanged from r155467, trunk/codecs/ex_speex.h
    team/snuffy/ao2_jabber/codecs/ex_ulaw.h
      - copied unchanged from r155467, trunk/codecs/ex_ulaw.h
    team/snuffy/ao2_jabber/contrib/scripts/live_ast
      - copied unchanged from r155467, trunk/contrib/scripts/live_ast
    team/snuffy/ao2_jabber/doc/appdocsxml.dtd
      - copied unchanged from r155467, trunk/doc/appdocsxml.dtd
    team/snuffy/ao2_jabber/include/asterisk/buildinfo.h
      - copied unchanged from r155467, trunk/include/asterisk/buildinfo.h
    team/snuffy/ao2_jabber/include/asterisk/slin.h
      - copied unchanged from r155467, trunk/include/asterisk/slin.h
    team/snuffy/ao2_jabber/include/asterisk/xml.h
      - copied unchanged from r155467, trunk/include/asterisk/xml.h
    team/snuffy/ao2_jabber/main/xml.c
      - copied unchanged from r155467, trunk/main/xml.c
Removed:
    team/snuffy/ao2_jabber/acinclude.m4
    team/snuffy/ao2_jabber/codecs/adpcm_slin_ex.h
    team/snuffy/ao2_jabber/codecs/g722_slin_ex.h
    team/snuffy/ao2_jabber/codecs/g726_slin_ex.h
    team/snuffy/ao2_jabber/codecs/gsm_slin_ex.h
    team/snuffy/ao2_jabber/codecs/ilbc_slin_ex.h
    team/snuffy/ao2_jabber/codecs/lpc10_slin_ex.h
    team/snuffy/ao2_jabber/codecs/slin_adpcm_ex.h
    team/snuffy/ao2_jabber/codecs/slin_g722_ex.h
    team/snuffy/ao2_jabber/codecs/slin_g726_ex.h
    team/snuffy/ao2_jabber/codecs/slin_gsm_ex.h
    team/snuffy/ao2_jabber/codecs/slin_ilbc_ex.h
    team/snuffy/ao2_jabber/codecs/slin_lpc10_ex.h
    team/snuffy/ao2_jabber/codecs/slin_resample_ex.h
    team/snuffy/ao2_jabber/codecs/slin_speex_ex.h
    team/snuffy/ao2_jabber/codecs/slin_ulaw_ex.h
    team/snuffy/ao2_jabber/codecs/speex_slin_ex.h
    team/snuffy/ao2_jabber/codecs/ulaw_slin_ex.h
Modified:
    team/snuffy/ao2_jabber/   (props changed)
    team/snuffy/ao2_jabber/Makefile
    team/snuffy/ao2_jabber/UPGRADE.txt
    team/snuffy/ao2_jabber/agi/eagi-sphinx-test.c
    team/snuffy/ao2_jabber/agi/eagi-test.c
    team/snuffy/ao2_jabber/apps/app_adsiprog.c
    team/snuffy/ao2_jabber/apps/app_alarmreceiver.c
    team/snuffy/ao2_jabber/apps/app_amd.c
    team/snuffy/ao2_jabber/apps/app_authenticate.c
    team/snuffy/ao2_jabber/apps/app_cdr.c
    team/snuffy/ao2_jabber/apps/app_chanisavail.c
    team/snuffy/ao2_jabber/apps/app_channelredirect.c
    team/snuffy/ao2_jabber/apps/app_chanspy.c
    team/snuffy/ao2_jabber/apps/app_controlplayback.c
    team/snuffy/ao2_jabber/apps/app_dahdibarge.c
    team/snuffy/ao2_jabber/apps/app_dahdiras.c
    team/snuffy/ao2_jabber/apps/app_dahdiscan.c
    team/snuffy/ao2_jabber/apps/app_db.c
    team/snuffy/ao2_jabber/apps/app_dial.c
    team/snuffy/ao2_jabber/apps/app_dictate.c
    team/snuffy/ao2_jabber/apps/app_directed_pickup.c
    team/snuffy/ao2_jabber/apps/app_directory.c
    team/snuffy/ao2_jabber/apps/app_disa.c
    team/snuffy/ao2_jabber/apps/app_dumpchan.c
    team/snuffy/ao2_jabber/apps/app_echo.c
    team/snuffy/ao2_jabber/apps/app_exec.c
    team/snuffy/ao2_jabber/apps/app_externalivr.c
    team/snuffy/ao2_jabber/apps/app_fax.c
    team/snuffy/ao2_jabber/apps/app_festival.c
    team/snuffy/ao2_jabber/apps/app_flash.c
    team/snuffy/ao2_jabber/apps/app_followme.c
    team/snuffy/ao2_jabber/apps/app_forkcdr.c
    team/snuffy/ao2_jabber/apps/app_getcpeid.c
    team/snuffy/ao2_jabber/apps/app_ices.c
    team/snuffy/ao2_jabber/apps/app_image.c
    team/snuffy/ao2_jabber/apps/app_ivrdemo.c
    team/snuffy/ao2_jabber/apps/app_jack.c
    team/snuffy/ao2_jabber/apps/app_macro.c
    team/snuffy/ao2_jabber/apps/app_meetme.c
    team/snuffy/ao2_jabber/apps/app_milliwatt.c
    team/snuffy/ao2_jabber/apps/app_mixmonitor.c
    team/snuffy/ao2_jabber/apps/app_morsecode.c
    team/snuffy/ao2_jabber/apps/app_mp3.c
    team/snuffy/ao2_jabber/apps/app_nbscat.c
    team/snuffy/ao2_jabber/apps/app_osplookup.c
    team/snuffy/ao2_jabber/apps/app_page.c
    team/snuffy/ao2_jabber/apps/app_parkandannounce.c
    team/snuffy/ao2_jabber/apps/app_playback.c
    team/snuffy/ao2_jabber/apps/app_privacy.c
    team/snuffy/ao2_jabber/apps/app_queue.c
    team/snuffy/ao2_jabber/apps/app_read.c
    team/snuffy/ao2_jabber/apps/app_readexten.c
    team/snuffy/ao2_jabber/apps/app_readfile.c
    team/snuffy/ao2_jabber/apps/app_record.c
    team/snuffy/ao2_jabber/apps/app_sayunixtime.c
    team/snuffy/ao2_jabber/apps/app_senddtmf.c
    team/snuffy/ao2_jabber/apps/app_sendtext.c
    team/snuffy/ao2_jabber/apps/app_setcallerid.c
    team/snuffy/ao2_jabber/apps/app_skel.c
    team/snuffy/ao2_jabber/apps/app_sms.c
    team/snuffy/ao2_jabber/apps/app_softhangup.c
    team/snuffy/ao2_jabber/apps/app_speech_utils.c
    team/snuffy/ao2_jabber/apps/app_stack.c
    team/snuffy/ao2_jabber/apps/app_system.c
    team/snuffy/ao2_jabber/apps/app_talkdetect.c
    team/snuffy/ao2_jabber/apps/app_test.c
    team/snuffy/ao2_jabber/apps/app_transfer.c
    team/snuffy/ao2_jabber/apps/app_url.c
    team/snuffy/ao2_jabber/apps/app_userevent.c
    team/snuffy/ao2_jabber/apps/app_verbose.c
    team/snuffy/ao2_jabber/apps/app_voicemail.c
    team/snuffy/ao2_jabber/apps/app_waitforring.c
    team/snuffy/ao2_jabber/apps/app_waitforsilence.c
    team/snuffy/ao2_jabber/apps/app_waituntil.c
    team/snuffy/ao2_jabber/apps/app_while.c
    team/snuffy/ao2_jabber/apps/app_zapateller.c
    team/snuffy/ao2_jabber/bootstrap.sh
    team/snuffy/ao2_jabber/build_tools/make_buildopts_h
    team/snuffy/ao2_jabber/build_tools/menuselect-deps.in
    team/snuffy/ao2_jabber/cdr/cdr_odbc.c
    team/snuffy/ao2_jabber/channels/Makefile
    team/snuffy/ao2_jabber/channels/chan_agent.c
    team/snuffy/ao2_jabber/channels/chan_alsa.c
    team/snuffy/ao2_jabber/channels/chan_console.c
    team/snuffy/ao2_jabber/channels/chan_dahdi.c
    team/snuffy/ao2_jabber/channels/chan_h323.c
    team/snuffy/ao2_jabber/channels/chan_iax2.c
    team/snuffy/ao2_jabber/channels/chan_local.c
    team/snuffy/ao2_jabber/channels/chan_mgcp.c
    team/snuffy/ao2_jabber/channels/chan_misdn.c
    team/snuffy/ao2_jabber/channels/chan_oss.c
    team/snuffy/ao2_jabber/channels/chan_usbradio.c
    team/snuffy/ao2_jabber/channels/chan_vpb.cc
    team/snuffy/ao2_jabber/channels/console_gui.c
    team/snuffy/ao2_jabber/channels/console_video.c
    team/snuffy/ao2_jabber/channels/misdn/isdn_lib.c
    team/snuffy/ao2_jabber/channels/misdn/isdn_lib.h
    team/snuffy/ao2_jabber/channels/misdn/isdn_lib_intern.h
    team/snuffy/ao2_jabber/channels/vcodecs.c
    team/snuffy/ao2_jabber/codecs/codec_a_mu.c
    team/snuffy/ao2_jabber/codecs/codec_adpcm.c
    team/snuffy/ao2_jabber/codecs/codec_alaw.c
    team/snuffy/ao2_jabber/codecs/codec_g722.c
    team/snuffy/ao2_jabber/codecs/codec_g726.c
    team/snuffy/ao2_jabber/codecs/codec_gsm.c
    team/snuffy/ao2_jabber/codecs/codec_ilbc.c
    team/snuffy/ao2_jabber/codecs/codec_lpc10.c
    team/snuffy/ao2_jabber/codecs/codec_resample.c
    team/snuffy/ao2_jabber/codecs/codec_speex.c
    team/snuffy/ao2_jabber/codecs/codec_ulaw.c
    team/snuffy/ao2_jabber/codecs/lpc10/chanwr.c
    team/snuffy/ao2_jabber/codecs/lpc10/lpcini.c
    team/snuffy/ao2_jabber/configs/agents.conf.sample
    team/snuffy/ao2_jabber/configs/chan_dahdi.conf.sample
    team/snuffy/ao2_jabber/configs/extensions.conf.sample
    team/snuffy/ao2_jabber/configs/features.conf.sample
    team/snuffy/ao2_jabber/configs/func_odbc.conf.sample
    team/snuffy/ao2_jabber/configs/iax.conf.sample
    team/snuffy/ao2_jabber/configs/modules.conf.sample
    team/snuffy/ao2_jabber/configs/musiconhold.conf.sample
    team/snuffy/ao2_jabber/configs/phoneprov.conf.sample
    team/snuffy/ao2_jabber/configs/queues.conf.sample
    team/snuffy/ao2_jabber/configs/res_ldap.conf.sample
    team/snuffy/ao2_jabber/configs/sip_notify.conf.sample
    team/snuffy/ao2_jabber/configs/skinny.conf.sample
    team/snuffy/ao2_jabber/configs/voicemail.conf.sample
    team/snuffy/ao2_jabber/configure.ac
    team/snuffy/ao2_jabber/contrib/init.d/rc.debian.asterisk
    team/snuffy/ao2_jabber/contrib/init.d/rc.mandriva.asterisk
    team/snuffy/ao2_jabber/contrib/init.d/rc.redhat.asterisk
    team/snuffy/ao2_jabber/contrib/init.d/rc.suse.asterisk
    team/snuffy/ao2_jabber/contrib/scripts/safe_asterisk
    team/snuffy/ao2_jabber/contrib/scripts/safe_asterisk_restart
    team/snuffy/ao2_jabber/contrib/scripts/vmdb.sql
    team/snuffy/ao2_jabber/doc/   (props changed)
    team/snuffy/ao2_jabber/doc/CODING-GUIDELINES
    team/snuffy/ao2_jabber/doc/manager_1_1.txt
    team/snuffy/ao2_jabber/doc/tex/asterisk-conf.tex
    team/snuffy/ao2_jabber/doc/tex/channelvariables.tex
    team/snuffy/ao2_jabber/formats/format_gsm.c
    team/snuffy/ao2_jabber/formats/format_ogg_vorbis.c
    team/snuffy/ao2_jabber/formats/format_wav.c
    team/snuffy/ao2_jabber/formats/format_wav_gsm.c
    team/snuffy/ao2_jabber/funcs/func_base64.c
    team/snuffy/ao2_jabber/funcs/func_blacklist.c
    team/snuffy/ao2_jabber/funcs/func_callerid.c
    team/snuffy/ao2_jabber/funcs/func_cdr.c
    team/snuffy/ao2_jabber/funcs/func_channel.c
    team/snuffy/ao2_jabber/funcs/func_config.c
    team/snuffy/ao2_jabber/funcs/func_curl.c
    team/snuffy/ao2_jabber/funcs/func_cut.c
    team/snuffy/ao2_jabber/funcs/func_db.c
    team/snuffy/ao2_jabber/funcs/func_devstate.c
    team/snuffy/ao2_jabber/funcs/func_dialgroup.c
    team/snuffy/ao2_jabber/funcs/func_dialplan.c
    team/snuffy/ao2_jabber/funcs/func_enum.c
    team/snuffy/ao2_jabber/funcs/func_env.c
    team/snuffy/ao2_jabber/funcs/func_extstate.c
    team/snuffy/ao2_jabber/funcs/func_global.c
    team/snuffy/ao2_jabber/funcs/func_groupcount.c
    team/snuffy/ao2_jabber/funcs/func_iconv.c
    team/snuffy/ao2_jabber/funcs/func_lock.c
    team/snuffy/ao2_jabber/funcs/func_logic.c
    team/snuffy/ao2_jabber/funcs/func_math.c
    team/snuffy/ao2_jabber/funcs/func_md5.c
    team/snuffy/ao2_jabber/funcs/func_module.c
    team/snuffy/ao2_jabber/funcs/func_odbc.c
    team/snuffy/ao2_jabber/funcs/func_rand.c
    team/snuffy/ao2_jabber/funcs/func_realtime.c
    team/snuffy/ao2_jabber/funcs/func_sha1.c
    team/snuffy/ao2_jabber/funcs/func_shell.c
    team/snuffy/ao2_jabber/funcs/func_speex.c
    team/snuffy/ao2_jabber/funcs/func_strings.c
    team/snuffy/ao2_jabber/funcs/func_timeout.c
    team/snuffy/ao2_jabber/funcs/func_uri.c
    team/snuffy/ao2_jabber/funcs/func_version.c
    team/snuffy/ao2_jabber/funcs/func_vmcount.c
    team/snuffy/ao2_jabber/funcs/func_volume.c
    team/snuffy/ao2_jabber/include/asterisk.h
    team/snuffy/ao2_jabber/include/asterisk/_private.h
    team/snuffy/ao2_jabber/include/asterisk/agi.h
    team/snuffy/ao2_jabber/include/asterisk/app.h
    team/snuffy/ao2_jabber/include/asterisk/astobj2.h
    team/snuffy/ao2_jabber/include/asterisk/audiohook.h
    team/snuffy/ao2_jabber/include/asterisk/autoconfig.h.in
    team/snuffy/ao2_jabber/include/asterisk/channel.h
    team/snuffy/ao2_jabber/include/asterisk/chanvars.h
    team/snuffy/ao2_jabber/include/asterisk/compat.h
    team/snuffy/ao2_jabber/include/asterisk/compiler.h
    team/snuffy/ao2_jabber/include/asterisk/config.h
    team/snuffy/ao2_jabber/include/asterisk/devicestate.h
    team/snuffy/ao2_jabber/include/asterisk/dial.h
    team/snuffy/ao2_jabber/include/asterisk/endian.h
    team/snuffy/ao2_jabber/include/asterisk/extconf.h
    team/snuffy/ao2_jabber/include/asterisk/features.h
    team/snuffy/ao2_jabber/include/asterisk/hashtab.h
    team/snuffy/ao2_jabber/include/asterisk/indications.h
    team/snuffy/ao2_jabber/include/asterisk/localtime.h
    team/snuffy/ao2_jabber/include/asterisk/module.h
    team/snuffy/ao2_jabber/include/asterisk/options.h
    team/snuffy/ao2_jabber/include/asterisk/pbx.h
    team/snuffy/ao2_jabber/include/asterisk/sched.h
    team/snuffy/ao2_jabber/include/asterisk/strings.h
    team/snuffy/ao2_jabber/include/asterisk/tcptls.h
    team/snuffy/ao2_jabber/include/asterisk/term.h
    team/snuffy/ao2_jabber/include/asterisk/threadstorage.h
    team/snuffy/ao2_jabber/include/asterisk/timing.h
    team/snuffy/ao2_jabber/main/Makefile
    team/snuffy/ao2_jabber/main/app.c
    team/snuffy/ao2_jabber/main/ast_expr2f.c
    team/snuffy/ao2_jabber/main/asterisk.c
    team/snuffy/ao2_jabber/main/astobj2.c
    team/snuffy/ao2_jabber/main/audiohook.c
    team/snuffy/ao2_jabber/main/buildinfo.c
    team/snuffy/ao2_jabber/main/cdr.c
    team/snuffy/ao2_jabber/main/channel.c
    team/snuffy/ao2_jabber/main/chanvars.c
    team/snuffy/ao2_jabber/main/cli.c
    team/snuffy/ao2_jabber/main/config.c
    team/snuffy/ao2_jabber/main/cryptostub.c
    team/snuffy/ao2_jabber/main/db1-ast/hash/hash_page.c
    team/snuffy/ao2_jabber/main/devicestate.c
    team/snuffy/ao2_jabber/main/dial.c
    team/snuffy/ao2_jabber/main/dnsmgr.c
    team/snuffy/ao2_jabber/main/file.c
    team/snuffy/ao2_jabber/main/hashtab.c
    team/snuffy/ao2_jabber/main/http.c
    team/snuffy/ao2_jabber/main/indications.c
    team/snuffy/ao2_jabber/main/logger.c
    team/snuffy/ao2_jabber/main/manager.c
    team/snuffy/ao2_jabber/main/pbx.c
    team/snuffy/ao2_jabber/main/rtp.c
    team/snuffy/ao2_jabber/main/stdtime/localtime.c
    team/snuffy/ao2_jabber/main/taskprocessor.c
    team/snuffy/ao2_jabber/main/tcptls.c
    team/snuffy/ao2_jabber/main/tdd.c
    team/snuffy/ao2_jabber/main/term.c
    team/snuffy/ao2_jabber/main/translate.c
    team/snuffy/ao2_jabber/main/utils.c
    team/snuffy/ao2_jabber/makeopts.in
    team/snuffy/ao2_jabber/pbx/pbx_config.c
    team/snuffy/ao2_jabber/pbx/pbx_dundi.c
    team/snuffy/ao2_jabber/pbx/pbx_lua.c
    team/snuffy/ao2_jabber/pbx/pbx_spool.c
    team/snuffy/ao2_jabber/phoneprov/000000000000.cfg
    team/snuffy/ao2_jabber/phoneprov/polycom.xml
    team/snuffy/ao2_jabber/res/ael/ael.flex
    team/snuffy/ao2_jabber/res/ael/ael.tab.c
    team/snuffy/ao2_jabber/res/ael/ael.y
    team/snuffy/ao2_jabber/res/ael/ael_lex.c
    team/snuffy/ao2_jabber/res/res_agi.c
    team/snuffy/ao2_jabber/res/res_config_curl.c
    team/snuffy/ao2_jabber/res/res_config_ldap.c
    team/snuffy/ao2_jabber/res/res_config_odbc.c
    team/snuffy/ao2_jabber/res/res_config_pgsql.c
    team/snuffy/ao2_jabber/res/res_config_sqlite.c
    team/snuffy/ao2_jabber/res/res_crypto.c
    team/snuffy/ao2_jabber/res/res_http_post.c
    team/snuffy/ao2_jabber/res/res_indications.c
    team/snuffy/ao2_jabber/res/res_jabber.c
    team/snuffy/ao2_jabber/res/res_musiconhold.c
    team/snuffy/ao2_jabber/res/res_odbc.c
    team/snuffy/ao2_jabber/res/res_phoneprov.c
    team/snuffy/ao2_jabber/res/res_realtime.c
    team/snuffy/ao2_jabber/res/res_smdi.c
    team/snuffy/ao2_jabber/res/res_timing_pthread.c
    team/snuffy/ao2_jabber/sounds/Makefile
    team/snuffy/ao2_jabber/sounds/sounds.xml
    team/snuffy/ao2_jabber/utils/Makefile
    team/snuffy/ao2_jabber/utils/astcanary.c
    team/snuffy/ao2_jabber/utils/astman.c
    team/snuffy/ao2_jabber/utils/extconf.c
    team/snuffy/ao2_jabber/utils/frame.c
    team/snuffy/ao2_jabber/utils/hashtest2.c
    team/snuffy/ao2_jabber/utils/muted.c
    team/snuffy/ao2_jabber/utils/stereorize.c
    team/snuffy/ao2_jabber/utils/streamplayer.c

Propchange: team/snuffy/ao2_jabber/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/snuffy/ao2_jabber/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/snuffy/ao2_jabber/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov  7 23:56:44 2008
@@ -1,1 +1,1 @@
-/trunk:1-145515
+/trunk:1-155506

Modified: team/snuffy/ao2_jabber/Makefile
URL: http://svn.digium.com/view/asterisk/team/snuffy/ao2_jabber/Makefile?view=diff&rev=155507&r1=155506&r2=155507
==============================================================================
--- team/snuffy/ao2_jabber/Makefile (original)
+++ team/snuffy/ao2_jabber/Makefile Fri Nov  7 23:56:44 2008
@@ -104,6 +104,9 @@
 # CFLAGS and LDFLAGS in the COPTS and LDOPTS variables.
 ASTCFLAGS+=$(COPTS)
 ASTLDFLAGS+=$(LDOPTS)
+
+# libxml2 cflags
+ASTCFLAGS+=$(LIBXML2_INCLUDE)
 
 #Uncomment this to see all build commands instead of 'quiet' output
 #NOISY_BUILD=yes
@@ -262,7 +265,7 @@
 endif
 
 ifeq ($(OSARCH),OpenBSD)
-  ASTCFLAGS+=-pthread
+  ASTCFLAGS+=-pthread -ftrampolines
 endif
 
 ifeq ($(OSARCH),SunOS)
@@ -296,11 +299,11 @@
 MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
 
 ifneq ($(findstring darwin,$(OSARCH)),)
-  ASTCFLAGS+=-D__Darwin__
+  ASTCFLAGS+=-D__Darwin__ -fnested-functions
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
 else
 # These are used for all but Darwin
-  SOLINK=-shared -Xlinker -x
+  SOLINK=-shared
   ifneq ($(findstring BSD,$(OSARCH)),)
     LDFLAGS+=-L/usr/local/lib
   endif
@@ -308,6 +311,10 @@
 
 ifeq ($(OSARCH),SunOS)
   SOLINK=-shared -fpic -L/usr/local/ssl/lib -lrt
+endif
+
+ifeq ($(OSARCH),OpenBSD)
+  SOLINK=-shared -fpic
 endif
 
 # comment to print directories during submakes
@@ -344,7 +351,7 @@
 	@echo " +               $(mK) install               +"  
 	@echo " +-------------------------------------------+"  
 
-_all: cleantest makeopts $(SUBDIRS)
+_all: cleantest makeopts $(SUBDIRS) doc/core-en_US.xml
 
 makeopts: configure
 	@echo "****"
@@ -476,6 +483,29 @@
 	done
 	mkdir -p $(DESTDIR)$(AGI_DIR)
 	$(MAKE) -C sounds install
+
+doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) 
+	@echo -n "Building Documentation For: "
+	@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
+	@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
+	@echo "<docs>" >> $@
+	@for x in $(MOD_SUBDIRS); do \
+		echo -n "$$x " ; \
+		for i in $$x/*.c; do \
+			$(AWK) -f build_tools/get_documentation $$i >> $@ ; \
+		done ; \
+	done
+	@echo
+	@echo "</docs>" >> $@
+
+validate-docs: doc/core-en_US.xml
+ifeq ($(XMLSTARLET),:)
+	@echo "---------------------------------------------------------------"
+	@echo "--- Please install xmlstarlet to validate the documentation ---"
+	@echo "---------------------------------------------------------------"
+else
+	$(XMLSTARLET) val -d doc/appdocsxml.dtd $<
+endif
 
 update: 
 	@if [ -d .svn ]; then \
@@ -525,12 +555,16 @@
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
 	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+	$(INSTALL) -m 644 doc/core-*.xml $(ASTDATADIR)/documentation
+	$(INSTALL) -m 644 doc/appdocsxml.dtd $(ASTVARLIBDIR)/documentation
 	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
@@ -652,7 +686,7 @@
 		echo "astrundir => $(ASTVARRUNDIR)" ; \
 		echo "astlogdir => $(ASTLOGDIR)" ; \
 		echo "" ; \
-		echo ";[options]" ; \
+		echo "[options]" ; \
 		echo ";verbose = 3" ; \
 		echo ";debug = 3" ; \
 		echo ";alwaysfork = yes ; same as -F at startup" ; \
@@ -682,6 +716,7 @@
 		echo ";runuser = asterisk ; The user to run as" ; \
 		echo ";rungroup = asterisk ; The group to run as" ; \
 		echo ";lightbackground = yes ; If your terminal is set for a light-colored background" ; \
+		echo "documentation_language = en_US ; Set the Language you want Documentation displayed in. Value is in the same format as locale names" ; \
 		echo "" ; \
 		echo "; Changing the following lines may compromise your security." ; \
 		echo ";[files]" ; \
@@ -898,7 +933,7 @@
 asterisk.pdf:
 	$(MAKE) -C doc/tex asterisk.pdf
 
-.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs
+.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs validate-docs
 
 FORCE:
 

Modified: team/snuffy/ao2_jabber/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/snuffy/ao2_jabber/UPGRADE.txt?view=diff&rev=155507&r1=155506&r2=155507
==============================================================================
--- team/snuffy/ao2_jabber/UPGRADE.txt (original)
+++ team/snuffy/ao2_jabber/UPGRADE.txt Fri Nov  7 23:56:44 2008
@@ -77,6 +77,13 @@
   had any significance).  Since this violates the Principle of Least Surprise,
   it has been changed.
 
+* The default console now will use colors according to the default background
+  color, instead of forcing the background color to black.  If you are using a
+  light colored background for your console, you may wish to use the option
+  flag '-W' to present better color choices for the various messages.  However,
+  if you'd prefer the old method of forcing colors to white text on a black
+  background, the compatiblity option -B is provided for this purpose.
+
 Voicemail:
 
 * The voicemail configuration values 'maxmessage' and 'minmessage' have
@@ -258,6 +265,10 @@
   to differentiate your variable from the append operator.  This potential
   conflict is unlikely, but is documented here to be thorough.
 
+* skinny.conf now has seperate sections for lines and devices.
+  Please have a look at configs/skinny.conf.sample and update
+  your skinny.conf.
+
 Manager:
 
 * Manager has been upgraded to version 1.1 with a lot of changes. 

Modified: team/snuffy/ao2_jabber/agi/eagi-sphinx-test.c
URL: http://svn.digium.com/view/asterisk/team/snuffy/ao2_jabber/agi/eagi-sphinx-test.c?view=diff&rev=155507&r1=155506&r2=155507
==============================================================================
--- team/snuffy/ao2_jabber/agi/eagi-sphinx-test.c (original)
+++ team/snuffy/ao2_jabber/agi/eagi-sphinx-test.c Fri Nov  7 23:56:44 2008
@@ -79,7 +79,9 @@
 	char *val;
 	/* Read environment */
 	for(;;) {
-		fgets(buf, sizeof(buf), stdin);
+		if (!fgets(buf, sizeof(buf), stdin)) {
+			return -1;
+		}
 		if (feof(stdin))
 			return -1;
 		buf[strlen(buf) - 1] = '\0';
@@ -130,7 +132,9 @@
 			return NULL;
 		}
 		if (FD_ISSET(STDIN_FILENO, &fds)) {
-			fgets(astresp, sizeof(astresp), stdin);
+			if (!fgets(astresp, sizeof(astresp), stdin)) {
+				return NULL;
+			}
 			if (feof(stdin)) {
 				fprintf(stderr, "Got hungup on apparently\n");
 				return NULL;
@@ -141,9 +145,10 @@
 		}
 		if (FD_ISSET(AUDIO_FILENO, &fds)) {
 			res = read(AUDIO_FILENO, audiobuf, sizeof(audiobuf));
-			if (res > 0) {
-				if (sphinx_sock > -1) 
-					write(sphinx_sock, audiobuf, res);
+			if ((res > 0) && (sphinx_sock > -1)) {
+				if (write(sphinx_sock, audiobuf, res) < 0) {
+					fprintf(stderr, "write() failed: %s\n", strerror(errno));
+				}
 			}
 		}
 		if ((sphinx_sock > -1) && FD_ISSET(sphinx_sock, &fds)) {

Modified: team/snuffy/ao2_jabber/agi/eagi-test.c
URL: http://svn.digium.com/view/asterisk/team/snuffy/ao2_jabber/agi/eagi-test.c?view=diff&rev=155507&r1=155506&r2=155507
==============================================================================
--- team/snuffy/ao2_jabber/agi/eagi-test.c (original)
+++ team/snuffy/ao2_jabber/agi/eagi-test.c Fri Nov  7 23:56:44 2008
@@ -24,7 +24,9 @@
 	char *val;
 	/* Read environment */
 	for(;;) {
-		fgets(buf, sizeof(buf), stdin);
+		if (!fgets(buf, sizeof(buf), stdin)) {
+			return -1;
+		}
 		if (feof(stdin))
 			return -1;
 		buf[strlen(buf) - 1] = '\0';
@@ -68,7 +70,9 @@
 			return NULL;
 		}
 		if (FD_ISSET(STDIN_FILENO, &fds)) {
-			fgets(astresp, sizeof(astresp), stdin);
+			if (!fgets(astresp, sizeof(astresp), stdin)) {
+				return NULL;
+			}
 			if (feof(stdin)) {
 				fprintf(stderr, "Got hungup on apparently\n");
 				return NULL;

Modified: team/snuffy/ao2_jabber/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/snuffy/ao2_jabber/apps/app_adsiprog.c?view=diff&rev=155507&r1=155506&r2=155507
==============================================================================
--- team/snuffy/ao2_jabber/apps/app_adsiprog.c (original)
+++ team/snuffy/ao2_jabber/apps/app_adsiprog.c Fri Nov  7 23:56:44 2008
@@ -47,13 +47,27 @@
 
 static char *app = "ADSIProg";
 
-static char *synopsis = "Load Asterisk ADSI Scripts into phone";
+/*** DOCUMENTATION
+	<application name="ADSIProg" language="en_US">
+		<synopsis>
+			Load Asterisk ADSI Scripts into phone
+		</synopsis>
+		<syntax>
+			<parameter name="script" required="false">
+				<para>adsi script to use. If not given uses the default script <filename>asterisk.adsi</filename></para>
+			</parameter>
+		</syntax>
+		<description>
+			<para>This application programs an ADSI Phone with the given script</para>
+		</description>
+		<see-also>
+			<ref type="application">GetCPEID</ref>
+			<ref type="filename">adsi.conf</ref>
+		</see-also>
+	</application>
+ ***/
 
 /* #define DUMP_MESSAGES */
-
-static char *descrip =
-"  ADSIProg(script): This application programs an ADSI Phone with the given\n"
-"script. If nothing is specified, the default script (asterisk.adsi) is used.\n";
 
 struct adsi_event {
 	int id;
@@ -828,7 +842,7 @@
 			ast_log(LOG_WARNING, "'%s' is not a valid state name at line %d of %s\n", tok, lineno, script);
 			return 0;
 		}
-		if ((snums[scnt] = getstatebyname(state, sname, script, lineno, 0) < 0)) {
+		if ((snums[scnt] = getstatebyname(state, sname, script, lineno, 0) == NULL)) {
 			ast_log(LOG_WARNING, "State '%s' not declared at line %d of %s\n", sname, lineno, script);
 			return 0;
 		}
@@ -1369,7 +1383,9 @@
 	/* Create "main" as first subroutine */
 	getsubbyname(scr, "main", NULL, 0);
 	while (!feof(f)) {
-		fgets(buf, sizeof(buf), f);
+		if (!fgets(buf, sizeof(buf), f)) {
+			continue;
+		}
 		if (!feof(f)) {
 			lineno++;
 			/* Trim off trailing return */
@@ -1570,7 +1586,7 @@
 
 static int load_module(void)
 {
-	if (ast_register_application(app, adsi_exec, synopsis, descrip))
+	if (ast_register_application_xml(app, adsi_exec))
 		return AST_MODULE_LOAD_FAILURE;
 	return AST_MODULE_LOAD_SUCCESS;
 }

Modified: team/snuffy/ao2_jabber/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/snuffy/ao2_jabber/apps/app_alarmreceiver.c?view=diff&rev=155507&r1=155506&r2=155507
==============================================================================
--- team/snuffy/ao2_jabber/apps/app_alarmreceiver.c (original)
+++ team/snuffy/ao2_jabber/apps/app_alarmreceiver.c Fri Nov  7 23:56:44 2008
@@ -63,18 +63,27 @@
 typedef struct event_node event_node_t;
 
 static char *app = "AlarmReceiver";
-
-static char *synopsis = "Provide support for receiving alarm reports from a burglar or fire alarm panel";
-static char *descrip =
-"  AlarmReceiver(): Only 1 signalling format is supported at this time: Ademco\n"
-"Contact ID. This application should be called whenever there is an alarm\n"
-"panel calling in to dump its events. The application will handshake with the\n"
-"alarm panel, and receive events, validate them, handshake them, and store them\n"
-"until the panel hangs up. Once the panel hangs up, the application will run the\n"
-"system command specified by the eventcmd setting in alarmreceiver.conf and pipe\n"
-"the events to the standard input of the application. The configuration file also\n"
-"contains settings for DTMF timing, and for the loudness of the acknowledgement\n"
-"tones.\n";
+/*** DOCUMENTATION
+	<application name="AlarmReceiver" language="en_US">
+		<synopsis>
+			Provide support for receiving alarm reports from a burglar or fire alarm panel.
+		</synopsis>
+		<syntax />
+		<description>
+			<para>This application should be called whenever there is an alarm panel calling in to dump its events.
+			The application will handshake with the alarm panel, and receive events, validate them, handshake them,
+			and store them until the panel hangs up. Once the panel hangs up, the application will run the system
+			command specified by the eventcmd setting in <filename>alarmreceiver.conf</filename> and pipe the
+			events to the standard input of the application.
+			The configuration file also contains settings for DTMF timing, and for the loudness of the
+			acknowledgement tones.</para>
+			<note><para>Only 1 signalling format is supported at this time: Ademco Contact ID.</para></note>
+		</description>
+		<see-also>
+			<ref type="filename">alarmreceiver.conf</ref>
+		</see-also>
+	</application>
+ ***/
 
 /* Config Variables */
 static int fdtimeout = 2000;
@@ -708,7 +717,7 @@
 static int load_module(void)
 {
 	if (load_config()) {
-		if (ast_register_application(app, alarmreceiver_exec, synopsis, descrip))
+		if (ast_register_application_xml(app, alarmreceiver_exec))
 			return AST_MODULE_LOAD_FAILURE;
 		return AST_MODULE_LOAD_SUCCESS;
 	} else

Modified: team/snuffy/ao2_jabber/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/snuffy/ao2_jabber/apps/app_amd.c?view=diff&rev=155507&r1=155506&r2=155507
==============================================================================
--- team/snuffy/ao2_jabber/apps/app_amd.c (original)
+++ team/snuffy/ao2_jabber/apps/app_amd.c Fri Nov  7 23:56:44 2008
@@ -39,45 +39,92 @@
 #include "asterisk/config.h"
 #include "asterisk/app.h"
 
+/*** DOCUMENTATION
+	<application name="AMD" language="en_US">
+		<synopsis>
+			Attempt to detect answering machines.
+		</synopsis>
+		<syntax>
+			<parameter name="initialSilence" required="false">
+				<para>Is maximum initial silence duration before greeting.</para>
+				<para>If this is exceeded set as MACHINE</para>
+			</parameter>
+			<parameter name="greeting" required="false">
+				<para>is the maximum length of a greeting.</para>
+				<para>If this is exceeded set as MACHINE</para>
+			</parameter>
+			<parameter name="afterGreetingSilence" required="false">
+				<para>Is the silence after detecting a greeting.</para>
+				<para>If this is exceeded set as HUMAN</para>
+			</parameter>
+			<parameter name="totalAnalysis Time" required="false">
+				<para>Is the maximum time allowed for the algorithm</para>
+				<para>to decide HUMAN or MACHINE</para>
+			</parameter>
+			<parameter name="miniumWordLength" required="false">
+				<para>Is the minimum duration of Voice considered to be a word</para>
+			</parameter>
+			<parameter name="betweenWordSilence" required="false">
+				<para>Is the minimum duration of silence after a word to
+				consider the audio that follows to be a new word</para>
+			</parameter>
+			<parameter name="maximumNumberOfWords" required="false">
+				<para>Is the maximum number of words in a greeting</para>
+				<para>If this is exceeded set as MACHINE</para>
+			</parameter>
+			<parameter name="silenceThreshold" required="false">
+				<para>How long do we consider silence</para>
+			</parameter>
+			<parameter name="maximumWordLength" required="false">
+				<para>Is the maximum duration of a word to accept.</para>
+				<para>If exceeded set as MACHINE</para>
+			</parameter>
+		</syntax>
+		<description>
+			<para>This application attempts to detect answering machines at the beginning
+			of outbound calls. Simply call this application after the call
+			has been answered (outbound only, of course).</para>
+			<para>When loaded, AMD reads amd.conf and uses the parameters specified as
+			default values. Those default values get overwritten when the calling AMD
+			with parameters.</para>
+			<para>This application sets the following channel variables:</para>
+			<variablelist>
+				<variable name="AMDSTATUS">
+					<para>This is the status of the answering machine detection</para>
+					<value name="MACHINE" />
+					<value name="HUMAN" />
+					<value name="NOTSURE" />
+					<value name="HANGUP" />
+				</variable>
+				<variable name="AMDCAUSE">
+					<para>Indicates the cause that led to the conclusion</para>
+					<value name="TOOLONG">
+						Total Time.
+					</value>
+					<value name="INITIALSILENCE">
+						Silence Duration - Initial Silence.
+					</value>
+					<value name="HUMAN">
+						Silence Duration - afterGreetingSilence.
+					</value>
+					<value name="LONGGREETING">
+						Voice Duration - Greeting.
+					</value>
+					<value name="MAXWORDLENGTH">
+						Word Count - maximum number of words.
+					</value>	
+				</variable>
+			</variablelist>
+		</description>
+		<see-also>
+			<ref type="application">WaitForSilence</ref>
+			<ref type="application">WaitForNoise</ref>
+		</see-also>
+	</application>
+
+ ***/
 
 static char *app = "AMD";
-static char *synopsis = "Attempts to detect answering machines";
-static char *descrip =
-"  AMD([initialSilence],[greeting],[afterGreetingSilence],[totalAnalysisTime]\n"
-"      ,[minimumWordLength],[betweenWordsSilence],[maximumNumberOfWords]\n"
-"      ,[silenceThreshold],[|maximumWordLength])\n"
-"  This application attempts to detect answering machines at the beginning\n"
-"  of outbound calls.  Simply call this application after the call\n"
-"  has been answered (outbound only, of course).\n"
-"  When loaded, AMD reads amd.conf and uses the parameters specified as\n"
-"  default values. Those default values get overwritten when calling AMD\n"
-"  with parameters.\n"
-"- 'initialSilence' is the maximum silence duration before the greeting. If\n"
-"   exceeded then MACHINE.\n"
-"- 'greeting' is the maximum length of a greeting. If exceeded then MACHINE.\n"
-"- 'afterGreetingSilence' is the silence after detecting a greeting.\n"
-"   If exceeded then HUMAN.\n"
-"- 'totalAnalysisTime' is the maximum time allowed for the algorithm to decide\n"
-"   on a HUMAN or MACHINE.\n"
-"- 'minimumWordLength'is the minimum duration of Voice to considered as a word.\n"
-"- 'betweenWordsSilence' is the minimum duration of silence after a word to \n"
-"   consider the audio that follows as a new word.\n"
-"- 'maximumNumberOfWords'is the maximum number of words in the greeting. \n"
-"   If exceeded then MACHINE.\n"
-"- 'silenceThreshold' is the silence threshold.\n"
-"- 'maximumWordLength' is the maximum duration of a word to accept. If exceeded then MACHINE\n"
-"This application sets the following channel variables upon completion:\n"
-"    AMDSTATUS - This is the status of the answering machine detection.\n"
-"                Possible values are:\n"
-"                MACHINE | HUMAN | NOTSURE | HANGUP\n"
-"    AMDCAUSE - Indicates the cause that led to the conclusion.\n"
-"               Possible values are:\n"
-"               TOOLONG-<%d total_time>\n"
-"               INITIALSILENCE-<%d silenceDuration>-<%d initialSilence>\n"
-"               HUMAN-<%d silenceDuration>-<%d afterGreetingSilence>\n"
-"               MAXWORDS-<%d wordsCount>-<%d maximumNumberOfWords>\n"
-"               LONGGREETING-<%d voiceDuration>-<%d greeting>\n"
-"               MAXWORDLENGTH-<%d consecutiveVoiceDuration>\n";
 
 #define STATE_IN_WORD       1
 #define STATE_IN_SILENCE    2
@@ -433,7 +480,7 @@
 {
 	if (load_config(0))
 		return AST_MODULE_LOAD_DECLINE;
-	if (ast_register_application(app, amd_exec, synopsis, descrip))
+	if (ast_register_application_xml(app, amd_exec))
 		return AST_MODULE_LOAD_FAILURE;
 	return AST_MODULE_LOAD_SUCCESS;
 }

Modified: team/snuffy/ao2_jabber/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/snuffy/ao2_jabber/apps/app_authenticate.c?view=diff&rev=155507&r1=155506&r2=155507
==============================================================================
--- team/snuffy/ao2_jabber/apps/app_authenticate.c (original)
+++ team/snuffy/ao2_jabber/apps/app_authenticate.c Fri Nov  7 23:56:44 2008
@@ -54,29 +54,56 @@
 
 
 static char *app = "Authenticate";
-
-static char *synopsis = "Authenticate a user";
-
-static char *descrip =
-"  Authenticate(password[,options[,maxdigits]]): This application asks the caller\n"
-"to enter a given password in order to continue dialplan execution. If the password\n"
-"begins with the '/' character, it is interpreted as a file which contains a list of\n"
-"valid passwords, listed 1 password per line in the file.\n"
-"  When using a database key, the value associated with the key can be anything.\n"
-"Users have three attempts to authenticate before the channel is hung up.\n"
-"  Options:\n"
-"     a - Set the channels' account code to the password that is entered\n"
-"     d - Interpret the given path as database key, not a literal file\n"

[... 34718 lines stripped ...]

