diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-09 21:26:27 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-09 21:26:27 +0000 |
| commit | e34ce54a05609fd159b06dbfc7c8fbcfb46ca1ff (patch) | |
| tree | 89aa9d54c8d09c4363ca220e2fd547301aad0d47 | |
| parent | 863c817196d4f0d9e14c97eb637a4460add42f55 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@47391 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 149ba73a9..150319983 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -8649,6 +8649,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 9ab10e593..b035ec4d6 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -11354,6 +11354,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 |