vino r895 - in trunk: . server

[haltonhuo svn gnome org]

Author: haltonhuo
Date: Mon Aug 11 03:16:16 2008
New Revision: 895
URL: http://svn.gnome.org/viewvc/vino?rev=895&view=rev

Log:

2008-08-11  Halton Huo <halton huo sun com>

	Add vino-server.desktop under /usr/share/gnome/autostart. This is new
	autostart mechanism in gnome-session. Closes #546747
	* server/Makefile.am:
	* server/vino-server.desktop.in.in: (added)



Added:
   trunk/server/vino-server.desktop.in.in
Modified:
   trunk/ChangeLog
   trunk/server/Makefile.am

Modified: trunk/server/Makefile.am
==============================================================================
--- trunk/server/Makefile.am	(original)
+++ trunk/server/Makefile.am	Mon Aug 11 03:16:16 2008
@@ -136,6 +136,15 @@
 
 @INTLTOOL_SERVER_RULE@
 
+vino-server.desktop.in: vino-server.desktop.in.in
+	sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
+
+desktopdir      = $(datadir)/gnome/autostart
+desktop_in_files = vino-server.desktop.in
+desktop_DATA    = $(desktop_in_files:.desktop.in=.desktop)
+
+ INTLTOOL_DESKTOP_RULE@
+
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	if test -z "$(DESTDIR)" ; then \
@@ -156,6 +165,7 @@
 	vino-marshal.list \
 	GNOME_RemoteDesktop.server.in.in \
 	GNOME_RemoteDesktop.idl \
+	vino-server.desktop.in.in \
 	$(NULL)
 
 BUILT_SOURCES = \
@@ -166,6 +176,10 @@
 	vino-marshal.h \
 	$(NULL)
 
+CLEANFILES = \
+	vino-server.desktop     \
+	vino-server.desktop.in
+
 DISTCLEANFILES = \
 	GNOME_RemoteDesktop.server.in \
 	GNOME_RemoteDesktop.server \

Added: trunk/server/vino-server.desktop.in.in
==============================================================================
--- (empty file)
+++ trunk/server/vino-server.desktop.in.in	Mon Aug 11 03:16:16 2008
@@ -0,0 +1,10 @@
+[Desktop Entry]
+_Name=Remote Desktop
+_Comment=Gnome Remote Desktop Server
+Exec= LIBEXECDIR@/vino-server
+OnlyShowIn=GNOME;
+Terminal=false
+Type=Application
+AutostartCondition=GNOME /desktop/gnome/remote_access/enabled
+X-GNOME-Autostart-Phase=Applications
+X-GNOME-AutoRestart=true