[gnome-mahjongg] Rename desktop file so we appear in GNOME Software

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 99f181a62e58e6423a4a711095233e4e3591416e
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Feb 5 15:47:21 2014 -0600

    Rename desktop file so we appear in GNOME Software

 data/Makefile.am                                   |    2 +-
 data/gnome-mahjongg.appdata.xml.in                 |    2 +-
 ...hjongg.desktop.in => gnome-mahjongg.desktop.in} |    0
 po/POTFILES.in                                     |    2 +-
 src/gnome-mahjongg.vala                            |    3 ---
 5 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 9a410c9..26eeec1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,7 +16,7 @@ gsettings_SCHEMAS = org.gnome.gnome-mahjongg.gschema.xml
 man_MANS = gnome-mahjongg.6
 
 desktopdir = $(datadir)/applications
-desktop_in_files = mahjongg.desktop.in
+desktop_in_files = gnome-mahjongg.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/data/gnome-mahjongg.appdata.xml.in b/data/gnome-mahjongg.appdata.xml.in
index 23ebfa1..c9aa851 100644
--- a/data/gnome-mahjongg.appdata.xml.in
+++ b/data/gnome-mahjongg.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013 Michael Catanzaro -->
 <application>
- <id type="desktop">mahjongg.desktop</id>
+ <id type="desktop">gnome-mahjongg.desktop</id>
  <licence>CC0</licence>
  <_name>GNOME Mahjongg</_name>
  <description>
diff --git a/data/mahjongg.desktop.in b/data/gnome-mahjongg.desktop.in
similarity index 100%
rename from data/mahjongg.desktop.in
rename to data/gnome-mahjongg.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bd7553a..0412835 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
 data/gnome-mahjongg.appdata.xml.in
-data/mahjongg.desktop.in
+data/gnome-mahjongg.desktop.in
 data/org.gnome.gnome-mahjongg.gschema.xml
 data/translatable_game_names.h
 src/game.vala
diff --git a/src/gnome-mahjongg.vala b/src/gnome-mahjongg.vala
index d055e20..0964357 100644
--- a/src/gnome-mahjongg.vala
+++ b/src/gnome-mahjongg.vala
@@ -725,9 +725,6 @@ public class Mahjongg : Gtk.Application
         Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
         Intl.textdomain (GETTEXT_PACKAGE);
 
-        /* Required because the binary does not match the desktop file */
-        Environment.set_prgname ("mahjongg");
-
         Gtk.init (ref args);
 
         var context = new OptionContext (null);