Merged revisions 126356 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r126356 | kpfleming | 2008-06-29 09:19:29 -0700 (Sun, 29 Jun 2008) | 9 lines

various minor fixes created while i worked on getting *every* Asterisk module to build on laptop in dev mode:

remove weird pre-setting of LUA paths; they are not necessary; also use the proper path for including the files in pbx_lua.c

make the compiler shut up about some ignored function results in pbx_gtkconsole; this module is badly coded anyway


........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@126363 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 6 insertions, 2 deletions

diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c
index a12e139bb..b7846d3ba 100644
--- a/pbx/pbx_gtkconsole.c
+++ b/pbx/pbx_gtkconsole.c
@@ -307,11 +307,13 @@ static int mod_update(void)
 
 static void exit_now(GtkWidget *widget, gpointer data)
 {
+	int res;
+
 	ast_loader_unregister(mod_update);
 	gtk_main_quit();
 	inuse--;
 	ast_update_use_count();
-	ast_unregister_verbose(verboser);
+	res = ast_unregister_verbose(verboser);
 	ast_unload_resource("pbx_gtkconsole", 0);
 	ast_verb(2, "GTK Console Monitor Exiting\n");
 	/* XXX Trying to quit after calling this makes asterisk segfault XXX */
@@ -361,6 +363,8 @@ static int show_console(void)
 	GtkWidget *sw;
 	GtkWidget *bbox, *hbbox, *add, *removew, *reloadw;
 	char *modtitles[3] = { "Module", "Description", "Use Count" };
+	int res;
+
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	
 	statusbar = gtk_statusbar_new();
@@ -465,7 +469,7 @@ static int show_console(void)
 	ast_pthread_create(&console_thread, NULL, consolethread, NULL);
 	/* XXX Okay, seriously fix me! XXX */
 	usleep(100000);
-	ast_register_verbose(verboser);
+	res = ast_register_verbose(verboser);
 	gtk_clist_freeze(GTK_CLIST(verb));
 	ast_loader_register(mod_update);
 	gtk_clist_thaw(GTK_CLIST(verb));