[gnome-weather/appctl: 1/2] Rely on appctl to start the application on legacy environment

[Giovanni Campagna <gcampagna src gnome org>]

commit 4b72b2aced6cbef5d09788794c7337a9b3d7be20
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Wed Jan 1 14:53:49 2014 +0100

    Rely on appctl to start the application on legacy environment
    
    If the environment does not support DBusActivatable, use the
    appctl command to start the application.
    This fixes the fact than running the bare executable would not
    show any window (since it's meant to be a DBus service), and
    removes the need for one level of sed substitution.

 data/Makefile.am                                   |    9 +--------
 ...in => org.gnome.Weather.Application.desktop.in} |    4 ++--
 2 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index bd1c524..cf24b36 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -30,12 +30,6 @@ $(PACKAGE_NAME).service: $(PACKAGE_NAME).service.in
                -e "s|[ ]pkglibdir@|$(pkglibdir)|g" \
                $< > $@
 
-$(PACKAGE_NAME).desktop.in: $(PACKAGE_NAME).desktop.in.in
-       $(AM_V_GEN) sed \
-               -e "s|[ ]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
-               -e "s|[ ]pkgdatadir@|$(pkgdatadir)|g" \
-               -e "s|[ ]pkglibdir@|$(pkglibdir)|g" \
-               $< > $@
 
 servicedir = $(datadir)/dbus-1/services
 service_DATA = $(PACKAGE_NAME).service
@@ -45,7 +39,7 @@ dist_searchprovider_DATA = org.gnome.Weather.Application.search-provider.ini
 
 EXTRA_DIST = \
        CREDITS \
-       $(PACKAGE_NAME).desktop.in.in \
+       $(PACKAGE_NAME).desktop.in \
        $(PACKAGE_NAME).service.in \
        $(PACKAGE_NAME).gresource.xml \
        $(gsettings_SCHEMAS) \
@@ -54,7 +48,6 @@ EXTRA_DIST = \
        $(NULL)
 
 CLEANFILES = \
-       $(PACKAGE_NAME).desktop.in \
        $(PACKAGE_NAME).service \
        $(PACKAGE_NAME).gresource \
        $(PACKAGE_NAME).appdata.xml \
diff --git a/data/org.gnome.Weather.Application.desktop.in.in b/data/org.gnome.Weather.Application.desktop.in
similarity index 66%
rename from data/org.gnome.Weather.Application.desktop.in.in
rename to data/org.gnome.Weather.Application.desktop.in
index 85c7171..b3cb543 100644
--- a/data/org.gnome.Weather.Application.desktop.in.in
+++ b/data/org.gnome.Weather.Application.desktop.in
@@ -2,8 +2,8 @@
 Type=Application
 _Name=Weather
 _Comment=Show weather conditions and forecast
-Icon= PACKAGE_NAME@
-Exec= pkgdatadir@/@PACKAGE_NAME@
+Icon=org.gnome.Weather.Application
+Exec=appctl start org.gnome.Weather.Application
 DBusActivatable=true
 StartupNotify=true
 Categories=GNOME;GTK;Utility;Core;