diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2001-04-23 16:50:12 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2001-04-23 16:50:12 +0000 |
| commit | 1f9a30535942c9b35212651b7346f33824eaf55c (patch) | |
| tree | 0b2425622e165dbcc8d23d4a4d14320382ad7fd0 /pbx | |
| parent | 738216b6a341fc60a581ed8cbdf62090321b4037 (diff) | |
Version 0.1.8 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@294 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rwxr-xr-x | pbx/pbx_gtkconsole.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c index f8f233cf8..5d3f05773 100755 --- a/pbx/pbx_gtkconsole.c +++ b/pbx/pbx_gtkconsole.c @@ -124,10 +124,10 @@ static void __verboser(char *stuff, int opos, int replacelast, int complete) static void verboser(char *stuff, int opos, int replacelast, int complete) { - pthread_mutex_lock(&verb_lock); + ast_pthread_mutex_lock(&verb_lock); /* Lock appropriately if we're really being called in verbose mode */ __verboser(stuff, opos, replacelast, complete); - pthread_mutex_unlock(&verb_lock); + ast_pthread_mutex_unlock(&verb_lock); } static void cliinput(void *data, int source, GdkInputCondition ic) @@ -297,7 +297,7 @@ static void exit_now(GtkWidget *widget, gpointer data) ast_unload_resource("pbx_gtkconsole", 0); if (option_verbose > 1) ast_verbose(VERBOSE_PREFIX_2 "GTK Console Monitor Exiting\n"); - + /* XXX Trying to quit after calling this makes asterisk segfault XXX */ } static void exit_completely(GtkWidget *widget, gpointer data) @@ -467,8 +467,6 @@ int load_module(void) } g_thread_init(NULL); if (gtk_init_check(NULL, NULL)) { - /* XXX Do we need to call this twice? XXX */ - gtk_init(NULL, NULL); if (!show_console()) { inuse++; ast_update_use_count(); |