[gnome-weather] Rename icon names to org.gnome.Weather

[Giovanni Campagna <gcampagna src gnome org>]

commit 06e36b3377f38d05717f7bd0244959ece7d179c2
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Mon Mar 21 18:45:59 2016 -0700

    Rename icon names to org.gnome.Weather
    
    To be more friendly to xdg-app's appstream extractor, which
    otherwise complains

 data/icons/Makefile.am                             |   14 +++++++-------
 ...ather.Application.png => org.gnome.Weather.png} |  Bin 896 -> 896 bytes
 ...ather.Application.png => org.gnome.Weather.png} |  Bin 1415 -> 1415 bytes
 ...ather.Application.png => org.gnome.Weather.png} |  Bin 54717 -> 54717 bytes
 ...ather.Application.png => org.gnome.Weather.png} |  Bin 2218 -> 2218 bytes
 ...ather.Application.png => org.gnome.Weather.png} |  Bin 4043 -> 4043 bytes
 ...ather.Application.svg => org.gnome.Weather.svg} |    0
 ...symbolic.svg => org.gnome.Weather-symbolic.svg} |    0
 data/org.gnome.Weather.Application.desktop.in      |    2 +-
 org.gnome.Weather.xdg-app.json                     |    1 +
 src/app/main.js                                    |    2 +-
 src/app/window.js                                  |    2 +-
 12 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 81e8db4..1028c4a 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -3,16 +3,16 @@ icondir = $(datadir)/icons
 # I'd like to use nobase_dist_icon_DATA, but
 # automake doesn't recognizes two prefixes at once
 nobase_icon_DATA = \
-       hicolor/16x16/apps/$(PACKAGE_NAME).Application.png \
-       hicolor/22x22/apps/$(PACKAGE_NAME).Application.png \
-       hicolor/32x32/apps/$(PACKAGE_NAME).Application.png \
-       hicolor/48x48/apps/$(PACKAGE_NAME).Application.png \
-       hicolor/256x256/apps/$(PACKAGE_NAME).Application.png \
-       hicolor/symbolic/apps/$(PACKAGE_NAME).Application-symbolic.svg
+       hicolor/16x16/apps/$(PACKAGE_NAME).png \
+       hicolor/22x22/apps/$(PACKAGE_NAME).png \
+       hicolor/32x32/apps/$(PACKAGE_NAME).png \
+       hicolor/48x48/apps/$(PACKAGE_NAME).png \
+       hicolor/256x256/apps/$(PACKAGE_NAME).png \
+       hicolor/symbolic/apps/$(PACKAGE_NAME)-symbolic.svg
 
 EXTRA_DIST = \
        $(nobase_icon_DATA) \
-       hicolor/$(PACKAGE_NAME).Application.svg
+       hicolor/$(PACKAGE_NAME).svg
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
diff --git a/data/icons/hicolor/org.gnome.Weather.Application.svg b/data/icons/hicolor/org.gnome.Weather.svg
similarity index 100%
rename from data/icons/hicolor/org.gnome.Weather.Application.svg
rename to data/icons/hicolor/org.gnome.Weather.svg
diff --git a/data/icons/hicolor/symbolic/apps/org.gnome.Weather.Application-symbolic.svg 
b/data/icons/hicolor/symbolic/apps/org.gnome.Weather-symbolic.svg
similarity index 100%
rename from data/icons/hicolor/symbolic/apps/org.gnome.Weather.Application-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/org.gnome.Weather-symbolic.svg
diff --git a/data/org.gnome.Weather.Application.desktop.in b/data/org.gnome.Weather.Application.desktop.in
index a0cf3b5..3cd54ba 100644
--- a/data/org.gnome.Weather.Application.desktop.in
+++ b/data/org.gnome.Weather.Application.desktop.in
@@ -2,7 +2,7 @@
 Type=Application
 _Name=Weather
 _Comment=Show weather conditions and forecast
-Icon=org.gnome.Weather.Application
+Icon=org.gnome.Weather
 Exec=gapplication launch org.gnome.Weather.Application
 DBusActivatable=true
 StartupNotify=true
diff --git a/org.gnome.Weather.xdg-app.json b/org.gnome.Weather.xdg-app.json
index 2d6e040..8ce1f95 100644
--- a/org.gnome.Weather.xdg-app.json
+++ b/org.gnome.Weather.xdg-app.json
@@ -23,6 +23,7 @@
                 "/man", "/share/man", "/share/gtk-doc",
                 "/share/vala", "/bin/gnome-weather",
                 "*.la", "*.a"],
+    "cleanup-commands": ["appstream-compose --prefix=/app --origin=xdg-app --basename=org.gnome.Weather 
org.gnome.Weather.Application"],
     "modules": [
         {
             "name": "m4-common",
diff --git a/src/app/main.js b/src/app/main.js
index 51dfe8a..5c0b4f0 100644
--- a/src/app/main.js
+++ b/src/app/main.js
@@ -50,7 +50,7 @@ const Application = new Lang.Class({
     _init: function() {
         this.parent({ application_id: pkg.name });
         GLib.set_application_name(_("Weather"));
-        Gtk.Window.set_default_icon_name("org.gnome.Weather.Application");
+        Gtk.Window.set_default_icon_name("org.gnome.Weather");
     },
 
     _onQuit: function() {
diff --git a/src/app/window.js b/src/app/window.js
index 40631de..aaf27f5 100644
--- a/src/app/window.js
+++ b/src/app/window.js
@@ -226,7 +226,7 @@ const MainWindow = new Lang.Class({
               program_name: _("Weather"),
               comments: _("A weather application"),
               license_type: Gtk.License.GPL_2_0,
-              logo_icon_name: 'org.gnome.Weather.Application',
+              logo_icon_name: 'org.gnome.Weather',
               version: pkg.version,
               website: 'https://wiki.gnome.org/Apps/Weather',
               wrap_license: true,