diff options
| author | Marius Halden <marius.h@lden.org> | 2017-09-06 14:14:40 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2017-09-06 14:14:40 +0200 |
| commit | f849ef86076ed17c9dbaeeb425dba084dc9c52ba (patch) | |
| tree | 952526fbf44e27a45eec14b0f4ceb03eead0cd67 /protocols/purple/purple.c | |
| parent | 9bc82d46e26ecd4947c3ee840d3e1e2dcc655640 (diff) | |
| parent | ad66dcd65ee6e84f25fdb46956df0ad3041d0ced (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'protocols/purple/purple.c')
| -rw-r--r-- | protocols/purple/purple.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/protocols/purple/purple.c b/protocols/purple/purple.c index 64faadfb..25cd00cf 100644 --- a/protocols/purple/purple.c +++ b/protocols/purple/purple.c @@ -1808,6 +1808,7 @@ void purple_initmodule() GList *prots; GString *help; char *dir; + gboolean debug_enabled = !!getenv("BITLBEE_DEBUG"); if (purple_get_core() != NULL) { log_message(LOGLVL_ERROR, "libpurple already initialized. " @@ -1826,7 +1827,7 @@ void purple_initmodule() purple_plugins_add_search_path(dir); g_free(dir); - purple_debug_set_enabled(FALSE); + purple_debug_set_enabled(debug_enabled); purple_core_set_ui_ops(&bee_core_uiops); purple_eventloop_set_ui_ops(&glib_eventloops); if (!purple_core_init("BitlBee")) { @@ -1834,6 +1835,7 @@ void purple_initmodule() fprintf(stderr, "libpurple initialization failed.\n"); abort(); } + purple_debug_set_enabled(FALSE); if (proxytype != PROXY_NONE) { PurpleProxyInfo *pi = purple_global_proxy_get_info(); |