[gnome-font-viewer] Make DBus activatable



commit 0cd81cb1f6c3dde74603173d34e1629eef6e6c4e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Apr 9 18:11:00 2014 -0700

    Make DBus activatable
    
    Using the new GApplication facilities.

 configure.ac                                       |    2 +-
 data/gnome-font-viewer.appdata.xml.in              |    2 +-
 src/Makefile.am                                    |   14 ++++++++++++--
 ...p.in.in => org.gnome.font-viewer.desktop.in.in} |    1 +
 4 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 085b3f6..7f5bc2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ AC_CONFIG_FILES([
 Makefile
 data/Makefile
 src/Makefile
-src/gnome-font-viewer.desktop.in
+src/org.gnome.font-viewer.desktop.in
 po/Makefile.in
 ])
 
diff --git a/data/gnome-font-viewer.appdata.xml.in b/data/gnome-font-viewer.appdata.xml.in
index 11259a5..7748278 100644
--- a/data/gnome-font-viewer.appdata.xml.in
+++ b/data/gnome-font-viewer.appdata.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application>
-<id type="desktop">gnome-font-viewer.desktop</id>
+<id type="desktop">org.gnome.font-viewer.desktop</id>
 <licence>CC0</licence>
 <description>
 <_p>
diff --git a/src/Makefile.am b/src/Makefile.am
index b17ef3e..1f68acf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,9 +48,18 @@ gnome_font_viewer_SOURCES = \
        font-view.c
 
 desktopdir = $(datadir)/applications
-desktop_in_files = gnome-font-viewer.desktop.in
+desktop_in_files = org.gnome.font-viewer.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
+dbusservicedir = $(datadir)/dbus-1/services
+dbusservice_DATA = org.gnome.font-viewer.service
+
+org.gnome.font-viewer.service: Makefile
+       $(AM_V_GEN) (echo '[D-BUS Service]'; \
+                    echo 'Name=org.gnome.font-viewer'; \
+                    echo 'Exec=${bindir}/gnome-font-viewer --gapplication-service') > $  tmp && \
+                    mv $  tmp $@
+
 thumbnailerdir = $(datadir)/thumbnailers
 thumbnailer_DATA = gnome-font-viewer.thumbnailer
 
@@ -64,6 +73,7 @@ uninstall-local:
 @INTLTOOL_DIRECTORY_RULE@
 
 CLEANFILES = \
+       $(dbusservice_DATA) \
        $(desktop_in_files) \
        $(desktop_DATA) \
        $(directory_DATA)
@@ -71,7 +81,7 @@ CLEANFILES = \
 EXTRA_DIST = \
        $(resource_files) \
        gnome-font-viewer.thumbnailer \
-       gnome-font-viewer.desktop.in.in \
+       org.gnome.font-viewer.desktop.in.in \
        gnome-font-viewer.gresource.xml
 
 -include $(top_srcdir)/git.mk
diff --git a/src/gnome-font-viewer.desktop.in.in b/src/org.gnome.font-viewer.desktop.in.in
similarity index 96%
rename from src/gnome-font-viewer.desktop.in.in
rename to src/org.gnome.font-viewer.desktop.in.in
index 7dabb6f..adcdd58 100644
--- a/src/gnome-font-viewer.desktop.in.in
+++ b/src/org.gnome.font-viewer.desktop.in.in
@@ -6,6 +6,7 @@ Icon=preferences-desktop-font
 Exec=gnome-font-viewer %u
 Terminal=false
 Type=Application
+DBusActivatable=true
 StartupNotify=true
 Categories=GTK;GNOME;Utility;
 MimeType=application/x-font-ttf;application/x-font-pcf;application/x-font-type1;application/x-font-otf;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]