diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-11-09 21:32:27 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-11-09 21:32:27 +0000 |
| commit | 36793b730c2d21bc74c4e96cd2910be9d1b5cb3a (patch) | |
| tree | 2ea1a8b4c244c92c0ef9ae7de3a2ab63b05f109a | |
| parent | ead6c4655e13f1c2131b4b9d8046fb63aadf6aa3 (diff) | |
Merged revisions 47391 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47391 | russell | 2006-11-09 16:26:27 -0500 (Thu, 09 Nov 2006) | 7 lines
Work around an issue that caused menuselect to display a bogus description for
app_voicemail and chan_zap. These modules use some preprocessor directives to
determine what it will report to Asterisk as its description. However, the way
we extract this information from the source files for menuselect is not smart
enough to figure this out.
(issue #8326, #8328)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47392 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | apps/app_voicemail.c | 4 | ||||
| -rwxr-xr-x | build_tools/prep_moduledeps | 2 | ||||
| -rw-r--r-- | channels/chan_zap.c | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index b29381362..647170fa2 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -8765,6 +8765,10 @@ static void get_mailbox_delimiter(MAILSTREAM *stream) { } #endif /* IMAP_STORAGE */ + +/* This is a workaround so that menuselect displays a proper description + * AST_MODULE_INFO(, , "Comedian Mail (Voicemail System)" + */ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc, .load = load_module, diff --git a/build_tools/prep_moduledeps b/build_tools/prep_moduledeps index d6ea8aef6..93dc89675 100755 --- a/build_tools/prep_moduledeps +++ b/build_tools/prep_moduledeps @@ -1,7 +1,7 @@ #!/bin/sh get_description() { - TDESC=`grep -e AST_MODULE_INFO ${1} | cut -d '"' -f 2` + TDESC=`grep -m 1 -e AST_MODULE_INFO ${1} | cut -d '"' -f 2` } process_dir() { diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 6d0c9ccd2..13088f86d 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -12694,6 +12694,10 @@ static int reload(void) return 0; } +/* This is a workaround so that menuselect displays a proper description + * AST_MODULE_INFO(, , "Zapata Telephony" + */ + #ifdef ZAPATA_PRI #define tdesc "Zapata Telephony w/PRI" #else |