diff --git a/debian/control b/debian/control index 64c861b..2ced400 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Build-Depends: libgtk-3-dev, libgtk-3-doc , libmm-glib-dev (>= 1.12.0), - libpeas-dev, + libpeas-2-dev, librsvg2-common, libsecret-1-dev, libsofia-sip-ua-glib-dev, diff --git a/org.gnome.Calls.json b/org.gnome.Calls.json index 44d3d0e..2893d9f 100644 --- a/org.gnome.Calls.json +++ b/org.gnome.Calls.json @@ -52,7 +52,7 @@ ] }, { - "name" : "libpeas", + "name" : "libpeas-2", "buildsystem" : "meson", "config-opts" : [ "-Ddemos=false", @@ -64,8 +64,8 @@ "sources" : [ { "type" : "archive", - "url" : "https://download.gnome.org/sources/libpeas/1.34/libpeas-1.34.0.tar.xz", - "sha256": "4305f715dab4b5ad3e8007daec316625e7065a94e63e25ef55eb1efb964a7bf0" + "url" : "https://download.gnome.org/sources/libpeas/2.0/libpeas-2.0.3.tar.xz", + "sha256": "39e3b507c29d2d01df1345e9b3380fd7a9d0aeb5b2e657d38e6c2bea5023e5f0" } ] }, diff --git a/plugins/provider/dummy/calls-dummy-provider.c b/plugins/provider/dummy/calls-dummy-provider.c index 6105677..e67a47d 100644 --- a/plugins/provider/dummy/calls-dummy-provider.c +++ b/plugins/provider/dummy/calls-dummy-provider.c @@ -29,7 +29,7 @@ #include "calls-provider.h" #include "calls-dummy-origin.h" -#include +#include #include static const char * const supported_protocols[] = { diff --git a/plugins/provider/dummy/calls-dummy-provider.h b/plugins/provider/dummy/calls-dummy-provider.h index f94996e..94db970 100644 --- a/plugins/provider/dummy/calls-dummy-provider.h +++ b/plugins/provider/dummy/calls-dummy-provider.h @@ -28,7 +28,7 @@ #include "calls-provider.h" #include -#include +#include G_BEGIN_DECLS diff --git a/plugins/provider/dummy/meson.build b/plugins/provider/dummy/meson.build index 5ad89a1..a65c75e 100644 --- a/plugins/provider/dummy/meson.build +++ b/plugins/provider/dummy/meson.build @@ -45,7 +45,7 @@ i18n_plugin = i18n.merge_file( dummy_deps = [ dependency('gobject-2.0'), dependency('gtk4', version: '>= @0@'.format(gtk_version)), - dependency('libpeas-1.0'), + dependency('libpeas-2'), ] dummy_sources = files( diff --git a/plugins/provider/mm/calls-mm-provider.c b/plugins/provider/mm/calls-mm-provider.c index c856477..2264acb 100644 --- a/plugins/provider/mm/calls-mm-provider.c +++ b/plugins/provider/mm/calls-mm-provider.c @@ -31,7 +31,7 @@ #include "calls-origin.h" #include -#include +#include #include static const char * const supported_protocols[] = { diff --git a/plugins/provider/mm/calls-mm-provider.h b/plugins/provider/mm/calls-mm-provider.h index a6351c1..278cfca 100644 --- a/plugins/provider/mm/calls-mm-provider.h +++ b/plugins/provider/mm/calls-mm-provider.h @@ -29,7 +29,7 @@ #include #include -#include +#include G_BEGIN_DECLS diff --git a/plugins/provider/mm/meson.build b/plugins/provider/mm/meson.build index 9bc163a..e374a5f 100644 --- a/plugins/provider/mm/meson.build +++ b/plugins/provider/mm/meson.build @@ -45,7 +45,7 @@ mm_deps = [ dependency('gtk4', version: '>= @0@'.format(gtk_version)), dependency('ModemManager'), dependency('mm-glib', version: '>= 1.12.0'), - dependency('libpeas-1.0'), + dependency('libpeas-2'), ] mm_sources = files( diff --git a/plugins/provider/ofono/calls-ofono-provider.c b/plugins/provider/ofono/calls-ofono-provider.c index b9b187b..3c7768e 100644 --- a/plugins/provider/ofono/calls-ofono-provider.c +++ b/plugins/provider/ofono/calls-ofono-provider.c @@ -34,7 +34,7 @@ #include #include -#include +#include static const char * const supported_protocols[] = { "tel", diff --git a/plugins/provider/ofono/calls-ofono-provider.h b/plugins/provider/ofono/calls-ofono-provider.h index d703771..a2212df 100644 --- a/plugins/provider/ofono/calls-ofono-provider.h +++ b/plugins/provider/ofono/calls-ofono-provider.h @@ -29,7 +29,7 @@ #include #include -#include +#include G_BEGIN_DECLS diff --git a/plugins/provider/ofono/meson.build b/plugins/provider/ofono/meson.build index 87d193b..4a32ab0 100644 --- a/plugins/provider/ofono/meson.build +++ b/plugins/provider/ofono/meson.build @@ -44,7 +44,7 @@ i18n_plugin = i18n.merge_file( ofono_deps = [ dependency('gobject-2.0'), dependency('gtk4', version: '>= @0@'.format(gtk_version)), - dependency('libpeas-1.0'), + dependency('libpeas-2'), ] ofono_sources = files( diff --git a/plugins/provider/sip/calls-sip-provider.c b/plugins/provider/sip/calls-sip-provider.c index f4e6cf2..8149f0c 100644 --- a/plugins/provider/sip/calls-sip-provider.c +++ b/plugins/provider/sip/calls-sip-provider.c @@ -40,7 +40,7 @@ #include "calls-sip-util.h" #include "calls-util.h" -#include +#include #include #include diff --git a/plugins/provider/sip/calls-sip-provider.h b/plugins/provider/sip/calls-sip-provider.h index d3b8313..a5343ae 100644 --- a/plugins/provider/sip/calls-sip-provider.h +++ b/plugins/provider/sip/calls-sip-provider.h @@ -28,7 +28,7 @@ #include "calls-sip-origin.h" #include -#include +#include G_BEGIN_DECLS diff --git a/plugins/provider/sip/meson.build b/plugins/provider/sip/meson.build index be3034d..5064bf3 100644 --- a/plugins/provider/sip/meson.build +++ b/plugins/provider/sip/meson.build @@ -47,7 +47,7 @@ sip_deps = [ dependency('gstreamer-1.0'), dependency('gtk4'), dependency('libadwaita-1', version: '>= 1.4'), - dependency('libpeas-1.0'), + dependency('libpeas-2'), dependency('sofia-sip-ua-glib'), dependency('libsecret-1'), ] diff --git a/plugins/provider/tests/test-sip.c b/plugins/provider/tests/test-sip.c index 185d372..1c594ce 100644 --- a/plugins/provider/tests/test-sip.c +++ b/plugins/provider/tests/test-sip.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include typedef struct { CallsSipProvider *provider; diff --git a/src/calls-manager.c b/src/calls-manager.c index a26a9af..67a2412 100644 --- a/src/calls-manager.c +++ b/src/calls-manager.c @@ -41,7 +41,7 @@ #include "enum-types.h" #include -#include +#include #define LIBFEEDBACK_USE_UNSTABLE_API #include diff --git a/src/calls-plugin-manager.c b/src/calls-plugin-manager.c index 6a6458d..774473b 100644 --- a/src/calls-plugin-manager.c +++ b/src/calls-plugin-manager.c @@ -30,7 +30,7 @@ #include "calls-plugin-manager.h" #include "calls-util.h" -#include +#include /** * SECTION:plugin-manager @@ -217,6 +217,7 @@ calls_plugin_manager_init (CallsPluginManager *self) { g_autofree char *default_plugin_dir_provider = NULL; const char *dir; + uint n_plugins; self->plugin_engine = peas_engine_new (); @@ -228,7 +229,7 @@ calls_plugin_manager_init (CallsPluginManager *self) if (g_file_test (plugin_dir_provider, G_FILE_TEST_EXISTS)) { g_debug ("Adding '%s' to plugin search path", plugin_dir_provider); - peas_engine_prepend_search_path (self->plugin_engine, plugin_dir_provider, NULL); + peas_engine_add_search_path (self->plugin_engine, plugin_dir_provider, NULL); } else { g_warning ("Not adding '%s' to plugin search path, because the directory doesn't exist.\n" "Check if env CALLS_PLUGIN_DIR is set correctly", plugin_dir_provider); @@ -245,8 +246,11 @@ calls_plugin_manager_init (CallsPluginManager *self) self->providers = g_list_store_new (CALLS_TYPE_PROVIDER); - for (const GList *node = peas_engine_get_plugin_list (self->plugin_engine); node; node = node->next) { - PeasPluginInfo *info = node->data; + n_plugins = g_list_model_get_n_items (G_LIST_MODEL (self->plugin_engine)); + + for (uint i = 0; i < n_plugins; i++) { + g_autoptr (PeasPluginInfo) info = + g_list_model_get_item (G_LIST_MODEL (self->plugin_engine), i); CallsPlugin *plugin = calls_plugin_new (info); g_debug ("Created plugin '%s', found in '%s'", diff --git a/src/calls-plugin.c b/src/calls-plugin.c index e8859bb..a79dcae 100644 --- a/src/calls-plugin.c +++ b/src/calls-plugin.c @@ -67,7 +67,7 @@ calls_plugin_set_property (GObject *object, switch (prop_id) { case PROP_PLUGIN_INFO: - self->info = g_value_get_boxed (value); + self->info = g_value_get_object (value); break; default: @@ -146,7 +146,7 @@ calls_plugin_class_init (CallsPluginClass *klass) * The #PeasPluginInfo containing information about the plugin */ props[PROP_PLUGIN_INFO] = - g_param_spec_boxed ("plugin-info", + g_param_spec_object ("plugin-info", "", "", PEAS_TYPE_PLUGIN_INFO, @@ -264,7 +264,7 @@ calls_plugin_load (CallsPlugin *self, GError **error) { PeasEngine *peas = peas_engine_get_default (); - PeasExtension *extension; + GObject *extension; g_return_val_if_fail (CALLS_IS_PLUGIN (self), FALSE); @@ -384,7 +384,7 @@ calls_plugin_get_description (CallsPlugin *self) } -const char ** +const char * const * calls_plugin_get_authors (CallsPlugin *self) { g_return_val_if_fail (CALLS_IS_PLUGIN (self), NULL); diff --git a/src/calls-plugin.h b/src/calls-plugin.h index 01bb661..af5d813 100644 --- a/src/calls-plugin.h +++ b/src/calls-plugin.h @@ -25,7 +25,7 @@ #include "calls-provider.h" -#include +#include G_BEGIN_DECLS @@ -44,7 +44,7 @@ CallsProvider *calls_plugin_get_provider (CallsPlugin *self); const char *calls_plugin_get_module_name (CallsPlugin *self); const char *calls_plugin_get_name (CallsPlugin *self); const char *calls_plugin_get_description (CallsPlugin *self); -const char **calls_plugin_get_authors (CallsPlugin *self); +const char* const *calls_plugin_get_authors (CallsPlugin *self); const char *calls_plugin_get_copyright (CallsPlugin *self); const char *calls_plugin_get_version (CallsPlugin *self); diff --git a/src/calls-provider.c b/src/calls-provider.c index cac7be2..64aa8cc 100644 --- a/src/calls-provider.c +++ b/src/calls-provider.c @@ -31,7 +31,7 @@ #include "calls-util.h" #include -#include +#include /** * SECTION:calls-provider diff --git a/src/meson.build b/src/meson.build index caf0e6b..498eaf8 100644 --- a/src/meson.build +++ b/src/meson.build @@ -29,11 +29,11 @@ subdir('dbus') src_include = include_directories('.') calls_includes = [ top_include, src_include ] -calls_deps = [ dependency('gobject-2.0', version: '>= 2.58'), +calls_deps = [ dependency('gobject-2.0', version: '>= 2.74'), dependency('gtk4', version: '>= @0@'.format(gtk_version)), dependency('libadwaita-1', version: '>= 1.4'), dependency('libfeedback-0.0'), - dependency('libpeas-1.0'), + dependency('libpeas-2'), dependency('gom-1.0'), dependency('libebook-contacts-1.2'), dependency('folks'),