Merge from master

12 files changed, 40 insertions, 17 deletions

diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index c725dedb1c..4f09f92692 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -7,9 +7,9 @@ libevolution_module_calendar_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	$(CAMEL_CFLAGS)					\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 libevolution_module_calendar_la_SOURCES =		\
 	evolution-module-calendar.c			\
@@ -94,9 +94,9 @@ libevolution_module_calendar_la_LIBADD =		\
 	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(top_builddir)/widgets/table/libetable.la			\
-	$(CAMEL_LIBS)							\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
+	$(GNOME_PLATFORM_LIBS)						\
+	$(GTKHTML_LIBS)
 
 libevolution_module_calendar_la_LDFLAGS =		\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/calendar/e-cal-config-calendar-item.c b/modules/calendar/e-cal-config-calendar-item.c
index 09895c0a0e..d0d6e11b90 100644
--- a/modules/calendar/e-cal-config-calendar-item.c
+++ b/modules/calendar/e-cal-config-calendar-item.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-calendar-item.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <misc/e-calendar-item.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-comp-editor.c b/modules/calendar/e-cal-config-comp-editor.c
index b522975bac..dc37c748c3 100644
--- a/modules/calendar/e-cal-config-comp-editor.c
+++ b/modules/calendar/e-cal-config-comp-editor.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-comp-editor.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/dialogs/comp-editor.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-date-edit.c b/modules/calendar/e-cal-config-date-edit.c
index d59549764b..48a5848f73 100644
--- a/modules/calendar/e-cal-config-date-edit.c
+++ b/modules/calendar/e-cal-config-date-edit.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-date-edit.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <misc/e-dateedit.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-meeting-store.c b/modules/calendar/e-cal-config-meeting-store.c
index f9a91dacd0..7b4f2dec30 100644
--- a/modules/calendar/e-cal-config-meeting-store.c
+++ b/modules/calendar/e-cal-config-meeting-store.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-meeting-store.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-meeting-store.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-meeting-time-selector.c b/modules/calendar/e-cal-config-meeting-time-selector.c
index 23eef11ef5..249d541274 100644
--- a/modules/calendar/e-cal-config-meeting-time-selector.c
+++ b/modules/calendar/e-cal-config-meeting-time-selector.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-meeting-time-selector.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-meeting-time-sel.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-model.c b/modules/calendar/e-cal-config-model.c
index f42e4a9b66..9898942bf9 100644
--- a/modules/calendar/e-cal-config-model.c
+++ b/modules/calendar/e-cal-config-model.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-model.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-cal-model.h>
 #include <calendar/gui/e-cal-model-tasks.h>
 
diff --git a/modules/calendar/e-cal-config-view.c b/modules/calendar/e-cal-config-view.c
index ecc35871ca..afe747dd80 100644
--- a/modules/calendar/e-cal-config-view.c
+++ b/modules/calendar/e-cal-config-view.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-view.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-day-view.h>
 #include <calendar/gui/e-week-view.h>
 
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index 21472453ef..aa5738e27e 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -1705,6 +1705,13 @@ static GtkRadioActionEntry calendar_filter_entries[] = {
 	  NULL,  /* XXX Add a tooltip! */
 	  CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS },
 
+	{ "calendar-filter-occurs-less-than-5-times",
+	  NULL,
+	  N_("Occurs Less Than 5 Times"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES },
+
 	{ "calendar-filter-unmatched",
 	  NULL,
 	  N_("Unmatched"),
@@ -1972,7 +1979,7 @@ e_cal_shell_view_update_search_filter (ECalShellView *cal_shell_view)
 		ii = CALENDAR_FILTER_UNMATCHED;
 		e_action_combo_box_add_separator_after (combo_box, ii);
 
-		ii = CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS;
+		ii = CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES;
 		e_action_combo_box_add_separator_after (combo_box, ii);
 
 		e_shell_view_unblock_execute_search (shell_view);
diff --git a/modules/calendar/e-cal-shell-view-actions.h b/modules/calendar/e-cal-shell-view-actions.h
index b79bc6baaf..fcc77ea011 100644
--- a/modules/calendar/e-cal-shell-view-actions.h
+++ b/modules/calendar/e-cal-shell-view-actions.h
@@ -133,6 +133,8 @@
 	E_SHELL_WINDOW_ACTION ((window), "calendar-filter-any-category")
 #define E_SHELL_WINDOW_ACTION_CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS(window) \
 	E_SHELL_WINDOW_ACTION ((window), "calendar-filter-next-7-days-appointments")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES(window) \
+	E_SHELL_WINDOW_ACTION ((window), "calendar-filter-occurs-less-than-5-times")
 #define E_SHELL_WINDOW_ACTION_CALENDAR_FILTER_UNMATCHED(window) \
 	E_SHELL_WINDOW_ACTION ((window), "calendar-filter-unmatched")
 #define E_SHELL_WINDOW_ACTION_CALENDAR_SEARCH_ADVANCED_HIDDEN(window) \
diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h
index 7c78130fc3..6653632662 100644
--- a/modules/calendar/e-cal-shell-view-private.h
+++ b/modules/calendar/e-cal-shell-view-private.h
@@ -85,10 +85,11 @@ G_BEGIN_DECLS
 /* Filter items are displayed in ascending order.
  * Non-negative values are reserved for categories. */
 enum {
-	CALENDAR_FILTER_ANY_CATEGORY			= -4,
-	CALENDAR_FILTER_UNMATCHED			= -3,
-	CALENDAR_FILTER_ACTIVE_APPOINTMENTS		= -2,
-	CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS	= -1
+	CALENDAR_FILTER_ANY_CATEGORY			= -5,
+	CALENDAR_FILTER_UNMATCHED			= -4,
+	CALENDAR_FILTER_ACTIVE_APPOINTMENTS		= -3,
+	CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS	= -2,
+	CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES	= -1
 };
 
 /* Search items are displayed in ascending order. */
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index 0a9b7701f8..f644402080 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -194,6 +194,12 @@ cal_shell_view_execute_search (EShellView *shell_view)
 			range_search = TRUE;
 			break;
 
+		case CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES:
+			temp = g_strdup_printf ("(and %s (< (occurrences-count?) 5))", query);
+			g_free (query);
+			query = temp;
+			break;
+
 		default:
 		{
 			GList *categories;