seahorse r2039 - in trunk: . agent po

[sadam svn gnome org]

Author: sadam
Date: Tue Jan 22 16:22:46 2008
New Revision: 2039
URL: http://svn.gnome.org/viewvc/seahorse?rev=2039&view=rev

Log:
2008-01-22  Adam Schreiber  <sadam clemson edu>

    * po/POTFILES.in:
    * po/POTFILES.skip:
    * configure.in:
    * agent/Makefile.am: Autostart seahorse-agent with xdg.  Patch from 
    Luca Ferretti.  Fixes bug #511224


Modified:
   trunk/ChangeLog
   trunk/agent/Makefile.am
   trunk/configure.in
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip

Modified: trunk/agent/Makefile.am
==============================================================================
--- trunk/agent/Makefile.am	(original)
+++ trunk/agent/Makefile.am	Tue Jan 22 16:22:46 2008
@@ -1,8 +1,13 @@
 
+autostartdir = $(sysconfdir)/xdg/autostart
 gladedir = $(datadir)/seahorse/glade/
 localedir = $(datadir)/locale
 pixmapsdir = $(datadir)/pixmaps/
 
+autostart_in_files = seahorse-agent.desktop.in
+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+ INTLTOOL_DESKTOP_RULE@
+
 INCLUDES = -I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libcryptui \
@@ -32,10 +37,13 @@
 man_MANS = seahorse-agent.1
 
 EXTRA_DIST = \
-    $(man_MANS) \
+	$(man_MANS)			\
+	seahorse-agent.desktop.in.in	\
 	$(glade_DATA) 
 
-CLEANFILES = *.gladep* *.bak \
+CLEANFILES = \
+	*.gladep* *.bak 	\
+	$(autostart_DATA)	\
 	$(desktop_DATA)
 
 if HAVE_USER_MLOCK

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jan 22 16:22:46 2008
@@ -833,6 +833,7 @@
 src/seahorse-pgp-keys.desktop.in
 src/seahorse-pgp-signature.desktop.in
 agent/Makefile
+agent/seahorse-agent.desktop.in
 daemon/Makefile
 plugins/Makefile
 plugins/applet/Makefile

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Tue Jan 22 16:22:46 2008
@@ -2,6 +2,7 @@
 # Please keep this file sorted alphabetically.
 agent/seahorse-agent-actions.c
 agent/seahorse-agent.c
+agent/seahorse-agent.desktop.in.in
 agent/seahorse-agent-cache.c
 agent/seahorse-agent-cache.glade
 agent/seahorse-agent-main.c

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Tue Jan 22 16:22:46 2008
@@ -1,3 +1,4 @@
+agent/seahorse-agent.desktop.in
 plugins/applet/GNOME_SeahorseApplet.server.in
 src/seahorse-pgp-encrypted.desktop.in
 src/seahorse-pgp-keys.desktop.in