[easytag/wip/flatpak: 34/35] Rename icons to match application ID

[David King <davidk src gnome org>]

commit 491cabf128b95c06445d3fb2febf8309c677c15b
Author: David King <amigadave amigadave com>
Date:   Fri Apr 22 17:29:05 2016 +0530

    Rename icons to match application ID

 Makefile.am                                        |   20 ++++++++++----------
 data/flatpak/easytag.json                          |    1 -
 .../128x128/{easytag.png => org.gnome.EasyTAG.png} |  Bin 8272 -> 8272 bytes
 .../16x16/{easytag.png => org.gnome.EasyTAG.png}   |  Bin 874 -> 874 bytes
 .../22x22/{easytag.png => org.gnome.EasyTAG.png}   |  Bin 1223 -> 1223 bytes
 .../24x24/{easytag.png => org.gnome.EasyTAG.png}   |  Bin 1269 -> 1269 bytes
 .../256x256/{easytag.png => org.gnome.EasyTAG.png} |  Bin 16400 -> 16400 bytes
 .../32x32/{easytag.png => org.gnome.EasyTAG.png}   |  Bin 1915 -> 1915 bytes
 .../48x48/{easytag.png => org.gnome.EasyTAG.png}   |  Bin 3020 -> 3020 bytes
 .../64x64/{easytag.png => org.gnome.EasyTAG.png}   |  Bin 4211 -> 4211 bytes
 .../{easytag.svg => org.gnome.EasyTAG.svg}         |    0
 ...symbolic.svg => org.gnome.EasyTAG-symbolic.svg} |    0
 data/org.gnome.EasyTAG.desktop.in                  |    2 +-
 src/about.c                                        |    2 +-
 src/application_window.c                           |    2 +-
 15 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9afb009..263962a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -335,25 +335,25 @@ appiconscalabledir = $(iconthemedir)/scalable/apps
 appiconsymbolicdir = $(iconthemedir)/symbolic/apps
 
 dist_appicon16_DATA = \
-       data/icons/16x16/easytag.png
+       data/icons/16x16/org.gnome.EasyTAG.png
 dist_appicon22_DATA = \
-       data/icons/22x22/easytag.png
+       data/icons/22x22/org.gnome.EasyTAG.png
 dist_appicon24_DATA = \
-       data/icons/24x24/easytag.png
+       data/icons/24x24/org.gnome.EasyTAG.png
 dist_appicon32_DATA = \
-       data/icons/32x32/easytag.png
+       data/icons/32x32/org.gnome.EasyTAG.png
 dist_appicon48_DATA = \
-       data/icons/48x48/easytag.png
+       data/icons/48x48/org.gnome.EasyTAG.png
 dist_appicon64_DATA = \
-       data/icons/64x64/easytag.png
+       data/icons/64x64/org.gnome.EasyTAG.png
 dist_appicon128_DATA = \
-       data/icons/128x128/easytag.png
+       data/icons/128x128/org.gnome.EasyTAG.png
 dist_appicon256_DATA = \
-       data/icons/256x256/easytag.png
+       data/icons/256x256/org.gnome.EasyTAG.png
 dist_appiconscalable_DATA = \
-       data/icons/scalable/easytag.svg
+       data/icons/scalable/org.gnome.EasyTAG.svg
 dist_appiconsymbolic_DATA = \
-       data/icons/symbolic/easytag-symbolic.svg
+       data/icons/symbolic/org.gnome.EasyTAG-symbolic.svg
 
 UPDATE_ICON_CACHE = gtk-update-icon-cache --ignore-theme-index --force
 
diff --git a/data/flatpak/easytag.json b/data/flatpak/easytag.json
index 1118b04..68a33d8 100644
--- a/data/flatpak/easytag.json
+++ b/data/flatpak/easytag.json
@@ -6,7 +6,6 @@
     "sdk": "org.gnome.Sdk",
     "command": "easytag",
     "rename-appdata-file": "easytag.appdata.xml",
-    "rename-icon": "easytag",
     "finish-args": ["--filesystem=host",
                     "--share=ipc",
                     "--share=network",
diff --git a/data/icons/scalable/easytag.svg b/data/icons/scalable/org.gnome.EasyTAG.svg
similarity index 100%
rename from data/icons/scalable/easytag.svg
rename to data/icons/scalable/org.gnome.EasyTAG.svg
diff --git a/data/icons/symbolic/easytag-symbolic.svg b/data/icons/symbolic/org.gnome.EasyTAG-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/easytag-symbolic.svg
rename to data/icons/symbolic/org.gnome.EasyTAG-symbolic.svg
diff --git a/data/org.gnome.EasyTAG.desktop.in b/data/org.gnome.EasyTAG.desktop.in
index 66fe64b..6b3421d 100644
--- a/data/org.gnome.EasyTAG.desktop.in
+++ b/data/org.gnome.EasyTAG.desktop.in
@@ -5,7 +5,7 @@ _Comment=Edit audio file metadata
 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 _Keywords=mp3;tag;audio;music;
 Type=Application
-Icon=easytag
+Icon=org.gnome.EasyTAG
 Categories=GTK;AudioVideo;AudioVideoEditing;Audio;
 
MimeType=inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape;audio/x-speex+ogg;audio/x-opus+ogg;
 Exec=easytag %F
diff --git a/src/about.c b/src/about.c
index 0252e31..8e428e4 100644
--- a/src/about.c
+++ b/src/about.c
@@ -99,7 +99,7 @@ et_show_about_dialog (GtkWindow *parent)
                            "copyright", copyright,
                            "documenters", documenters,
                            "license-type", GTK_LICENSE_GPL_2_0,
-                           "logo-icon-name", PACKAGE_TARNAME,
+                           "logo-icon-name", "org.gnome.EasyTAG",
                            "translator-credits", translators,
                            "version", PACKAGE_VERSION,
                            "website", PACKAGE_URL,
diff --git a/src/application_window.c b/src/application_window.c
index 045113d..2eac1cd 100644
--- a/src/application_window.c
+++ b/src/application_window.c
@@ -1667,7 +1667,7 @@ et_application_window_init (EtApplicationWindow *self)
 
     window = GTK_WINDOW (self);
 
-    gtk_window_set_icon_name (window, PACKAGE_TARNAME);
+    gtk_window_set_icon_name (window, "org.gnome.EasyTAG");
     gtk_window_set_title (window, _(PACKAGE_NAME));
 
     g_signal_connect (self, "configure-event",