[file-roller/wip/jtojnar/nix: 1/2] Rename icon to match package name

[Jan Tojnar <jtojnar src gnome org>]

commit ed220eb35bd8459898fd78aed6d7867c86ddd220
Author: Stephan Vedder <vedder mbits info>
Date:   Thu Mar 31 16:11:15 2022 +0200

    Rename icon to match package name
    
    This will remove the need for the rename in flatpak manifest.
    
    Fixes: https://gitlab.gnome.org/GNOME/file-roller/-/issues/98

 ...rg.gnome.ArchiveManager.Devel.svg => org.gnome.FileRoller.Devel.svg} | 0
 .../apps/{org.gnome.ArchiveManager.svg => org.gnome.FileRoller.svg}     | 0
 ...me.ArchiveManager-symbolic.svg => org.gnome.FileRoller-symbolic.svg} | 0
 data/org.gnome.FileRoller.desktop.in.in                                 | 2 +-
 flatpak/org.gnome.FileRoller.json                                       | 2 --
 .../figures/{org.gnome.ArchiveManager.svg => org.gnome.FileRoller.svg}  | 0
 help/C/index.page                                                       | 2 +-
 help/meson.build                                                        | 2 +-
 src/fr-application-menu.c                                               | 2 +-
 9 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/data/icons/hicolor/scalable/apps/org.gnome.ArchiveManager.Devel.svg 
b/data/icons/hicolor/scalable/apps/org.gnome.FileRoller.Devel.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/org.gnome.ArchiveManager.Devel.svg
rename to data/icons/hicolor/scalable/apps/org.gnome.FileRoller.Devel.svg
diff --git a/data/icons/hicolor/scalable/apps/org.gnome.ArchiveManager.svg 
b/data/icons/hicolor/scalable/apps/org.gnome.FileRoller.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/org.gnome.ArchiveManager.svg
rename to data/icons/hicolor/scalable/apps/org.gnome.FileRoller.svg
diff --git a/data/icons/hicolor/symbolic/apps/org.gnome.ArchiveManager-symbolic.svg 
b/data/icons/hicolor/symbolic/apps/org.gnome.FileRoller-symbolic.svg
similarity index 100%
rename from data/icons/hicolor/symbolic/apps/org.gnome.ArchiveManager-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/org.gnome.FileRoller-symbolic.svg
diff --git a/data/org.gnome.FileRoller.desktop.in.in b/data/org.gnome.FileRoller.desktop.in.in
index 09f25a31..9b89c0ec 100644
--- a/data/org.gnome.FileRoller.desktop.in.in
+++ b/data/org.gnome.FileRoller.desktop.in.in
@@ -9,7 +9,7 @@ StartupNotify=true
 Terminal=false
 Type=Application
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.ArchiveManager
+Icon=org.gnome.FileRoller
 Categories=GTK;GNOME;Utility;Archiving;Compression;X-GNOME-Utilities;
 NotShowIn=KDE;
 MimeType=@MIMETYPES@
diff --git a/flatpak/org.gnome.FileRoller.json b/flatpak/org.gnome.FileRoller.json
index 23678e22..3fc763c1 100644
--- a/flatpak/org.gnome.FileRoller.json
+++ b/flatpak/org.gnome.FileRoller.json
@@ -4,8 +4,6 @@
     "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
     "command" : "file-roller",
-    "rename-icon": "org.gnome.ArchiveManager",
-    "copy-icon": true,
     "finish-args" : [
         "--share=ipc",
         "--socket=fallback-x11",
diff --git a/help/C/figures/org.gnome.ArchiveManager.svg b/help/C/figures/org.gnome.FileRoller.svg
similarity index 100%
rename from help/C/figures/org.gnome.ArchiveManager.svg
rename to help/C/figures/org.gnome.FileRoller.svg
diff --git a/help/C/index.page b/help/C/index.page
index e053524d..aa84fb99 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -28,7 +28,7 @@
   
   <title>
     <media type="image" its:translate="no" width="48px" height="48px"
-    src="figures/org.gnome.ArchiveManager.svg" />
+    src="figures/org.gnome.FileRoller.svg" />
     Archive Manager
   </title>
   
diff --git a/help/meson.build b/help/meson.build
index c9cf8fb2..bd42ee1c 100644
--- a/help/meson.build
+++ b/help/meson.build
@@ -17,6 +17,6 @@ gnome.yelp('file-roller',
     'troubleshooting-password.page'
   ],
   media : [
-    'figures/org.gnome.ArchiveManager.svg'
+    'figures/org.gnome.FileRoller.svg'
   ]
 )
diff --git a/src/fr-application-menu.c b/src/fr-application-menu.c
index c2f9c053..a2756d5b 100644
--- a/src/fr-application-menu.c
+++ b/src/fr-application-menu.c
@@ -132,7 +132,7 @@ fr_application_activate_about (GSimpleAction *action,
                               "authors", authors,
                               "documenters", documenters,
                               "translator-credits", _("translator-credits"),
-                              "logo-icon-name", "org.gnome.ArchiveManager",
+                              "logo-icon-name", "org.gnome.FileRoller",
                               "license-type", GTK_LICENSE_GPL_2_0,
                               "website", "https://wiki.gnome.org/Apps/FileRoller";,
                               "wrap-license", TRUE,