diff options
Diffstat (limited to 'src/plugin.c')
| -rw-r--r-- | src/plugin.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/plugin.c b/src/plugin.c index 017ebad5..979a6855 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -88,8 +88,7 @@ static gboolean check_plugin(struct ofono_plugin_desc *desc, return TRUE; } -#include "plugins/builtin.h" -#include "drivers/builtin.h" +#include "builtin.h" int __ofono_plugin_init(const char *pattern, const char *exclude) { @@ -101,20 +100,12 @@ int __ofono_plugin_init(const char *pattern, const char *exclude) DBG(""); - for (i = 0; __ofono_plugins[i]; i++) { - if (check_plugin(__ofono_plugins[i], + for (i = 0; __ofono_builtin[i]; i++) { + if (check_plugin(__ofono_builtin[i], pattern, exclude) == FALSE) continue; - add_plugin(NULL, __ofono_plugins[i]); - } - - for (i = 0; __ofono_drivers[i]; i++) { - if (check_plugin(__ofono_drivers[i], - pattern, exclude) == FALSE) - continue; - - add_plugin(NULL, __ofono_drivers[i]); + add_plugin(NULL, __ofono_builtin[i]); } dir = g_dir_open(PLUGINDIR, 0, NULL); |