beagle r4417 - trunk/beagle/tools

[joeshaw svn gnome org]

Author: joeshaw
Date: Sat Jan 26 19:28:29 2008
New Revision: 4417
URL: http://svn.gnome.org/viewvc/beagle?rev=4417&view=rev

Log:
Re-enable setting of Hidden=true in the user's local autostart file,
since it looks like the gnome-session bug was fixed in 2.19.2.
However, make a note of it in a comment in the file.  This will fix
disabling of autostart in KDE, keep it working for GNOME >= 2.19.2,
and break it for older versions of GNOME.  Sigh.  Discussed a bit in
bgo #507786

Modified:
   trunk/beagle/tools/Settings.cs

Modified: trunk/beagle/tools/Settings.cs
==============================================================================
--- trunk/beagle/tools/Settings.cs	(original)
+++ trunk/beagle/tools/Settings.cs	Sat Jan 26 19:28:29 2008
@@ -421,11 +421,9 @@
 		reader.Close ();
 
 		if (! enabled) {
-			// FIXME: gnome-session has a bug in which autostart overrides
-			// break if Hidden=true is set.
-			writer.WriteLine ("# FIXME: Hidden=true has to be commented out for GNOME autostart to be");
-			writer.WriteLine ("# disabled, but KDE requires it to disable autostart.");
-			writer.WriteLine ("#Hidden=true");
+			writer.WriteLine ("# Setting Hidden=true unintuitively disables autostart on KDE and");
+			writer.WriteLine ("# GNOME >= 2.19.2, but it breaks disabling of autostart in older GNOME.");
+			writer.WriteLine ("Hidden=true");
 			writer.WriteLine ("X-GNOME-Autostart-enabled=false");
 		}
 
@@ -439,11 +437,9 @@
 		reader.Close ();
 
 		if (! enabled) {
-			// FIXME: gnome-session has a bug in which autostart overrides
-			// break if Hidden=true is set.
-			writer.WriteLine ("# FIXME: Hidden=true has to be commented out for GNOME autostart to be");
-			writer.WriteLine ("# disabled, but KDE requires it to disable autostart.");
-			writer.WriteLine ("#Hidden=true");
+			writer.WriteLine ("# Setting Hidden=true unintuitively disables autostart on KDE and");
+			writer.WriteLine ("# GNOME >= 2.19.2, but it breaks disabling of autostart in older GNOME.");
+			writer.WriteLine ("Hidden=true");
 			writer.WriteLine ("X-GNOME-Autostart-enabled=false");
 		}