seahorse r2043 - in trunk: . agent po

[sadam svn gnome org]

Author: sadam
Date: Thu Jan 24 19:47:59 2008
New Revision: 2043
URL: http://svn.gnome.org/viewvc/seahorse?rev=2043&view=rev

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

    * po/POTFILES.skip:
    * configure.in:
    * agent/Makefile.am: Revert autostarting seahorse-agent with xdg. 
Requires
    evil gpg.conf munging.


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

Modified: trunk/agent/Makefile.am
==============================================================================
--- trunk/agent/Makefile.am	(original)
+++ trunk/agent/Makefile.am	Thu Jan 24 19:47:59 2008
@@ -1,13 +1,7 @@
-
-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 \
@@ -38,12 +32,10 @@
 
 EXTRA_DIST = \
 	$(man_MANS)			\
-	seahorse-agent.desktop.in.in	\
 	$(glade_DATA) 
 
 CLEANFILES = \
 	*.gladep* *.bak 	\
-	$(autostart_DATA)	\
 	$(desktop_DATA)
 
 if HAVE_USER_MLOCK

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jan 24 19:47:59 2008
@@ -833,7 +833,6 @@
 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.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Thu Jan 24 19:47:59 2008
@@ -1,4 +1,3 @@
-agent/seahorse-agent.desktop.in
 plugins/applet/GNOME_SeahorseApplet.server.in
 src/seahorse-pgp-encrypted.desktop.in
 src/seahorse-pgp-keys.desktop.in