summaryrefslogtreecommitdiff
path: root/pbx
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>1999-12-11 20:09:45 +0000
committerMark Spencer <markster@digium.com>1999-12-11 20:09:45 +0000
commit42d4c7991cc648294965070cc0f053a4611408e1 (patch)
treebb6f591206d4f084be79aa7a13122fde495ccbed /pbx
parent615a54d821f11f1da950b3756b3d80f86f88028d (diff)
Version 0.1.1 from FTP
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx')
-rwxr-xr-xpbx/Makefile4
-rwxr-xr-xpbx/pbx_config.c4
-rwxr-xr-xpbx/pbx_gtkconsole.c2
-rwxr-xr-xpbx/pbx_kdeconsole.cc2
-rwxr-xr-xpbx/pbx_kdeconsole.h2
-rwxr-xr-xpbx/pbx_kdeconsole_main.cc2
6 files changed, 8 insertions, 8 deletions
diff --git a/pbx/Makefile b/pbx/Makefile
index dc3ed708c..c32e8e686 100755
--- a/pbx/Makefile
+++ b/pbx/Makefile
@@ -3,7 +3,7 @@
#
# Makefile for PBX frontends (dynamically loaded)
#
-# Copyright (C) 1999, Adtran Inc. and Linux Support Services, LLC
+# Copyright (C) 1999, Mark Spencer
#
# Mark Spencer <markster@linux-support.net>
#
@@ -16,7 +16,7 @@
PBX_LIBS=pbx_config.so # pbx_gtkconsole.so pbx_kdeconsole.so
# Add GTK console if appropriate
-PBX_LIBS+=$(shell gtk-config --cflags >&/dev/null && echo "pbx_gtkconsole.so")
+PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
# Add KDE Console if appropriate
PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 359cec911..1468d8331 100755
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -3,7 +3,7 @@
*
* Populate and remember extensions from static config file
*
- * Copyright (C) 1999, Adtran Inc. and Linux Support Services, LLC
+ * Copyright (C) 1999, Mark Spencer
*
* Mark Spencer <markster@linux-support.net>
*
@@ -75,8 +75,8 @@ int load_module(void)
}
cxt = ast_category_browse(cfg, cxt);
}
+ ast_destroy(cfg);
}
- ast_destroy(cfg);
return 0;
}
diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c
index 04f72eeb3..1aefa4ca8 100755
--- a/pbx/pbx_gtkconsole.c
+++ b/pbx/pbx_gtkconsole.c
@@ -3,7 +3,7 @@
*
* GTK Console monitor -- very kludgy right now
*
- * Copyright (C) 1999, Adtran Inc. and Linux Support Services, LLC
+ * Copyright (C) 1999, Mark Spencer
*
* Mark Spencer <markster@linux-support.net>
*
diff --git a/pbx/pbx_kdeconsole.cc b/pbx/pbx_kdeconsole.cc
index e1d724178..6c2817366 100755
--- a/pbx/pbx_kdeconsole.cc
+++ b/pbx/pbx_kdeconsole.cc
@@ -3,7 +3,7 @@
*
* KDE Console monitor -- Class implmementation
*
- * Copyright (C) 1999, Adtran Inc. and Linux Support Services, LLC
+ * Copyright (C) 1999, Mark Spencer
*
* Mark Spencer <markster@linux-support.net>
*
diff --git a/pbx/pbx_kdeconsole.h b/pbx/pbx_kdeconsole.h
index e003e48f1..df73ab38e 100755
--- a/pbx/pbx_kdeconsole.h
+++ b/pbx/pbx_kdeconsole.h
@@ -3,7 +3,7 @@
*
* KDE Console monitor -- Header file
*
- * Copyright (C) 1999, Adtran Inc. and Linux Support Services, LLC
+ * Copyright (C) 1999, Mark Spencer
*
* Mark Spencer <markster@linux-support.net>
*
diff --git a/pbx/pbx_kdeconsole_main.cc b/pbx/pbx_kdeconsole_main.cc
index 7ddc74234..4ca3da5dd 100755
--- a/pbx/pbx_kdeconsole_main.cc
+++ b/pbx/pbx_kdeconsole_main.cc
@@ -3,7 +3,7 @@
*
* KDE Console monitor -- Mostly glue code
*
- * Copyright (C) 1999, Adtran Inc. and Linux Support Services, LLC
+ * Copyright (C) 1999, Mark Spencer
*
* Mark Spencer <markster@linux-support.net>
*