[gnome-calculator] Rename desktop file

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 56d61681ad8fca444ea2fbb3cc8ac991d43144e2
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Mar 2 10:19:51 2014 -0600

    Rename desktop file
    
    For 3.10, lots of applications are renaming their desktop files as it's
    required to use D-Bus activation. There's no longer any point in
    maintaining our old desktop file name just to ensure the app doesn't
    disappear from user favorites, as other apps will be disappearing
    regardless of what we do.

 data/Makefile.am                                   |   18 +++++++++---------
 ...data.xml.in => gnome-calculator.appdata.xml.in} |    2 +-
 ...tool.desktop.in => gnome-calculator.desktop.in} |    0
 po/POTFILES.in                                     |    4 ++--
 src/gnome-calculator.vala                          |    3 ---
 5 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index ae8e579..57a14d0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,33 +1,33 @@
 gsettings_SCHEMAS = org.gnome.calculator.gschema.xml
 @GSETTINGS_RULES@
 
-Utilitiesdir = $(datadir)/applications
-Utilities_in_files = gcalctool.desktop.in
-Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
+desktopdir = $(datadir)/applications
+desktop_in_files = gnome-calculator.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 @INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = gcalctool.appdata.xml.in
+appdata_in_files = gnome-calculator.appdata.xml.in
 
 man1_MANS = gnome-calculator.1 gcalccmd.1
 
 EXTRA_DIST = \
-       gcalctool.appdata.xml.in \
        buttons-basic.ui \
        buttons-advanced.ui \
        buttons-financial.ui \
        buttons-programming.ui \
        menu.ui \
        gnome-calculator.gresource.xml \
-       org.gnome.calculator.gschema.xml \
-       gcalctool.desktop.in \
+       $(appdata_in_files) \
+       $(desktop_in_files) \
+       $(gsettings_SCHEMAS) \
        $(man1_MANS)
 
 CLEANFILES = \
-       gcalctool.appdata.xml \
-       gcalctool.desktop
+       $(appdata_DATA) \
+       $(desktop_DATA)
 
 DISTCLEANFILES = \
        Makefile.in
diff --git a/data/gcalctool.appdata.xml.in b/data/gnome-calculator.appdata.xml.in
similarity index 97%
rename from data/gcalctool.appdata.xml.in
rename to data/gnome-calculator.appdata.xml.in
index 504923f..0597e57 100644
--- a/data/gcalctool.appdata.xml.in
+++ b/data/gnome-calculator.appdata.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application>
-  <id type="desktop">gcalctool.desktop</id>
+  <id type="desktop">gnome-calculator.desktop</id>
   <licence>CC0</licence>
   <_name>GNOME Calculator</_name>
   <description>
diff --git a/data/gcalctool.desktop.in b/data/gnome-calculator.desktop.in
similarity index 100%
rename from data/gcalctool.desktop.in
rename to data/gnome-calculator.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d53004e..c129cbc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,9 +5,9 @@
 [type: gettext/glade]data/buttons-basic.ui
 [type: gettext/glade]data/buttons-financial.ui
 [type: gettext/glade]data/buttons-programming.ui
+data/gnome-calculator.desktop.in
+data/gnome-calculator.appdata.xml.in
 [type: gettext/glade]data/menu.ui
-data/gcalctool.desktop.in
-data/gcalctool.appdata.xml.in
 data/org.gnome.calculator.gschema.xml
 src/currency.vala
 src/equation-lexer.vala
diff --git a/src/gnome-calculator.vala b/src/gnome-calculator.vala
index 63a052e..7a02952 100644
--- a/src/gnome-calculator.vala
+++ b/src/gnome-calculator.vala
@@ -212,9 +212,6 @@ public class Calculator : Gtk.Application
 
         program_name = Path.get_basename (args [0]);
 
-        /* GNOME Shell expects WM_CLASS to match the desktop file */
-        Environment.set_prgname ("gcalctool");
-
         var options = new OptionEntry [4];
 
         string? solve_equation = null;