From f4d015759db729ad7b7199da118c6838963c84c2 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Sun, 31 Jan 2016 15:13:23 -0600
Subject: [PATCH] Rename icon to match app ID

In preparation for xdg-app.

https://bugzilla.gnome.org/show_bug.cgi?id=761375
---
 data/icons/Makefile.am                        |  20 +++++++++---------
 ...hicolor_apps_16x16_org.gnome.Calendar.png} | Bin
 ...hicolor_apps_22x22_org.gnome.Calendar.png} | Bin
 ...hicolor_apps_24x24_org.gnome.Calendar.png} | Bin
 ...color_apps_256x256_org.gnome.Calendar.png} | Bin
 ...hicolor_apps_32x32_org.gnome.Calendar.png} | Bin
 ...hicolor_apps_48x48_org.gnome.Calendar.png} | Bin
 ...color_apps_512x512_org.gnome.Calendar.png} | Bin
 ..._symbolic_org.gnome.Calendar-symbolic.svg} |   0
 ...alendar.blend => org.gnome.Calendar.blend} | Bin
 ...me-calendar.svg => org.gnome.Calendar.svg} |   0
 data/org.gnome.Calendar.desktop.in.in         |   2 +-
 src/gcal-application.c                        |   2 +-
 13 files changed, 12 insertions(+), 12 deletions(-)
 rename data/icons/{hicolor_apps_16x16_gnome-calendar.png => hicolor_apps_16x16_org.gnome.Calendar.png} (100%)
 rename data/icons/{hicolor_apps_22x22_gnome-calendar.png => hicolor_apps_22x22_org.gnome.Calendar.png} (100%)
 rename data/icons/{hicolor_apps_24x24_gnome-calendar.png => hicolor_apps_24x24_org.gnome.Calendar.png} (100%)
 rename data/icons/{hicolor_apps_256x256_gnome-calendar.png => hicolor_apps_256x256_org.gnome.Calendar.png} (100%)
 rename data/icons/{hicolor_apps_32x32_gnome-calendar.png => hicolor_apps_32x32_org.gnome.Calendar.png} (100%)
 rename data/icons/{hicolor_apps_48x48_gnome-calendar.png => hicolor_apps_48x48_org.gnome.Calendar.png} (100%)
 rename data/icons/{hicolor_apps_512x512_gnome-calendar.png => hicolor_apps_512x512_org.gnome.Calendar.png} (100%)
 rename data/icons/{hicolor_apps_symbolic_gnome-calendar-symbolic.svg => hicolor_apps_symbolic_org.gnome.Calendar-symbolic.svg} (100%)
 rename data/icons/{gnome-calendar.blend => org.gnome.Calendar.blend} (100%)
 rename data/icons/{gnome-calendar.svg => org.gnome.Calendar.svg} (100%)

diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 210acf69..e5361766 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -5,19 +5,19 @@ public_icons_themes = \
 	$(NULL)
 
 public_icons = \
-	hicolor_apps_16x16_gnome-calendar.png \
-	hicolor_apps_22x22_gnome-calendar.png \
-	hicolor_apps_24x24_gnome-calendar.png \
-	hicolor_apps_32x32_gnome-calendar.png \
-	hicolor_apps_48x48_gnome-calendar.png \
-	hicolor_apps_256x256_gnome-calendar.png \
-	hicolor_apps_512x512_gnome-calendar.png \
-  hicolor_apps_symbolic_gnome-calendar-symbolic.svg \
+	hicolor_apps_16x16_org.gnome.Calendar.png \
+	hicolor_apps_22x22_org.gnome.Calendar.png \
+	hicolor_apps_24x24_org.gnome.Calendar.png \
+	hicolor_apps_32x32_org.gnome.Calendar.png \
+	hicolor_apps_48x48_org.gnome.Calendar.png \
+	hicolor_apps_256x256_org.gnome.Calendar.png \
+	hicolor_apps_512x512_org.gnome.Calendar.png \
+  hicolor_apps_symbolic_org.gnome.Calendar-symbolic.svg \
 	$(NULL)
 
 noinst_DATA = \
-	gnome-calendar.svg \
-	gnome-calendar.blend \
+	org.gnome.Calendar.svg \
+	org.gnome.Calendar.blend \
 	$(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/hicolor_apps_16x16_gnome-calendar.png b/data/icons/hicolor_apps_16x16_org.gnome.Calendar.png
similarity index 100%
rename from data/icons/hicolor_apps_16x16_gnome-calendar.png
rename to data/icons/hicolor_apps_16x16_org.gnome.Calendar.png
diff --git a/data/icons/hicolor_apps_22x22_gnome-calendar.png b/data/icons/hicolor_apps_22x22_org.gnome.Calendar.png
similarity index 100%
rename from data/icons/hicolor_apps_22x22_gnome-calendar.png
rename to data/icons/hicolor_apps_22x22_org.gnome.Calendar.png
diff --git a/data/icons/hicolor_apps_24x24_gnome-calendar.png b/data/icons/hicolor_apps_24x24_org.gnome.Calendar.png
similarity index 100%
rename from data/icons/hicolor_apps_24x24_gnome-calendar.png
rename to data/icons/hicolor_apps_24x24_org.gnome.Calendar.png
diff --git a/data/icons/hicolor_apps_256x256_gnome-calendar.png b/data/icons/hicolor_apps_256x256_org.gnome.Calendar.png
similarity index 100%
rename from data/icons/hicolor_apps_256x256_gnome-calendar.png
rename to data/icons/hicolor_apps_256x256_org.gnome.Calendar.png
diff --git a/data/icons/hicolor_apps_32x32_gnome-calendar.png b/data/icons/hicolor_apps_32x32_org.gnome.Calendar.png
similarity index 100%
rename from data/icons/hicolor_apps_32x32_gnome-calendar.png
rename to data/icons/hicolor_apps_32x32_org.gnome.Calendar.png
diff --git a/data/icons/hicolor_apps_48x48_gnome-calendar.png b/data/icons/hicolor_apps_48x48_org.gnome.Calendar.png
similarity index 100%
rename from data/icons/hicolor_apps_48x48_gnome-calendar.png
rename to data/icons/hicolor_apps_48x48_org.gnome.Calendar.png
diff --git a/data/icons/hicolor_apps_512x512_gnome-calendar.png b/data/icons/hicolor_apps_512x512_org.gnome.Calendar.png
similarity index 100%
rename from data/icons/hicolor_apps_512x512_gnome-calendar.png
rename to data/icons/hicolor_apps_512x512_org.gnome.Calendar.png
diff --git a/data/icons/hicolor_apps_symbolic_gnome-calendar-symbolic.svg b/data/icons/hicolor_apps_symbolic_org.gnome.Calendar-symbolic.svg
similarity index 100%
rename from data/icons/hicolor_apps_symbolic_gnome-calendar-symbolic.svg
rename to data/icons/hicolor_apps_symbolic_org.gnome.Calendar-symbolic.svg
diff --git a/data/icons/gnome-calendar.blend b/data/icons/org.gnome.Calendar.blend
similarity index 100%
rename from data/icons/gnome-calendar.blend
rename to data/icons/org.gnome.Calendar.blend
diff --git a/data/icons/gnome-calendar.svg b/data/icons/org.gnome.Calendar.svg
similarity index 100%
rename from data/icons/gnome-calendar.svg
rename to data/icons/org.gnome.Calendar.svg
diff --git a/data/org.gnome.Calendar.desktop.in.in b/data/org.gnome.Calendar.desktop.in.in
index a92e57ab..ee4b6cca 100644
--- a/data/org.gnome.Calendar.desktop.in.in
+++ b/data/org.gnome.Calendar.desktop.in.in
@@ -2,7 +2,7 @@
 _Name=Calendar
 _Comment=Access, and manage calendar
 Exec=gnome-calendar
-Icon=gnome-calendar
+Icon=org.gnome.Calendar
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/src/gcal-application.c b/src/gcal-application.c
index 4df1537c..65ef2bf7 100644
--- a/src/gcal-application.c
+++ b/src/gcal-application.c
@@ -512,7 +512,7 @@ gcal_application_show_about (GSimpleAction *simple,
                          "license-type", GTK_LICENSE_GPL_3_0,
                          "authors", authors,
                          "artists", artists,
-                         "logo-icon-name", "gnome-calendar",
+                         "logo-icon-name", "org.gnome.Calendar",
                          "translator-credits", _("translator-credits"),
                          NULL);
   g_free (copyright);