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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index b293813..647170f 100644 (file)
--- 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 d6ea8ae..93dc896 100755 (executable)
--- 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 6d0c9cc..13088f8 100644 (file)
--- 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