GNOME.org
 

[calls] Move provider plugins into a dedicated directory

commit 86a8f3ae22484eec791bf09ab82415484838d284
Author: Evangelos Ribeiro Tzaras <devrtz fortysixandtwo eu>
Date:   Sat Jul 16 22:16:24 2022 +0200

    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                                             |  2 +-
 plugins/meson.build                                         |  8 ++++----
 plugins/{ => provider}/dummy/calls-dummy-call.c             |  0
 plugins/{ => provider}/dummy/calls-dummy-call.h             |  0
 plugins/{ => provider}/dummy/calls-dummy-origin.c           |  0
 plugins/{ => provider}/dummy/calls-dummy-origin.h           |  0
 plugins/{ => provider}/dummy/calls-dummy-provider.c         |  0
 plugins/{ => provider}/dummy/calls-dummy-provider.h         |  0
 plugins/{ => provider}/dummy/dummy.plugin.in                |  0
 plugins/{ => provider}/dummy/meson.build                    |  0
 plugins/{ => provider}/mm/calls-mm-call.c                   |  0
 plugins/{ => provider}/mm/calls-mm-call.h                   |  0
 plugins/{ => provider}/mm/calls-mm-origin.c                 |  0
 plugins/{ => provider}/mm/calls-mm-origin.h                 |  0
 plugins/{ => provider}/mm/calls-mm-provider.c               |  0
 plugins/{ => provider}/mm/calls-mm-provider.h               |  0
 plugins/{ => provider}/mm/itu-e212-iso.h                    |  0
 plugins/{ => provider}/mm/meson.build                       |  0
 plugins/{ => provider}/mm/mm.plugin.in                      |  0
 plugins/{ => provider}/ofono/calls-ofono-call.c             |  0
 plugins/{ => provider}/ofono/calls-ofono-call.h             |  0
 plugins/{ => provider}/ofono/calls-ofono-origin.c           |  0
 plugins/{ => provider}/ofono/calls-ofono-origin.h           |  0
 plugins/{ => provider}/ofono/calls-ofono-provider.c         |  0
 plugins/{ => provider}/ofono/calls-ofono-provider.h         |  0
 plugins/{ => provider}/ofono/libgdbofono/call.xml           |  0
 plugins/{ => provider}/ofono/libgdbofono/dbus-introspect.sh |  0
 plugins/{ => provider}/ofono/libgdbofono/manager.xml        |  0
 plugins/{ => provider}/ofono/libgdbofono/meson.build        |  0
 plugins/{ => provider}/ofono/libgdbofono/modem-full.xml     |  0
 plugins/{ => provider}/ofono/libgdbofono/modem.xml          |  0
 plugins/{ => provider}/ofono/meson.build                    |  0
 plugins/{ => provider}/ofono/ofono.plugin.in                |  0
 plugins/{ => provider}/sip/calls-sdp-crypto-context.c       |  0
 plugins/{ => provider}/sip/calls-sdp-crypto-context.h       |  0
 plugins/{ => provider}/sip/calls-sip-account-widget.c       |  0
 plugins/{ => provider}/sip/calls-sip-account-widget.h       |  0
 plugins/{ => provider}/sip/calls-sip-call.c                 |  0
 plugins/{ => provider}/sip/calls-sip-call.h                 |  0
 plugins/{ => provider}/sip/calls-sip-media-manager.c        |  0
 plugins/{ => provider}/sip/calls-sip-media-manager.h        |  0
 plugins/{ => provider}/sip/calls-sip-media-pipeline.c       |  0
 plugins/{ => provider}/sip/calls-sip-media-pipeline.h       |  0
 plugins/{ => provider}/sip/calls-sip-origin.c               |  0
 plugins/{ => provider}/sip/calls-sip-origin.h               |  0
 plugins/{ => provider}/sip/calls-sip-provider.c             |  0
 plugins/{ => provider}/sip/calls-sip-provider.h             |  0
 plugins/{ => provider}/sip/calls-sip-util.c                 |  0
 plugins/{ => provider}/sip/calls-sip-util.h                 |  0
 plugins/{ => provider}/sip/calls-srtp-utils.c               |  0
 plugins/{ => provider}/sip/calls-srtp-utils.h               |  0
 plugins/{ => provider}/sip/gst-rfc3551.c                    |  0
 plugins/{ => provider}/sip/gst-rfc3551.h                    |  0
 plugins/{ => provider}/sip/meson.build                      |  0
 plugins/{ => provider}/sip/sip-account-widget.ui            |  0
 plugins/{ => provider}/sip/sip.gresources.xml               |  0
 plugins/{ => provider}/sip/sip.plugin.in                    |  0
 po/POTFILES.in                                              | 12 ++++++------
 tests/test-manager.c                                        |  5 ++++-
 tests/test-plugins.c                                        |  5 ++++-
 60 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/doc/meson.build b/doc/meson.build
index 39d6e8f5..09695b2e 100644
--- a/doc/meson.build
+++ b/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: [
diff --git a/plugins/meson.build b/plugins/meson.build
index dbda64f6..214ad1fe 100644
--- a/plugins/meson.build
+++ b/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')
diff --git a/plugins/dummy/calls-dummy-call.c b/plugins/provider/dummy/calls-dummy-call.c
similarity index 100%
rename from plugins/dummy/calls-dummy-call.c
rename to plugins/provider/dummy/calls-dummy-call.c
diff --git a/plugins/dummy/calls-dummy-call.h b/plugins/provider/dummy/calls-dummy-call.h
similarity index 100%
rename from plugins/dummy/calls-dummy-call.h
rename to plugins/provider/dummy/calls-dummy-call.h
diff --git a/plugins/dummy/calls-dummy-origin.c b/plugins/provider/dummy/calls-dummy-origin.c
similarity index 100%
rename from plugins/dummy/calls-dummy-origin.c
rename to plugins/provider/dummy/calls-dummy-origin.c
diff --git a/plugins/dummy/calls-dummy-origin.h b/plugins/provider/dummy/calls-dummy-origin.h
similarity index 100%
rename from plugins/dummy/calls-dummy-origin.h
rename to plugins/provider/dummy/calls-dummy-origin.h
diff --git a/plugins/dummy/calls-dummy-provider.c b/plugins/provider/dummy/calls-dummy-provider.c
similarity index 100%
rename from plugins/dummy/calls-dummy-provider.c
rename to plugins/provider/dummy/calls-dummy-provider.c
diff --git a/plugins/dummy/calls-dummy-provider.h b/plugins/provider/dummy/calls-dummy-provider.h
similarity index 100%
rename from plugins/dummy/calls-dummy-provider.h
rename to plugins/provider/dummy/calls-dummy-provider.h
diff --git a/plugins/dummy/dummy.plugin.in b/plugins/provider/dummy/dummy.plugin.in
similarity index 100%
rename from plugins/dummy/dummy.plugin.in
rename to plugins/provider/dummy/dummy.plugin.in
diff --git a/plugins/dummy/meson.build b/plugins/provider/dummy/meson.build
similarity index 100%
rename from plugins/dummy/meson.build
rename to plugins/provider/dummy/meson.build
diff --git a/plugins/mm/calls-mm-call.c b/plugins/provider/mm/calls-mm-call.c
similarity index 100%
rename from plugins/mm/calls-mm-call.c
rename to plugins/provider/mm/calls-mm-call.c
diff --git a/plugins/mm/calls-mm-call.h b/plugins/provider/mm/calls-mm-call.h
similarity index 100%
rename from plugins/mm/calls-mm-call.h
rename to plugins/provider/mm/calls-mm-call.h
diff --git a/plugins/mm/calls-mm-origin.c b/plugins/provider/mm/calls-mm-origin.c
similarity index 100%
rename from plugins/mm/calls-mm-origin.c
rename to plugins/provider/mm/calls-mm-origin.c
diff --git a/plugins/mm/calls-mm-origin.h b/plugins/provider/mm/calls-mm-origin.h
similarity index 100%
rename from plugins/mm/calls-mm-origin.h
rename to plugins/provider/mm/calls-mm-origin.h
diff --git a/plugins/mm/calls-mm-provider.c b/plugins/provider/mm/calls-mm-provider.c
similarity index 100%
rename from plugins/mm/calls-mm-provider.c
rename to plugins/provider/mm/calls-mm-provider.c
diff --git a/plugins/mm/calls-mm-provider.h b/plugins/provider/mm/calls-mm-provider.h
similarity index 100%
rename from plugins/mm/calls-mm-provider.h
rename to plugins/provider/mm/calls-mm-provider.h
diff --git a/plugins/mm/itu-e212-iso.h b/plugins/provider/mm/itu-e212-iso.h
similarity index 100%
rename from plugins/mm/itu-e212-iso.h
rename to plugins/provider/mm/itu-e212-iso.h
diff --git a/plugins/mm/meson.build b/plugins/provider/mm/meson.build
similarity index 100%
rename from plugins/mm/meson.build
rename to plugins/provider/mm/meson.build
diff --git a/plugins/mm/mm.plugin.in b/plugins/provider/mm/mm.plugin.in
similarity index 100%
rename from plugins/mm/mm.plugin.in
rename to plugins/provider/mm/mm.plugin.in
diff --git a/plugins/ofono/calls-ofono-call.c b/plugins/provider/ofono/calls-ofono-call.c
similarity index 100%
rename from plugins/ofono/calls-ofono-call.c
rename to plugins/provider/ofono/calls-ofono-call.c
diff --git a/plugins/ofono/calls-ofono-call.h b/plugins/provider/ofono/calls-ofono-call.h
similarity index 100%
rename from plugins/ofono/calls-ofono-call.h
rename to plugins/provider/ofono/calls-ofono-call.h
diff --git a/plugins/ofono/calls-ofono-origin.c b/plugins/provider/ofono/calls-ofono-origin.c
similarity index 100%
rename from plugins/ofono/calls-ofono-origin.c
rename to plugins/provider/ofono/calls-ofono-origin.c
diff --git a/plugins/ofono/calls-ofono-origin.h b/plugins/provider/ofono/calls-ofono-origin.h
similarity index 100%
rename from plugins/ofono/calls-ofono-origin.h
rename to plugins/provider/ofono/calls-ofono-origin.h
diff --git a/plugins/ofono/calls-ofono-provider.c b/plugins/provider/ofono/calls-ofono-provider.c
similarity index 100%
rename from plugins/ofono/calls-ofono-provider.c
rename to plugins/provider/ofono/calls-ofono-provider.c
diff --git a/plugins/ofono/calls-ofono-provider.h b/plugins/provider/ofono/calls-ofono-provider.h
similarity index 100%
rename from plugins/ofono/calls-ofono-provider.h
rename to plugins/provider/ofono/calls-ofono-provider.h
diff --git a/plugins/ofono/libgdbofono/call.xml b/plugins/provider/ofono/libgdbofono/call.xml
similarity index 100%
rename from plugins/ofono/libgdbofono/call.xml
rename to plugins/provider/ofono/libgdbofono/call.xml
diff --git a/plugins/ofono/libgdbofono/dbus-introspect.sh 
b/plugins/provider/ofono/libgdbofono/dbus-introspect.sh
similarity index 100%
rename from plugins/ofono/libgdbofono/dbus-introspect.sh
rename to plugins/provider/ofono/libgdbofono/dbus-introspect.sh
diff --git a/plugins/ofono/libgdbofono/manager.xml b/plugins/provider/ofono/libgdbofono/manager.xml
similarity index 100%
rename from plugins/ofono/libgdbofono/manager.xml
rename to plugins/provider/ofono/libgdbofono/manager.xml
diff --git a/plugins/ofono/libgdbofono/meson.build b/plugins/provider/ofono/libgdbofono/meson.build
similarity index 100%
rename from plugins/ofono/libgdbofono/meson.build
rename to plugins/provider/ofono/libgdbofono/meson.build
diff --git a/plugins/ofono/libgdbofono/modem-full.xml b/plugins/provider/ofono/libgdbofono/modem-full.xml
similarity index 100%
rename from plugins/ofono/libgdbofono/modem-full.xml
rename to plugins/provider/ofono/libgdbofono/modem-full.xml
diff --git a/plugins/ofono/libgdbofono/modem.xml b/plugins/provider/ofono/libgdbofono/modem.xml
similarity index 100%
rename from plugins/ofono/libgdbofono/modem.xml
rename to plugins/provider/ofono/libgdbofono/modem.xml
diff --git a/plugins/ofono/meson.build b/plugins/provider/ofono/meson.build
similarity index 100%
rename from plugins/ofono/meson.build
rename to plugins/provider/ofono/meson.build
diff --git a/plugins/ofono/ofono.plugin.in b/plugins/provider/ofono/ofono.plugin.in
similarity index 100%
rename from plugins/ofono/ofono.plugin.in
rename to plugins/provider/ofono/ofono.plugin.in
diff --git a/plugins/sip/calls-sdp-crypto-context.c b/plugins/provider/sip/calls-sdp-crypto-context.c
similarity index 100%
rename from plugins/sip/calls-sdp-crypto-context.c
rename to plugins/provider/sip/calls-sdp-crypto-context.c
diff --git a/plugins/sip/calls-sdp-crypto-context.h b/plugins/provider/sip/calls-sdp-crypto-context.h
similarity index 100%
rename from plugins/sip/calls-sdp-crypto-context.h
rename to plugins/provider/sip/calls-sdp-crypto-context.h
diff --git a/plugins/sip/calls-sip-account-widget.c b/plugins/provider/sip/calls-sip-account-widget.c
similarity index 100%
rename from plugins/sip/calls-sip-account-widget.c
rename to plugins/provider/sip/calls-sip-account-widget.c
diff --git a/plugins/sip/calls-sip-account-widget.h b/plugins/provider/sip/calls-sip-account-widget.h
similarity index 100%
rename from plugins/sip/calls-sip-account-widget.h
rename to plugins/provider/sip/calls-sip-account-widget.h
diff --git a/plugins/sip/calls-sip-call.c b/plugins/provider/sip/calls-sip-call.c
similarity index 100%
rename from plugins/sip/calls-sip-call.c
rename to plugins/provider/sip/calls-sip-call.c
diff --git a/plugins/sip/calls-sip-call.h b/plugins/provider/sip/calls-sip-call.h
similarity index 100%
rename from plugins/sip/calls-sip-call.h
rename to plugins/provider/sip/calls-sip-call.h
diff --git a/plugins/sip/calls-sip-media-manager.c b/plugins/provider/sip/calls-sip-media-manager.c
similarity index 100%
rename from plugins/sip/calls-sip-media-manager.c
rename to plugins/provider/sip/calls-sip-media-manager.c
diff --git a/plugins/sip/calls-sip-media-manager.h b/plugins/provider/sip/calls-sip-media-manager.h
similarity index 100%
rename from plugins/sip/calls-sip-media-manager.h
rename to plugins/provider/sip/calls-sip-media-manager.h
diff --git a/plugins/sip/calls-sip-media-pipeline.c b/plugins/provider/sip/calls-sip-media-pipeline.c
similarity index 100%
rename from plugins/sip/calls-sip-media-pipeline.c
rename to plugins/provider/sip/calls-sip-media-pipeline.c
diff --git a/plugins/sip/calls-sip-media-pipeline.h b/plugins/provider/sip/calls-sip-media-pipeline.h
similarity index 100%
rename from plugins/sip/calls-sip-media-pipeline.h
rename to plugins/provider/sip/calls-sip-media-pipeline.h
diff --git a/plugins/sip/calls-sip-origin.c b/plugins/provider/sip/calls-sip-origin.c
similarity index 100%
rename from plugins/sip/calls-sip-origin.c
rename to plugins/provider/sip/calls-sip-origin.c
diff --git a/plugins/sip/calls-sip-origin.h b/plugins/provider/sip/calls-sip-origin.h
similarity index 100%
rename from plugins/sip/calls-sip-origin.h
rename to plugins/provider/sip/calls-sip-origin.h
diff --git a/plugins/sip/calls-sip-provider.c b/plugins/provider/sip/calls-sip-provider.c
similarity index 100%
rename from plugins/sip/calls-sip-provider.c
rename to plugins/provider/sip/calls-sip-provider.c
diff --git a/plugins/sip/calls-sip-provider.h b/plugins/provider/sip/calls-sip-provider.h
similarity index 100%
rename from plugins/sip/calls-sip-provider.h
rename to plugins/provider/sip/calls-sip-provider.h
diff --git a/plugins/sip/calls-sip-util.c b/plugins/provider/sip/calls-sip-util.c
similarity index 100%
rename from plugins/sip/calls-sip-util.c
rename to plugins/provider/sip/calls-sip-util.c
diff --git a/plugins/sip/calls-sip-util.h b/plugins/provider/sip/calls-sip-util.h
similarity index 100%
rename from plugins/sip/calls-sip-util.h
rename to plugins/provider/sip/calls-sip-util.h
diff --git a/plugins/sip/calls-srtp-utils.c b/plugins/provider/sip/calls-srtp-utils.c
similarity index 100%
rename from plugins/sip/calls-srtp-utils.c
rename to plugins/provider/sip/calls-srtp-utils.c
diff --git a/plugins/sip/calls-srtp-utils.h b/plugins/provider/sip/calls-srtp-utils.h
similarity index 100%
rename from plugins/sip/calls-srtp-utils.h
rename to plugins/provider/sip/calls-srtp-utils.h
diff --git a/plugins/sip/gst-rfc3551.c b/plugins/provider/sip/gst-rfc3551.c
similarity index 100%
rename from plugins/sip/gst-rfc3551.c
rename to plugins/provider/sip/gst-rfc3551.c
diff --git a/plugins/sip/gst-rfc3551.h b/plugins/provider/sip/gst-rfc3551.h
similarity index 100%
rename from plugins/sip/gst-rfc3551.h
rename to plugins/provider/sip/gst-rfc3551.h
diff --git a/plugins/sip/meson.build b/plugins/provider/sip/meson.build
similarity index 100%
rename from plugins/sip/meson.build
rename to plugins/provider/sip/meson.build
diff --git a/plugins/sip/sip-account-widget.ui b/plugins/provider/sip/sip-account-widget.ui
similarity index 100%
rename from plugins/sip/sip-account-widget.ui
rename to plugins/provider/sip/sip-account-widget.ui
diff --git a/plugins/sip/sip.gresources.xml b/plugins/provider/sip/sip.gresources.xml
similarity index 100%
rename from plugins/sip/sip.gresources.xml
rename to plugins/provider/sip/sip.gresources.xml
diff --git a/plugins/sip/sip.plugin.in b/plugins/provider/sip/sip.plugin.in
similarity index 100%
rename from plugins/sip/sip.plugin.in
rename to plugins/provider/sip/sip.plugin.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5998e4be..14ee16bb 100644
--- a/po/POTFILES.in
+++ b/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
diff --git a/tests/test-manager.c b/tests/test-manager.c
index 3ef52cd3..b34a4606 100644
--- a/tests/test-manager.c
+++ b/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);
diff --git a/tests/test-plugins.c b/tests/test-plugins.c
index a26b63a1..39da6308 100644
--- a/tests/test-plugins.c
+++ b/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);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]