beagle r4671 - in trunk/beagle: beagled conf-data/config-files

[dbera svn gnome org]

Author: dbera
Date: Tue Apr  8 00:49:35 2008
New Revision: 4671
URL: http://svn.gnome.org/viewvc/beagle?rev=4671&view=rev

Log:
Remove the GMailSearchEnabled config option. GMailSearch is a backends and the usual process to enable/disable backends should be followed.


Modified:
   trunk/beagle/beagled/GMailSearchDriver.cs
   trunk/beagle/conf-data/config-files/GoogleBackends.xml

Modified: trunk/beagle/beagled/GMailSearchDriver.cs
==============================================================================
--- trunk/beagle/beagled/GMailSearchDriver.cs	(original)
+++ trunk/beagle/beagled/GMailSearchDriver.cs	Tue Apr  8 00:49:35 2008
@@ -80,7 +80,6 @@
 			if (config == null || config.Name != "GoogleBackends")
 				return;
 
-			bool enabled = config.GetOption ("GMailSearchEnabled", false);
 			username = config.GetOption ("GMailUsername", null);
 			search_folder = config.GetOption ("GMailSearchFolder", null);
 
@@ -109,7 +108,7 @@
 
 			}
 
-			valid_account = (enabled &&
+			valid_account = (
 				! String.IsNullOrEmpty (username) &&
 				! String.IsNullOrEmpty (password) &&
 				! String.IsNullOrEmpty (search_folder));

Modified: trunk/beagle/conf-data/config-files/GoogleBackends.xml
==============================================================================
--- trunk/beagle/conf-data/config-files/GoogleBackends.xml	(original)
+++ trunk/beagle/conf-data/config-files/GoogleBackends.xml	Tue Apr  8 00:49:35 2008
@@ -3,7 +3,6 @@
      Also do not change the Name, Description, Params and Separator attributes.
  -->
 <BeagleConf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; Name="GoogleBackends">
-    <BoolOption Name="GMailSearchEnabled" Description="Enable live GMail search">false</BoolOption>
     <StringOption Name="GMailUsername" Description="Username for GMail. Generally the full email address."></StringOption>
     <StringOption Name="GMailPasswordSource" Description="Password obtained from:kdewallet/gnome-keyring/conf-file">conf-file</StringOption>
     <StringOption Name="GMailPassword" Description="Password for GMail stored in plaintext. WARNING!"></StringOption>