seahorse r2775 - in trunk: . daemon

[sadam svn gnome org]

Author: sadam
Date: Sat Feb  7 19:49:15 2009
New Revision: 2775
URL: http://svn.gnome.org/viewvc/seahorse?rev=2775&view=rev

Log:
2009-02-07  Adam Schreiber  <sadam clemson edu>

    * daemon/seahorse-daemon.desktop.in.in: Only autostart the daemon 
when
    sharing is enabled.  Fixes bug #570773


Modified:
   trunk/ChangeLog
   trunk/daemon/org.gnome.seahorse.service.in
   trunk/daemon/seahorse-daemon.desktop.in.in

Modified: trunk/daemon/org.gnome.seahorse.service.in
==============================================================================
--- trunk/daemon/org.gnome.seahorse.service.in	(original)
+++ trunk/daemon/org.gnome.seahorse.service.in	Sat Feb  7 19:49:15 2009
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.gnome.seahorse
-Exec= bindir@/seahorse-daemon -d
+Exec= bindir@/seahorse-daemon
 

Modified: trunk/daemon/seahorse-daemon.desktop.in.in
==============================================================================
--- trunk/daemon/seahorse-daemon.desktop.in.in	(original)
+++ trunk/daemon/seahorse-daemon.desktop.in.in	Sat Feb  7 19:49:15 2009
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 _Name=Seahorse Daemon
-Exec=seahorse-daemon -d
+Exec=seahorse-daemon
 OnlyShowIn=GNOME;
 AutostartCondition=GNOME /apps/seahorse/sharing/sharing_enabled
 X-GNOME-Autostart-Phase=Initialization