[Asterisk-cvs] asterisk/apps app_voicemail.c,1.55.2.6,1.55.2.7

[malcolmd at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv7360/apps

Modified Files:
      Tag: v1-0_stable
	app_voicemail.c 
Log Message:
Bug # 1179: Remove "show voicemail users" when MYSQL VM is enabled


Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.55.2.6
retrieving revision 1.55.2.7
diff -u -d -r1.55.2.6 -r1.55.2.7
--- app_voicemail.c	11 Mar 2004 07:01:08 -0000	1.55.2.6
+++ app_voicemail.c	19 Mar 2004 21:46:13 -0000	1.55.2.7
@@ -3045,6 +3045,7 @@
 	return 0;
 }
 
+#ifndef USEMYSQLVM
 /* XXX TL Bug 690 */
 static char show_voicemail_users_help[] =
 "Usage: show voicemail users [for <context>]\n"
@@ -3166,7 +3167,7 @@
 	{ { "show", "voicemail", "zones", NULL },
 	handle_show_voicemail_zones, "List zone message formats",
 	show_voicemail_zones_help, NULL };
-
+#endif
 
 static int load_config(void)
 {
@@ -3410,8 +3411,10 @@
 	res |= ast_unregister_application(app2);
 	res |= ast_unregister_application(capp2);
 	sql_close();
+#ifndef USEMYSQLVM
 	ast_cli_unregister(&show_voicemail_users_cli);
 	ast_cli_unregister(&show_voicemail_zones_cli);
+#endif
 	return res;
 }
 
@@ -3433,8 +3436,10 @@
 		ast_log(LOG_WARNING, "SQL init\n");
 		return res;
 	}
+#ifndef USEMYSQLVM
 	ast_cli_register(&show_voicemail_users_cli);
 	ast_cli_register(&show_voicemail_zones_cli);
+#endif
 	return res;
 }