[gnome-music] Revert "Revert "gnome-music.desktop: Rename desktop file""

[Marinus Schraal <mschraal src gnome org>]

commit d6d5679b6245215f5b91b0e09b8fdeb8f18d0010
Author: Marinus Schraal <mschraal src gnome org>
Date:   Tue Apr 11 11:32:30 2017 +0200

    Revert "Revert "gnome-music.desktop: Rename desktop file""
    
    This reverts commit fe2c057d9f7312a8324c47021419e5575c942838.

 data/Makefile.am                                   |    4 ++--
 data/gnome-music.appdata.xml.in                    |    2 +-
 ...music.desktop.in => org.gnome.Music.desktop.in} |    0
 gnomemusic/player.py                               |    2 +-
 po/POTFILES.in                                     |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index cf3b0be..f201e87 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,7 +6,7 @@ resourcedir = $(pkgdatadir)
 resource_DATA = gnome-music.gresource
 
 appsdir = $(datadir)/applications
-apps_DATA = gnome-music.desktop
+apps_DATA = org.gnome.Music.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
@@ -64,7 +64,7 @@ EXTRA_DIST = \
        $(hicolor_icon_files) \
        $(resource_files) \
        gnome-music.appdata.xml.in \
-       gnome-music.desktop.in \
+       org.gnome.Music.desktop.in \
        gnome-music.gresource.xml \
        org.gnome.Music.gschema.xml \
        $(man1_MANS) \
diff --git a/data/gnome-music.appdata.xml.in b/data/gnome-music.appdata.xml.in
index 8a0b01c..07cac4e 100644
--- a/data/gnome-music.appdata.xml.in
+++ b/data/gnome-music.appdata.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>gnome-music.desktop</id>
+  <id>org.gnome.Music.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+ and LGPL-2.0+ and CC-BY-SA-4.0</project_license>
   <_name>GNOME Music</_name>
diff --git a/data/gnome-music.desktop.in b/data/org.gnome.Music.desktop.in
similarity index 100%
rename from data/gnome-music.desktop.in
rename to data/org.gnome.Music.desktop.in
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index 76a44a3..4740ace 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -265,7 +265,7 @@ class Player(GObject.GObject):
         install_ctx = GstPbutils.InstallPluginsContext.new()
 
         if self._gst_plugins_base_check_version(1, 5, 0):
-            install_ctx.set_desktop_id('gnome-music.desktop')
+            install_ctx.set_desktop_id('org.gnome.Music.desktop')
             install_ctx.set_confirm_search(confirm_search)
 
             startup_id = '_TIME%u' % Gtk.get_current_event_time()
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3fc2324..9d25875 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,8 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
+data/org.gnome.Music.desktop.in
 data/org.gnome.Music.gschema.xml
-data/gnome-music.desktop.in
 data/gnome-music.appdata.xml.in
 gnomemusic/__init__.py
 gnomemusic/albumartcache.py