aboutsummaryrefslogtreecommitdiffstats
path: root/protocols
diff options
context:
space:
mode:
authorMarius Halden <marius.h@lden.org>2016-07-09 18:06:09 +0200
committerMarius Halden <marius.h@lden.org>2016-07-09 18:06:09 +0200
commitef9769c1e59dec5435670b507712c5fa9dfede67 (patch)
tree5654f07fad56346642b3ddf292aa1558ff574b17 /protocols
parent2f2fb6dda408ad2562cc754e2ca0ad3c2ea8bc8e (diff)
parentf60dc5cb68ac91df714f01ef61ba819eeac584aa (diff)
Merge branch 'master' into patched-master
Diffstat (limited to 'protocols')
-rw-r--r--protocols/purple/purple.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/protocols/purple/purple.c b/protocols/purple/purple.c
index 42963fc5..23183902 100644
--- a/protocols/purple/purple.c
+++ b/protocols/purple/purple.c
@@ -1590,6 +1590,10 @@ void purple_initmodule()
purple_util_set_user_dir(dir);
g_free(dir);
+ dir = g_strdup_printf("%s/purple", global.conf->plugindir);
+ purple_plugins_add_search_path(dir);
+ g_free(dir);
+
purple_debug_set_enabled(FALSE);
purple_core_set_ui_ops(&bee_core_uiops);
purple_eventloop_set_ui_ops(&glib_eventloops);