[svn-commits] russell: branch 1.4 r120371 - /branches/1.4/pbx/pbx_config.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Jun  4 11:26:43 2008
New Revision: 120371

URL: http://svn.digium.com/view/asterisk?view=rev&rev=120371
Log:
Make the "dialplan remove include" CLI command actually work.  Also, tweak
some formatting, and make the success message a little bit more clear.
(closes AST-52)

Modified:
    branches/1.4/pbx/pbx_config.c

Modified: branches/1.4/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/pbx/pbx_config.c?view=diff&rev=120371&r1=120370&r2=120371
==============================================================================
--- branches/1.4/pbx/pbx_config.c (original)
+++ branches/1.4/pbx/pbx_config.c Wed Jun  4 11:26:43 2008
@@ -135,20 +135,23 @@
 
 static int handle_context_remove_include(int fd, int argc, char *argv[])
 {
-	if (argc != 6)
+	if (argc != 6) {
 		return RESULT_SHOWUSAGE;
-
-	if (strcmp(argv[4], "into"))
+	}
+
+	if (strcmp(argv[4], "from")) {
 		return RESULT_SHOWUSAGE;
+	}
 
 	if (!ast_context_remove_include(argv[5], argv[3], registrar)) {
-		ast_cli(fd, "We are not including '%s' into '%s' now\n",
+		ast_cli(fd, "The dialplan no longer includes '%s' into '%s'\n",
 			argv[3], argv[5]);
 		return RESULT_SUCCESS;
 	}
 
 	ast_cli(fd, "Failed to remove '%s' include from '%s' context\n",
 		argv[3], argv[5]);
+
 	return RESULT_FAILURE;
 }