beagle r4662 - in trunk/beagle: beagled search search/Beagle.Search

[dbera svn gnome org]

Author: dbera
Date: Mon Apr  7 01:12:37 2008
New Revision: 4662
URL: http://svn.gnome.org/viewvc/beagle?rev=4662&view=rev

Log:
Show the query domain menu in beagle-search if built with GoogleBackends enabled (GMailDriver works in QueryDomain.Global).
Email tiles use fixme:date for message date instead of timestamp, so set a fixme:date property for GMail hits.


Modified:
   trunk/beagle/beagled/GMailSearchDriver.cs
   trunk/beagle/search/Beagle.Search/SearchWindow.cs
   trunk/beagle/search/Beagle.Search/UIManager.cs
   trunk/beagle/search/Makefile.am

Modified: trunk/beagle/beagled/GMailSearchDriver.cs
==============================================================================
--- trunk/beagle/beagled/GMailSearchDriver.cs	(original)
+++ trunk/beagle/beagled/GMailSearchDriver.cs	Mon Apr  7 01:12:37 2008
@@ -302,6 +302,7 @@
 			string subject = GMime.Utils.HeaderDecodePhrase (message.Subject);
 			hit.AddProperty (Property.New ("dc:title", subject));
 			hit.Timestamp = message.Date.ToUniversalTime ();
+			hit.AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ()));
 
 			GMime.InternetAddressList addrs;
 			addrs = message.GetRecipients (GMime.Message.RecipientType.To);

Modified: trunk/beagle/search/Beagle.Search/SearchWindow.cs
==============================================================================
--- trunk/beagle/search/Beagle.Search/SearchWindow.cs	(original)
+++ trunk/beagle/search/Beagle.Search/SearchWindow.cs	Mon Apr  7 01:12:37 2008
@@ -243,6 +243,9 @@
 
 				current_query = new Query ();
 				current_query.AddDomain (QueryDomain.Neighborhood);
+#if ENABLE_GOOGLEBACKENDS
+				current_query.AddDomain (QueryDomain.Global);
+#endif
 				current_query.AddText (query);
 				current_query.HitsAddedEvent += OnHitsAdded;
 				current_query.HitsSubtractedEvent += OnHitsSubtracted;

Modified: trunk/beagle/search/Beagle.Search/UIManager.cs
==============================================================================
--- trunk/beagle/search/Beagle.Search/UIManager.cs	(original)
+++ trunk/beagle/search/Beagle.Search/UIManager.cs	Mon Apr  7 01:12:37 2008
@@ -230,6 +230,12 @@
 						       Catalog.GetString ("Search only on local computer"),
 						       OnDomainChanged,
 						       true),
+				new ToggleActionEntry ("Global", null,
+						       Catalog.GetString ("_Global"),
+						       null,
+						       Catalog.GetString ("Search in internet services"),
+						       OnDomainChanged,
+						       true),
 				new ToggleActionEntry ("Neighborhood", null,
 						       Catalog.GetString ("_Neighborhood"),
 						       null,
@@ -292,10 +298,14 @@
 		"        <menuitem action='Archives'/>" +
 		"      </menu>" +
 
-#if ENABLE_AVAHI
+#if ENABLE_AVAHI || ENABLE_GOOGLEBACKENDS
 		"      <menu action='Domain'>" +
 		"        <menuitem action='Local'/>" +
+#if ENABLE_AVAHI
 		"        <menuitem action='Neighborhood'/>" +
+#elif ENABLE_GOOGLEBACKENDS
+		"        <menuitem action='Global'/>" +
+#endif
 		"      </menu>" +
 #endif
 

Modified: trunk/beagle/search/Makefile.am
==============================================================================
--- trunk/beagle/search/Makefile.am	(original)
+++ trunk/beagle/search/Makefile.am	Mon Apr  7 01:12:37 2008
@@ -28,6 +28,10 @@
 CSFLAGS += -define:ENABLE_AVAHI
 endif
 
+if ENABLE_GOOGLEBACKENDS
+CSFLAGS += -define:ENABLE_GOOGLEBACKENDS
+endif
+
 SOURCES =							\
 	$(srcdir)/AssemblyInfo.cs				\
 	$(srcdir)/Beagle.Search.Pages/Base.cs			\