summaryrefslogtreecommitdiff
path: root/src/plugin.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-08-20 23:35:50 -0700
committerMarcel Holtmann <marcel@holtmann.org>2009-08-20 23:35:50 -0700
commitf21f133fe7684161d8ac76a183f8dee2766e2a33 (patch)
tree908fe5c36ca147901f37f59dc5384e408a7f125c /src/plugin.c
parent698ee42ab0f11aa7b2bfa4807ed200c9a8b59af1 (diff)
downloadbluez-f21f133fe7684161d8ac76a183f8dee2766e2a33.tar.gz
Check PLUGINDIR after loading the builtin plugins
Diffstat (limited to 'src/plugin.c')
-rw-r--r--src/plugin.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugin.c b/src/plugin.c
index 706a14f22..b48f1ce98 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -116,9 +116,6 @@ gboolean plugin_init(GKeyFile *config)
gchar **disabled;
unsigned int i;
- if (strlen(PLUGINDIR) == 0)
- return FALSE;
-
/* Make a call to BtIO API so its symbols got resolved before the
* plugins are loaded. */
bt_io_error_quark();
@@ -140,6 +137,9 @@ gboolean plugin_init(GKeyFile *config)
add_plugin(NULL, __bluetooth_builtin[i]);
}
+ if (strlen(PLUGINDIR) == 0)
+ return FALSE;
+
debug("Loading plugins %s", PLUGINDIR);
dir = g_dir_open(PLUGINDIR, 0, NULL);