Move provider plugins into a dedicated directory

Since we will introduce another type of plugin for the policy engine
we want to have each plugin type in separate directories.

We also have to adjust:

- plugin search directories
- po file location
- update paths for calls-doc target

doc/meson.build

@@ -26,7 +26,7 @@ gnome.gtkdoc('calls',
                        join_paths(meson.project_source_root(), 'src'),
                        join_paths(meson.project_build_root(), 'src'),
                        join_paths(meson.project_build_root(), 'src/dbus'),
-                       join_paths(meson.project_build_root(), 'plugins/ofono/libgdbofono'),
+                       join_paths(meson.project_build_root(), 'plugins/provider/ofono/libgdbofono'),
                      ],
        dependencies: calls_doc_deps,
           scan_args: [

plugins/meson.build

@@ -1,4 +1,4 @@
-subdir('mm')
-subdir('dummy')
-subdir('ofono')
-subdir('sip')
+subdir('provider/mm')
+subdir('provider/dummy')
+subdir('provider/ofono')
+subdir('provider/sip')

po/POTFILES.in

@@ -18,9 +18,9 @@ src/ui/history-box.ui
 src/ui/main-window.ui
 src/ui/new-call-box.ui
 src/ui/new-call-header-bar.ui
-plugins/mm/calls-mm-call.c
-plugins/mm/calls-mm-provider.c
-plugins/ofono/calls-ofono-provider.c
-plugins/sip/calls-sip-account-widget.c
-plugins/sip/calls-sip-call.c
-plugins/sip/sip-account-widget.ui
+plugins/provider/mm/calls-mm-call.c
+plugins/provider/mm/calls-mm-provider.c
+plugins/provider/ofono/calls-ofono-provider.c
+plugins/provider/sip/calls-sip-account-widget.c
+plugins/provider/sip/calls-sip-call.c
+plugins/provider/sip/sip-account-widget.ui

tests/test-manager.c

@@ -258,11 +258,14 @@ gint
 main (gint   argc,
       gchar *argv[])
 {
+  g_autofree char *plugin_dir_provider = NULL;
+
   gtk_test_init (&argc, &argv, NULL);
 
   /* Add builddir as search path */
 #ifdef PLUGIN_BUILDDIR
-  peas_engine_add_search_path (peas_engine_get_default (), PLUGIN_BUILDDIR, NULL);
+  plugin_dir_provider = g_build_filename (PLUGIN_BUILDDIR, "provider", NULL);
+  peas_engine_add_search_path (peas_engine_get_default (), plugin_dir_provider, NULL);
 #endif
 
   g_test_add_func("/Calls/Manager/without_provider", test_calls_manager_without_provider);

tests/test-plugins.c

@@ -46,11 +46,14 @@ gint
 main (gint   argc,
       gchar *argv[])
 {
+  g_autofree char *plugin_dir_provider = NULL;
+
   gtk_test_init (&argc, &argv, NULL);
 
   /* Add builddir as search path */
 #ifdef PLUGIN_BUILDDIR
-  peas_engine_add_search_path (peas_engine_get_default (), PLUGIN_BUILDDIR, NULL);
+  plugin_dir_provider = g_build_filename (PLUGIN_BUILDDIR, "provider", NULL);
+  peas_engine_add_search_path (peas_engine_get_default (), plugin_dir_provider, NULL);
 #endif
 
   g_test_add_func("/Calls/Plugins/load_plugins", test_calls_plugin_loading);