Changeset f60dc5c for protocols/purple/purple.c

Timestamp:

2016-07-09T01:01:15Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

9ae8f82

Parents:

7949d5a (diff), 60d6c03 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop'

File:

• protocols/purple/purple.c (modified) (1 diff)

protocols/purple/purple.c

@@ -1452 +1452 @@
         dir = g_strdup_printf("%s/purple", global.conf->configdir);
         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);