[frogr] Use the Application ID 'org.gnome.frogr' for the icon name

[Mario Sanchez Prada <msanchez src gnome org>]

commit 91884f84f66895eb83a35ed5ae3c7d16ff7c686b
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Sun Apr 30 22:10:44 2017 +0100

    Use the Application ID 'org.gnome.frogr' for the icon name
    
    This is consistent with what other applications do, and also avoids
    having to do the rename-icon thing for flatpak.

 Makefile.am                                        |   16 ++++++++--------
 data/frogr.desktop.in.in                           |    2 +-
 .../apps/{frogr.png => org.gnome.frogr.png}        |  Bin 13201 -> 13201 bytes
 .../16x16/apps/{frogr.png => org.gnome.frogr.png}  |  Bin 887 -> 887 bytes
 .../24x24/apps/{frogr.png => org.gnome.frogr.png}  |  Bin 1329 -> 1329 bytes
 .../32x32/apps/{frogr.png => org.gnome.frogr.png}  |  Bin 2346 -> 2346 bytes
 .../48x48/apps/{frogr.png => org.gnome.frogr.png}  |  Bin 2979 -> 2979 bytes
 .../64x64/apps/{frogr.png => org.gnome.frogr.png}  |  Bin 6059 -> 6059 bytes
 ...r-symbolic.svg => org.gnome.frogr-symbolic.svg} |    0
 .../apps/{frogr.svg => org.gnome.frogr.svg}        |    0
 org.gnome.frogr-stable.json                        |    1 -
 org.gnome.frogr-unstable.json                      |    1 -
 src/frogr-about-dialog.c                           |    2 +-
 src/frogr-main-view.c                              |    2 +-
 14 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 52a146e..5358ffc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,21 +49,21 @@ ACLOCAL_AMFLAGS=-I m4
 pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = data/pixmaps/frogr.xpm
 icon16dir = $(datadir)/icons/hicolor/16x16/apps
-icon16_DATA = data/icons/hicolor/16x16/apps/frogr.png
+icon16_DATA = data/icons/hicolor/16x16/apps/org.gnome.frogr.png
 icon24dir = $(datadir)/icons/hicolor/24x24/apps
-icon24_DATA = data/icons/hicolor/24x24/apps/frogr.png
+icon24_DATA = data/icons/hicolor/24x24/apps/org.gnome.frogr.png
 icon32dir = $(datadir)/icons/hicolor/32x32/apps
-icon32_DATA = data/icons/hicolor/32x32/apps/frogr.png
+icon32_DATA = data/icons/hicolor/32x32/apps/org.gnome.frogr.png
 icon48dir = $(datadir)/icons/hicolor/48x48/apps
-icon48_DATA = data/icons/hicolor/48x48/apps/frogr.png
+icon48_DATA = data/icons/hicolor/48x48/apps/org.gnome.frogr.png
 icon64dir = $(datadir)/icons/hicolor/64x64/apps
-icon64_DATA = data/icons/hicolor/64x64/apps/frogr.png
+icon64_DATA = data/icons/hicolor/64x64/apps/org.gnome.frogr.png
 icon128dir = $(datadir)/icons/hicolor/128x128/apps
-icon128_DATA = data/icons/hicolor/128x128/apps/frogr.png
+icon128_DATA = data/icons/hicolor/128x128/apps/org.gnome.frogr.png
 iconscalabledir = $(datadir)/icons/hicolor/scalable/apps
 iconscalable_DATA = \
-  data/icons/hicolor/scalable/apps/frogr.svg  \
-  data/icons/hicolor/scalable/apps/frogr-symbolic.svg
+  data/icons/hicolor/scalable/apps/org.gnome.frogr.svg  \
+  data/icons/hicolor/scalable/apps/org.gnome.frogr-symbolic.svg
 
 imagesdir = $(datadir)/frogr/images
 images_DATA = data/images/mpictures.png
diff --git a/data/frogr.desktop.in.in b/data/frogr.desktop.in.in
index 5246d11..20fb6fc 100644
--- a/data/frogr.desktop.in.in
+++ b/data/frogr.desktop.in.in
@@ -12,7 +12,7 @@ Terminal=false
 Categories=GNOME;GTK;Graphics;
 StartupNotify=true
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=frogr
+Icon=org.gnome.frogr
 X-Icon-path=@PIXMAPDIR@
 X-Window-Icon=frogr
 
MimeType=image/jpg;image/jpeg;image/png;image/bmp;image/gif;video/mpeg;video/mp4;video/quicktime;video/x-msvideo;video/ogg;video/x-ms-wmv;video/3gpp;video/m2ts;video/avchd-stream;video/mp2t;video/vnd.dlna.mpeg-tts;application/ogg;text/plain;text/html;
diff --git a/data/icons/hicolor/scalable/apps/frogr-symbolic.svg 
b/data/icons/hicolor/scalable/apps/org.gnome.frogr-symbolic.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/frogr-symbolic.svg
rename to data/icons/hicolor/scalable/apps/org.gnome.frogr-symbolic.svg
diff --git a/data/icons/hicolor/scalable/apps/frogr.svg b/data/icons/hicolor/scalable/apps/org.gnome.frogr.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/frogr.svg
rename to data/icons/hicolor/scalable/apps/org.gnome.frogr.svg
diff --git a/org.gnome.frogr-stable.json b/org.gnome.frogr-stable.json
index e8c5cf0..36d63f3 100644
--- a/org.gnome.frogr-stable.json
+++ b/org.gnome.frogr-stable.json
@@ -7,7 +7,6 @@
     "command": "frogr",
     "rename-appdata-file": "frogr.appdata.xml",
     "rename-desktop-file": "frogr.desktop",
-    "rename-icon": "frogr",
     "finish-args": [
         /* X11 + XShm access */
         "--share=ipc", "--socket=x11",
diff --git a/org.gnome.frogr-unstable.json b/org.gnome.frogr-unstable.json
index 2965d0c..cec947f 100644
--- a/org.gnome.frogr-unstable.json
+++ b/org.gnome.frogr-unstable.json
@@ -6,7 +6,6 @@
     "command": "frogr",
     "rename-appdata-file": "frogr.appdata.xml",
     "rename-desktop-file": "frogr.desktop",
-    "rename-icon": "frogr",
     "tags": ["nightly"],
     "desktop-file-name-prefix": "(Nightly) ",
     "finish-args": [
diff --git a/src/frogr-about-dialog.c b/src/frogr-about-dialog.c
index 9e796bd..0bbf40d 100644
--- a/src/frogr-about-dialog.c
+++ b/src/frogr-about-dialog.c
@@ -27,7 +27,7 @@
 #include <glib/gi18n.h>
 
 /* Path relative to the icons dir */
-#define ABOUT_DIALOG_ICON "/hicolor/48x48/apps/frogr.png"
+#define ABOUT_DIALOG_ICON "/hicolor/48x48/apps/" APP_ID ".png"
 
 static const gchar *authors[] = {
   "Mario Sanchez Prada <msanchez gnome org>",
diff --git a/src/frogr-main-view.c b/src/frogr-main-view.c
index 18069ac..f606f5f 100644
--- a/src/frogr-main-view.c
+++ b/src/frogr-main-view.c
@@ -37,7 +37,7 @@
 #include <glib/gi18n.h>
 
 /* Paths relative to the icons dir */
-#define ICON_PATH_FORMAT_STRING "%s/hicolor/%s/apps/frogr.png"
+#define ICON_PATH_FORMAT_STRING "%s/hicolor/%s/apps/" APP_ID ".png"
 
 #define MENU_BUTTON_ICON "open-menu-symbolic"
 #define MENU_BUTTON_ICON_FALLBACK "emblem-system-symbolic"