[dconf] dconf-editor: Make DBus-activatable

[Matthias Clasen <matthiasc src gnome org>]

commit 2a499441eb169cdfc8cfa0871dc04db12ca1ab0f
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Apr 8 16:28:53 2014 -0400

    dconf-editor: Make DBus-activatable
    
    This commit installs a service file, renames the desktop file
    to follow the bus name, and adds the DBusActivatable key to
    the desktop file, following
    https://wiki.gnome.org/HowDoI/DBusApplicationLaunching
    
    https://bugzilla.gnome.org/show_bug.cgi?id=727862

 configure.ac                                       |    2 +-
 editor/Makefile.am                                 |   14 ++++++++++++--
 ...p.in.in => ca.desrt.dconf-editor.desktop.in.in} |    1 +
 3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c1a9cd4..d7f3cea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,7 +104,7 @@ AC_CONFIG_FILES([
   dbus-1/Makefile
   bin/Makefile
   editor/Makefile
-  editor/dconf-editor.desktop.in
+  editor/ca.desrt.dconf-editor.desktop.in
   tests/Makefile
   docs/Makefile
   po/Makefile.in
diff --git a/editor/Makefile.am b/editor/Makefile.am
index f746069..99ce8c3 100644
--- a/editor/Makefile.am
+++ b/editor/Makefile.am
@@ -41,11 +41,21 @@ dconf_editor_SOURCES = \
        dconf-view.vala
 
 desktopdir = $(datadir)/applications
-desktop_in_files = dconf-editor.desktop.in.in
+desktop_in_files = ca.desrt.dconf-editor.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
-CLEANFILES = $(desktop_DATA) resources.c
 @INTLTOOL_DESKTOP_RULE@
 
+dbusservicedir = $(datadir)/dbus-1/services
+dbusservice_DATA = ca.desrt.dconf-editor.service
+
+ca.desrt.dconf-editor.service: Makefile
+       $(AM_V_GEN) (echo '[D-BUS Service]'; \
+                    echo 'Name=ca.desrt.dconf-editor'; \
+                    echo 'Exec=${bindir}/dconf-editor --gapplication-service') > $  tmp && \
+                    mv $  tmp $@
+
+CLEANFILES = $(desktop_DATA) $(dbusservice_DATA) resources.c
+
 appdatadir = $(datadir)/appdata
 dist_appdata_DATA = dconf-editor.appdata.xml
 
diff --git a/editor/dconf-editor.desktop.in.in b/editor/ca.desrt.dconf-editor.desktop.in.in
similarity index 94%
rename from editor/dconf-editor.desktop.in.in
rename to editor/ca.desrt.dconf-editor.desktop.in.in
index 4340816..8fe580d 100644
--- a/editor/dconf-editor.desktop.in.in
+++ b/editor/ca.desrt.dconf-editor.desktop.in.in
@@ -12,3 +12,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=dconf
 X-GNOME-Bugzilla-Component=editor
 X-GNOME-Bugzilla-Version= VERSION@
+DBusActivatable=true