From 7af50a822d852bd09ec39a2e80cfea10ab25e63d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Thu, 12 Oct 2023 11:29:33 -0700
Subject: [PATCH] Make Parallel installable with GTK 3

---
 data/gresource.xml                                          | 2 +-
 data/meson.build                                            | 2 +-
 data/onlineaccounts.metainfo.xml.in                         | 4 ++--
 meson.build                                                 | 6 +++---
 ...s-plug.pot => io.elementary.settings.onlineaccounts.pot} | 0
 src/Plug.vala                                               | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename po/{online-accounts-plug.pot => io.elementary.settings.onlineaccounts.pot} (100%)

diff --git a/data/gresource.xml b/data/gresource.xml
index 1e7fafbde..c96be9ff3 100644
--- a/data/gresource.xml
+++ b/data/gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/io/elementary/switchboard/onlineaccounts">
+  <gresource prefix="/io/elementary/settings/onlineaccounts">
     <file alias="32x32/categories/onlineaccounts.svg" compressed="true" preprocess="xml-stripblanks">icons/32/onlineaccounts.svg</file>
     <file alias="32x32@2/categories/onlineaccounts.svg" compressed="true" preprocess="xml-stripblanks">icons/32/onlineaccounts.svg</file>
     <file alias="48x48/categories/onlineaccounts.svg" compressed="true" preprocess="xml-stripblanks">icons/48/onlineaccounts.svg</file>
diff --git a/data/meson.build b/data/meson.build
index 7bb79385a..48b178607 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,6 +1,6 @@
 i18n.merge_file(
     input: 'onlineaccounts.metainfo.xml.in',
-    output: 'io.elementary.switchboard.onlineaccounts.metainfo.xml',
+    output: 'io.elementary.settings.onlineaccounts.metainfo.xml',
     po_dir: meson.project_source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,
diff --git a/data/onlineaccounts.metainfo.xml.in b/data/onlineaccounts.metainfo.xml.in
index a6e85d1b1..c219ebb2d 100644
--- a/data/onlineaccounts.metainfo.xml.in
+++ b/data/onlineaccounts.metainfo.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
-  <id>io.elementary.switchboard.onlineaccounts</id>
-  <extends>io.elementary.switchboard</extends>
+  <id>io.elementary.settings.onlineaccounts</id>
+  <extends>io.elementary.settings</extends>
   <translation type="gettext">online-accounts-plug</translation>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
diff --git a/meson.build b/meson.build
index d54b25b59..95c4d10b8 100644
--- a/meson.build
+++ b/meson.build
@@ -1,10 +1,10 @@
 project(
-    'online-accounts',
+    'onlineaccounts',
     'vala', 'c',
     version: '6.5.3'
 )
 
-gettext_name = meson.project_name() + '-plug'
+gettext_name = 'io.elementary.settings.' + meson.project_name()
 gnome = import('gnome')
 i18n = import('i18n')
 
@@ -21,7 +21,7 @@ add_project_arguments(
 
 config_data = configuration_data()
 config_data.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
-config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name() + '-plug')
+config_data.set_quoted('GETTEXT_PACKAGE', gettext_name)
 config_file = configure_file(
     input: 'src/Config.vala.in',
     output: '@BASENAME@',
diff --git a/po/online-accounts-plug.pot b/po/io.elementary.settings.onlineaccounts.pot
similarity index 100%
rename from po/online-accounts-plug.pot
rename to po/io.elementary.settings.onlineaccounts.pot
diff --git a/src/Plug.vala b/src/Plug.vala
index d80e68bb8..81fdabbd9 100644
--- a/src/Plug.vala
+++ b/src/Plug.vala
@@ -26,7 +26,7 @@ public class OnlineAccounts.Plug : Switchboard.Plug {
         settings.set ("accounts/online", null);
         Object (
             category: Category.NETWORK,
-            code_name: "io.elementary.switchboard.onlineaccounts",
+            code_name: "io.elementary.settings.onlineaccounts",
             display_name: _("Online Accounts"),
             description: _("Manage online accounts and connected applications"),
             icon: "preferences-desktop-online-accounts",
@@ -36,7 +36,7 @@ public class OnlineAccounts.Plug : Switchboard.Plug {
 
     public override Gtk.Widget get_widget () {
         if (main_view == null) {
-            Gtk.IconTheme.get_for_display (Gdk.Display.get_default ()).add_resource_path ("/io/elementary/switchboard/onlineaccounts");
+            Gtk.IconTheme.get_for_display (Gdk.Display.get_default ()).add_resource_path ("/io/elementary/settings/onlineaccounts");
 
             main_view = new MainView ();
         }