Fix for bug #57818.

2004-05-26  Jeffrey Stedfast  <fejj@novell.com>

	Fix for bug #57818.

	* gui/e-tasks.c (setup_widgets): Same.

	* gui/gnome-cal.c (setup_widgets): Updated to pass a set of
	bitflags to cal_search_bar_new().

	* gui/cal-search-bar.c (cal_search_bar_new): Now takes a bit flag
	argument specifying which search options to present.
	(cal_search_bar_construct): Same as above. Construct the search
	menu to use based on the bit flags.

	* gui/apps_evolution_calendar.schemas.in.in: Changed the default
	"Tasks due today" colour to be a light-blue (one of the default
	colour values in the colour picker dialog). Fixes bug #53412.

svn path=/trunk/; revision=26112

1 files changed, 15 insertions, 2 deletions

diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h
index a8910ba7b4..311dacd606 100644
--- a/calendar/gui/cal-search-bar.h
+++ b/calendar/gui/cal-search-bar.h
@@ -37,6 +37,19 @@ G_BEGIN_DECLS
 
 typedef struct CalSearchBarPrivate CalSearchBarPrivate;
 
+enum {
+	CAL_SEARCH_ANY_FIELD_CONTAINS    = (1 << 0),
+	CAL_SEARCH_SUMMARY_CONTAINS      = (1 << 1),
+	CAL_SEARCH_DESCRIPTION_CONTAINS  = (1 << 2),
+	CAL_SEARCH_COMMENT_CONTAINS      = (1 << 3),
+	CAL_SEARCH_LOCATION_CONTAINS     = (1 << 4),
+	CAL_SEARCH_CATEGORY_IS           = (1 << 5)
+};
+
+#define CAL_SEARCH_ALL (0xff)
+#define CAL_SEARCH_CALENDAR_DEFAULT (0x37)
+#define CAL_SEARCH_TASKS_DEFAULT    (0x27)
+
 typedef struct {
 	ESearchBar search_bar;
 
@@ -55,9 +68,9 @@ typedef struct {
 
 GtkType cal_search_bar_get_type (void);
 
-CalSearchBar *cal_search_bar_construct (CalSearchBar *cal_search);
+CalSearchBar *cal_search_bar_construct (CalSearchBar *cal_search, guint32 flags);
 
-GtkWidget *cal_search_bar_new (void);
+GtkWidget *cal_search_bar_new (guint32 flags);
 
 void cal_search_bar_set_categories (CalSearchBar *cal_search, GPtrArray *categories);