Make Parallel installable with GTK 3

elementary · Oct 12, 2023 · 7af50a8 · 7af50a8
1 parent 537d9a1
commit 7af50a8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → po/io.elementary.settings.onlineaccounts.pot b/po/online-accounts-plug.pot → po/io.elementary.settings.onlineaccounts.pot
diff --git 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 ();
         }