From 66e5636dcaace0d9a98845490b09721c12ce3d2b Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Mon, 19 Oct 2009 17:27:45 +0000
Subject: Run evince instances in different processes instead of single instance

 - When built with DBus support a daemon is used to keep track of opened
   documents and reload them when reopened.

 - Crash recovery code has been removed.

 - Metadata migration code has been moved from main.c to ev-daemon.c, so
   that it's only run once on daemon startup.

Fixes bgo#583680, bgo#434966, bgo#497388, bgo#524633 and bgo#586087.
---
(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 883a3aa..27ba73d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -36,6 +36,17 @@ DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 
+#
+# DBus servide file
+#
+if ENABLE_DBUS
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.gnome.evince.Daemon.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+endif
 
 #
 # GConf schema
@@ -102,12 +113,13 @@ update-icon-cache:
 # Extra files to be included in the tarball
 #
 
-EXTRA_DIST =				\
-	$(ui_DATA)			\
-	$(DESKTOP_IN_FILES)		\
-	$(schema_in_files)		\
-	$(man_MANS)			\
-	$(NULL)				
+EXTRA_DIST =					\
+	$(ui_DATA)				\
+	$(DESKTOP_IN_FILES)			\
+	$(schema_in_files)			\
+	org.gnome.evince.Daemon.service.in	\
+	$(man_MANS)				\
+	$(NULL)
 
 #
 # Clean up properly
@@ -115,4 +127,5 @@ EXTRA_DIST =				\
 
 DISTCLEANFILES = \
 	$(DESKTOP_FILES)	\
-	$(schema_DATA)
+	$(schema_DATA)		\
+	$(service_DATA)
diff --git a/data/org.gnome.evince.Daemon.service.in b/data/org.gnome.evince.Daemon.service.in
new file mode 100644
index 0000000..c987f59
--- /dev/null
+++ b/data/org.gnome.evince.Daemon.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.evince.Daemon
+Exec=@libexecdir@/evinced
--
cgit v0.9.1