From 2a499441eb169cdfc8cfa0871dc04db12ca1ab0f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 8 Apr 2014 16:28:53 -0400
Subject: 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 ++++++++++++--
 editor/ca.desrt.dconf-editor.desktop.in.in | 15 +++++++++++++++
 editor/dconf-editor.desktop.in.in          | 14 --------------
 4 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 editor/ca.desrt.dconf-editor.desktop.in.in
 delete mode 100644 editor/dconf-editor.desktop.in.in

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/ca.desrt.dconf-editor.desktop.in.in b/editor/ca.desrt.dconf-editor.desktop.in.in
new file mode 100644
index 0000000..8fe580d
--- /dev/null
+++ b/editor/ca.desrt.dconf-editor.desktop.in.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+_Name=dconf Editor
+_Comment=Directly edit your entire configuration database
+_Keywords=settings;configuration;
+Exec=dconf-editor
+Terminal=false
+Type=Application
+Icon=dconf-editor
+StartupNotify=true
+Categories=GNOME;GTK;System;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=dconf
+X-GNOME-Bugzilla-Component=editor
+X-GNOME-Bugzilla-Version=@VERSION@
+DBusActivatable=true
diff --git a/editor/dconf-editor.desktop.in.in b/editor/dconf-editor.desktop.in.in
deleted file mode 100644
index 4340816..0000000
--- a/editor/dconf-editor.desktop.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-_Name=dconf Editor
-_Comment=Directly edit your entire configuration database
-_Keywords=settings;configuration;
-Exec=dconf-editor
-Terminal=false
-Type=Application
-Icon=dconf-editor
-StartupNotify=true
-Categories=GNOME;GTK;System;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=dconf
-X-GNOME-Bugzilla-Component=editor
-X-GNOME-Bugzilla-Version=@VERSION@
-- 
cgit v1.2.1