mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 20:08:17 +00:00
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 add searching for OpenAIS libraries in /usr/lib/openais if a path is not specified; not sure if this is really the optimal solution, but it works make the compiler shut up about some ignored function results in pbx_gtkconsole; this module is badly coded anyway git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126356 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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));
|
||||
|
||||
Reference in New Issue
Block a user