[gnome-software/mwleeds/pwa-plugin: 3/4] fixup! Revive webapp support

[Phaedrus Leeds <mwleeds src gnome org>]

commit 65ef800dea9be796cd9b8cfc86bca44ed9ce756a
Author: Phaedrus Leeds <mwleeds protonmail com>
Date:   Thu Feb 3 13:10:03 2022 -0800

    fixup! Revive webapp support

 meson_options.txt                     | 2 +-
 plugins/epiphany/gs-plugin-epiphany.c | 8 +++++---
 plugins/epiphany/gs-self-test.c       | 1 +
 plugins/epiphany/meson.build          | 8 ++++----
 4 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/meson_options.txt b/meson_options.txt
index 27a844d50..d768fc3de 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,7 +9,7 @@ option('fwupd', type : 'boolean', value : true, description : 'enable fwupd supp
 option('flatpak', type : 'boolean', value : true, description : 'enable Flatpak support')
 option('malcontent', type : 'boolean', value : true, description : 'enable parental controls support using 
libmalcontent')
 option('rpm_ostree', type : 'boolean', value : false, description : 'enable rpm-ostree support')
-option('webapps', type : 'boolean', value : true, description : 'enable webapps support')
+option('webapps', type : 'boolean', value : false, description : 'enable webapps support')
 option('gudev', type : 'boolean', value : true, description : 'enable GUdev support')
 option('apt', type : 'boolean', value : false, description : 'enable apt: URL handler in the .desktop file')
 option('snap', type : 'boolean', value : false, description : 'enable Snap support')
diff --git a/plugins/epiphany/gs-plugin-epiphany.c b/plugins/epiphany/gs-plugin-epiphany.c
index 505669977..49b816e04 100644
--- a/plugins/epiphany/gs-plugin-epiphany.c
+++ b/plugins/epiphany/gs-plugin-epiphany.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  * vi:set noexpandtab tabstop=8 shiftwidth=8:
  *
- * Copyright (C) 2021 Matthew Leeds <mwleeds protonmail com>
+ * Copyright (C) 2021-2022 Matthew Leeds <mwleeds protonmail com>
  *
  * SPDX-License-Identifier: GPL-2.0+
  */
@@ -24,6 +24,8 @@
  * the DynamicLauncher portal is not available then it self-disables. This
  * should work with both Flatpak'd and not Flatpak'd Epiphany, for new enough
  * versions of Epiphany.
+ *
+ * Since: 42
  */
 
 struct _GsPluginEpiphany
@@ -125,8 +127,8 @@ setup_thread_cb (GTask        *task,
         */
        self->epiphany_proxy = gs_ephy_web_app_provider_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
                                                                                G_DBUS_PROXY_FLAGS_NONE,
-                                                                               
"org.gnome.Epiphany.WebAppProvider",
-                                                                               
"/org/gnome/Epiphany/WebAppProvider",
+                                                                               
"org.gnome.Epiphany.WebAppProvider1",
+                                                                               
"/org/gnome/Epiphany/WebAppProvider1",
                                                                                g_task_get_cancellable (task),
                                                                                &local_error);
        if (self->epiphany_proxy == NULL) {
diff --git a/plugins/epiphany/gs-self-test.c b/plugins/epiphany/gs-self-test.c
index 3615cf2d8..e8d76d534 100644
--- a/plugins/epiphany/gs-self-test.c
+++ b/plugins/epiphany/gs-self-test.c
@@ -2,6 +2,7 @@
  * vi:set noexpandtab tabstop=8 shiftwidth=8:
  *
  * Copyright (C) 2013-2017 Richard Hughes <richard hughsie com>
+ * Copyright (C) 2021 Matthew Leeds <mwleeds protonmail com>
  *
  * SPDX-License-Identifier: GPL-2.0+
  */
diff --git a/plugins/epiphany/meson.build b/plugins/epiphany/meson.build
index f7447c276..d73e1d1d5 100644
--- a/plugins/epiphany/meson.build
+++ b/plugins/epiphany/meson.build
@@ -20,8 +20,8 @@ shared_module(
   c_args : cargs,
   dependencies : plugin_libs,
   link_with : [
-    libgnomesoftware
-  ]
+    libgnomesoftware,
+  ],
 )
 metainfo = 'org.gnome.Software.Plugin.Epiphany.metainfo.xml'
 
@@ -31,7 +31,7 @@ i18n.merge_file(
   type: 'xml',
   po_dir: join_paths(meson.source_root(), 'po'),
   install: true,
-  install_dir: join_paths(get_option('datadir'), 'metainfo')
+  install_dir: join_paths(get_option('datadir'), 'metainfo'),
 )
 
 if get_option('tests')
@@ -42,7 +42,7 @@ if get_option('tests')
     'gs-self-test-epiphany',
     compiled_schemas,
     sources : [
-      'gs-self-test.c'
+      'gs-self-test.c',
     ],
     include_directories : [
       include_directories('../..'),