diff options
| author | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-19 21:07:49 +0000 |
|---|---|---|
| committer | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-19 21:07:49 +0000 |
| commit | b759835a90f073c926cd14c1ea0b1b65886c9172 (patch) | |
| tree | cf83670bfa579bddec4a254d9f6fc45e2a8a7829 /pbx | |
| parent | 46e384f88c5799ec199046c5bfc1b0957a7a5957 (diff) | |
Various updates from PCadach's chan_h323-live branch
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43294 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/pbx_ael.c | 3 | ||||
| -rw-r--r-- | pbx/pbx_gtkconsole.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index cbef91f6a..791a58c3c 100644 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -1056,6 +1056,7 @@ static void check_label(pval *item) The method: well, for each label, find the first label in the context with the same name. If it's not the current label, then throw an error. */ struct pval *curr; + struct pval *x; /* printf("==== check_label: ====\n"); */ if( !current_extension ) @@ -1063,7 +1064,7 @@ static void check_label(pval *item) else curr = current_extension; - struct pval *x = find_first_label_in_current_context((char *)item->u1.str, curr); + x = find_first_label_in_current_context((char *)item->u1.str, curr); /* printf("Hey, check_label found with item = %x, and x is %x, and currcont is %x, label name is %s\n", item,x, current_context, (char *)item->u1.str); */ if( x && x != item ) { diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c index 4dce4d28a..9f9a1899e 100644 --- a/pbx/pbx_gtkconsole.c +++ b/pbx/pbx_gtkconsole.c @@ -495,7 +495,7 @@ static int load_module(void *mod) } else { if (option_debug) ast_log(LOG_DEBUG, "Unable to start GTK console monitor -- ignoring\n"); - if (option_verbose > 1) + else if (option_verbose > 1) ast_verbose( VERBOSE_PREFIX_2 "GTK is not available -- skipping monitor\n"); } return 0; |