From 19456609129b2ae4e1c830965a3233229cf96cf9 Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Fri, 22 Jul 2022 12:22:59 -0700
Subject: [PATCH] build: move application id to org.gnome.Sysprof

We use org.gnome.Sysprof3 for the sysprofd daemon, but we need not
complicate the application with such an application id.
---
 data/meson.build                                          | 8 ++++----
 ...prof3.appdata.xml.in => org.gnome.Sysprof.appdata.xml} | 8 +++-----
 ...e.Sysprof3.desktop.in => org.gnome.Sysprof.desktop.in} | 0
 src/libsysprof-ui/sysprof-counters-aid.c                  | 4 ++--
 src/sysprof/sysprof-application.c                         | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)
 rename data/{org.gnome.Sysprof3.appdata.xml.in => org.gnome.Sysprof.appdata.xml} (84%)
 rename data/{org.gnome.Sysprof3.desktop.in => org.gnome.Sysprof.desktop.in} (100%)

diff --git a/data/meson.build b/data/meson.build
index 86a65a5f..b8c44e1f 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -8,16 +8,16 @@ if get_option('gtk') and get_option('libsysprof')
   )
 
   i18n.merge_file(
-            input: 'org.gnome.Sysprof3.appdata.xml.in',
-           output: 'org.gnome.Sysprof3.appdata.xml',
+            input: 'org.gnome.Sysprof.appdata.xml.in',
+           output: 'org.gnome.Sysprof.appdata.xml',
            po_dir: podir,
           install: true,
       install_dir: join_paths(datadir, 'metainfo')
   )
 
   i18n.merge_file(
-            input: 'org.gnome.Sysprof3.desktop.in',
-           output: 'org.gnome.Sysprof3.desktop',
+            input: 'org.gnome.Sysprof.desktop.in',
+           output: 'org.gnome.Sysprof.desktop',
              type: 'desktop',
            po_dir: podir,
           install: true,
diff --git a/data/org.gnome.Sysprof3.appdata.xml.in b/data/org.gnome.Sysprof.appdata.xml
similarity index 84%
rename from data/org.gnome.Sysprof3.appdata.xml.in
rename to data/org.gnome.Sysprof.appdata.xml
index d002a426..586a85ab 100644
--- a/data/org.gnome.Sysprof3.appdata.xml.in
+++ b/data/org.gnome.Sysprof.appdata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>org.gnome.Sysprof3.desktop</id>
+  <id>org.gnome.Sysprof.desktop</id>
   <translation type="gettext">sysprof</translation>
   <name>Sysprof</name>
   <summary>Profile an application or entire system</summary>
@@ -31,16 +31,14 @@
 
   <provides>
     <binary>sysprof</binary>
+    <binary>sysprof-agent</binary>
     <binary>sysprof-cli</binary>
     <dbus type="system">org.gnome.Sysprof2</dbus>
     <dbus type="system">org.gnome.Sysprof3</dbus>
   </provides>
 
   <releases>
-    <release version="3.44.0" date="2022-03-18"/>
-    <release version="3.43.90" date="2022-03-07"/>
-    <release version="3.42.1" date="2021-11-04"/>
-    <release version="3.42.0" date="2021-09-21"/>
+    <release version="3.45.0" date="2022-07-11"/>
   </releases>
 
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/data/org.gnome.Sysprof3.desktop.in b/data/org.gnome.Sysprof.desktop.in
similarity index 100%
rename from data/org.gnome.Sysprof3.desktop.in
rename to data/org.gnome.Sysprof.desktop.in
diff --git a/src/libsysprof-ui/sysprof-counters-aid.c b/src/libsysprof-ui/sysprof-counters-aid.c
index c1d855bb..42bd04f0 100644
--- a/src/libsysprof-ui/sysprof-counters-aid.c
+++ b/src/libsysprof-ui/sysprof-counters-aid.c
@@ -279,6 +279,6 @@ sysprof_counters_aid_class_init (SysprofCountersAidClass *klass)
 static void
 sysprof_counters_aid_init (SysprofCountersAid *self)
 {
-  sysprof_aid_set_display_name (SYSPROF_AID (self), _("Battery"));
-  sysprof_aid_set_icon_name (SYSPROF_AID (self), "org.gnome.Sysprof3-symbolic");
+  sysprof_aid_set_display_name (SYSPROF_AID (self), _("Counters"));
+  sysprof_aid_set_icon_name (SYSPROF_AID (self), "org.gnome.Sysprof-symbolic");
 }
diff --git a/src/sysprof/sysprof-application.c b/src/sysprof/sysprof-application.c
index 4cdc17f3..e3443980 100644
--- a/src/sysprof/sysprof-application.c
+++ b/src/sysprof/sysprof-application.c
@@ -329,7 +329,7 @@ SysprofApplication *
 sysprof_application_new (void)
 {
   return g_object_new (SYSPROF_TYPE_APPLICATION,
-                       "application-id", "org.gnome.Sysprof3",
+                       "application-id", "org.gnome.Sysprof",
                        "resource-base-path", "/org/gnome/sysprof",
                        "flags", G_APPLICATION_HANDLES_OPEN,
                        NULL);