[svn-commits] russell: trunk r47392 - in /trunk: ./ apps/ build_tools/ channels/

[svn-commits at lists.digium.com]

Author: russell
Date: Thu Nov  9 15:32:27 2006
New Revision: 47392

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47392
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c
    trunk/build_tools/prep_moduledeps
    trunk/channels/chan_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=47392&r1=47391&r2=47392
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Thu Nov  9 15:32:27 2006
@@ -8765,6 +8765,10 @@
 }
 
 #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,

Modified: trunk/build_tools/prep_moduledeps
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/prep_moduledeps?view=diff&rev=47392&r1=47391&r2=47392
==============================================================================
--- trunk/build_tools/prep_moduledeps (original)
+++ trunk/build_tools/prep_moduledeps Thu Nov  9 15:32:27 2006
@@ -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() {

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=47392&r1=47391&r2=47392
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Thu Nov  9 15:32:27 2006
@@ -12694,6 +12694,10 @@
 	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