summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2014-04-08 16:28:53 -0400
committerMatthias Clasen <mclasen@redhat.com>2014-04-08 16:33:37 -0400
commit2a499441eb169cdfc8cfa0871dc04db12ca1ab0f (patch)
tree2184d5a8d9e894efcb4213d0270f911b82431db0 /editor
parentc5419557ec86b40d4d7300352e01ee83d445a902 (diff)
downloaddconf-2a499441eb169cdfc8cfa0871dc04db12ca1ab0f.tar.gz
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
Diffstat (limited to 'editor')
-rw-r--r--editor/Makefile.am14
-rw-r--r--editor/ca.desrt.dconf-editor.desktop.in.in (renamed from editor/dconf-editor.desktop.in.in)1
2 files changed, 13 insertions, 2 deletions
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
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