1 files changed, 31 insertions, 332 deletions

diff --git a/widgets/text/e-completion.c b/widgets/text/e-completion.c
index cddd6ed4f4..b243d4db35 100644
--- a/widgets/text/e-completion.c
+++ b/widgets/text/e-completion.c
@@ -31,47 +31,32 @@
 #include "gal/util/e-marshal.h"
 
 enum {
-	E_COMPLETION_REQUEST_COMPLETION,
-	E_COMPLETION_BEGIN_COMPLETION,
-	E_COMPLETION_COMPLETION,
-	E_COMPLETION_RESTART_COMPLETION,
-	E_COMPLETION_CANCEL_COMPLETION,
-	E_COMPLETION_END_COMPLETION,
-	E_COMPLETION_CLEAR_COMPLETION,
-	E_COMPLETION_LOST_COMPLETION,
-	E_COMPLETION_LAST_SIGNAL
+	COMPLETION_STARTED,
+	COMPLETION_FOUND,
+	COMPLETION_CANCELED,
+	COMPLETION_FINISHED,
+	LAST_SIGNAL
 };
 
-static guint e_completion_signals[E_COMPLETION_LAST_SIGNAL] = { 0 };
+static guint e_completion_signals[LAST_SIGNAL] = { 0 };
 
 struct _ECompletionPrivate {
 	gboolean searching;
 	gboolean done_search;
-	gboolean refining;
 	gchar *search_text;
 	GPtrArray *matches;
-	gint match_count;
 	gint pos;
 	gint limit;
 	double min_score, max_score;
-	gint refinement_count;
-	GList *search_stack;
 };
 
-typedef struct {
-	gchar *text;
-	gint pos;
-} ECompletionSearch;
-
 static void e_completion_class_init (ECompletionClass *klass);
 static void e_completion_init       (ECompletion *complete);
 static void e_completion_dispose    (GObject *object);
 
 static void     e_completion_add_match          (ECompletion *complete, ECompletionMatch *);
-static void     e_completion_clear_search_stack (ECompletion *complete);
 static void     e_completion_clear_matches      (ECompletion *complete);
 static gboolean e_completion_sort               (ECompletion *complete);
-static void     e_completion_restart            (ECompletion *complete);
 
 #define PARENT_TYPE GTK_TYPE_OBJECT
 static GtkObjectClass *parent_class;
@@ -92,80 +77,34 @@ e_completion_class_init (ECompletionClass *klass)
 
 	parent_class = g_type_class_ref (PARENT_TYPE);
 
-	e_completion_signals[E_COMPLETION_REQUEST_COMPLETION] =
-		g_signal_new ("request_completion",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionClass, request_completion),
-			      NULL, NULL,
-			      e_marshal_NONE__POINTER_INT_INT,
-			      G_TYPE_NONE, 3,
-			      G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT);
-
-	e_completion_signals[E_COMPLETION_BEGIN_COMPLETION] =
-		g_signal_new ("begin_completion",
+	e_completion_signals[COMPLETION_STARTED] =
+		g_signal_new ("completion_started",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionClass, begin_completion),
+			      G_STRUCT_OFFSET (ECompletionClass, completion_started),
 			      NULL, NULL,
 			      e_marshal_NONE__POINTER_INT_INT,
 			      G_TYPE_NONE, 3,
 			      G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT);
 
-	e_completion_signals[E_COMPLETION_COMPLETION] =
-		g_signal_new ("completion",
+	e_completion_signals[COMPLETION_FOUND] =
+		g_signal_new ("completion_found",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionClass, completion),
+			      G_STRUCT_OFFSET (ECompletionClass, completion_found),
 			      NULL, NULL,
 			      e_marshal_NONE__POINTER,
 			      G_TYPE_NONE, 1,
 			      G_TYPE_POINTER);
 
-	e_completion_signals[E_COMPLETION_RESTART_COMPLETION] =
-		g_signal_new ("restart_completion",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,			      
-			      G_STRUCT_OFFSET (ECompletionClass, restart_completion),
-			      NULL, NULL,
-			      e_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-	
-	e_completion_signals[E_COMPLETION_CANCEL_COMPLETION] =
-		g_signal_new ("cancel_completion",
+	e_completion_signals[COMPLETION_FINISHED] =
+		g_signal_new ("completion_finished",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionClass, cancel_completion),
+			      G_STRUCT_OFFSET (ECompletionClass, completion_finished),
 			      NULL, NULL,
 			      e_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
-	
-	e_completion_signals[E_COMPLETION_END_COMPLETION] =
-		g_signal_new ("end_completion",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionClass, end_completion),
-			      NULL, NULL,
-			      e_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-
-	e_completion_signals[E_COMPLETION_CLEAR_COMPLETION] = 
-		g_signal_new ("clear_completion",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionClass, clear_completion),
-			      NULL, NULL,
-			      e_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-
-	e_completion_signals[E_COMPLETION_LOST_COMPLETION] =
-		g_signal_new ("lost_completion",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionClass, lost_completion),
-			      NULL, NULL,
-			      e_marshal_NONE__POINTER,
-			      G_TYPE_NONE, 1, G_TYPE_POINTER);
 
 	object_class->dispose = e_completion_dispose;
 }
@@ -187,7 +126,6 @@ e_completion_dispose (GObject *object)
 		complete->priv->search_text = NULL;
 
 		e_completion_clear_matches (complete);
-		e_completion_clear_search_stack (complete);
 
 		g_ptr_array_free (complete->priv->matches, TRUE);
 		complete->priv->matches = NULL;
@@ -241,149 +179,9 @@ e_completion_clear_matches (ECompletion *complete)
 }
 
 void
-e_completion_clear (ECompletion *complete)
-{
-	g_return_if_fail (E_IS_COMPLETION (complete));
-
-	/* FIXME: do we really want _clear and _clear_matches() ? */
-
-	/* I think yes, because it is convenient to be able to clear our match cache
-	   without emitting a "clear_completion" signal. -JT */
-
-	e_completion_clear_matches (complete);
-	e_completion_clear_search_stack (complete);
-	complete->priv->refinement_count = 0;
-	complete->priv->match_count = 0;
-	g_signal_emit (complete, e_completion_signals[E_COMPLETION_CLEAR_COMPLETION], 0);
-}
-
-static void
-e_completion_push_search (ECompletion *complete, const gchar *text, gint pos)
-{
-	ECompletionSearch *search;
-
-	g_return_if_fail (E_IS_COMPLETION (complete));
-
-	search = g_new (ECompletionSearch, 1);
-	search->text = complete->priv->search_text;
-	search->pos  = complete->priv->pos;
-	complete->priv->search_stack = g_list_prepend (complete->priv->search_stack, search);
-
-	complete->priv->search_text = g_strdup (text);
-	complete->priv->pos = pos;
-}
-
-static void
-e_completion_pop_search (ECompletion *complete)
-{
-	ECompletionSearch *search;
-	GList *old_link = complete->priv->search_stack;
-
-	g_return_if_fail (E_IS_COMPLETION (complete));
-	g_return_if_fail (complete->priv->search_stack != NULL);
-
-	g_free (complete->priv->search_text);
-
-	search = complete->priv->search_stack->data;
-	complete->priv->search_text = search->text;
-	complete->priv->pos = search->pos;
-
-	g_free (search);
-	complete->priv->search_stack = g_list_remove_link (complete->priv->search_stack,
-							   complete->priv->search_stack);
-	g_list_free_1 (old_link);
-}
-
-static void
-e_completion_clear_search_stack (ECompletion *complete)
-{
-	GList *iter;
-	
-	g_return_if_fail (E_IS_COMPLETION (complete));
-
-	for (iter = complete->priv->search_stack; iter != NULL; iter = g_list_next (iter)) {
-		ECompletionSearch *search = iter->data;
-		g_free (search->text);
-		g_free (search);
-	}
-	g_list_free (complete->priv->search_stack);
-	complete->priv->search_stack = NULL;
-}
-
-static void
-e_completion_refine_search (ECompletion *comp, const gchar *text, gint pos, ECompletionRefineFn refine_fn)
-{
-	GPtrArray *m;
-	gint i;
-	
-	comp->priv->refining = TRUE;
-
-	e_completion_push_search (comp, text, pos);
-
-	g_signal_emit (comp, e_completion_signals[E_COMPLETION_BEGIN_COMPLETION], 0, text, pos, comp->priv->limit);
-
-	comp->priv->match_count = 0;
-
-	comp->priv->searching = TRUE;
-
-	m = comp->priv->matches;
-	for (i = 0; i < m->len; ++i) {
-		ECompletionMatch *match = g_ptr_array_index (m, i);
-		if (comp->priv->refinement_count == match->hit_count
-		    && refine_fn (comp, match, text, pos)) {
-			++match->hit_count;
-			g_signal_emit (comp, e_completion_signals[E_COMPLETION_COMPLETION], 0, match);
-			++comp->priv->match_count;
-		}
-	}
-
-	++comp->priv->refinement_count;
-
-	g_signal_emit (comp, e_completion_signals[E_COMPLETION_END_COMPLETION], 0);
-
-	comp->priv->searching = FALSE;
-	comp->priv->refining  = FALSE;
-}
-
-static void
-e_completion_unrefine_search (ECompletion *comp)
-{
-	GPtrArray *m;
-	gint i;
-
-	comp->priv->refining = TRUE;
-
-	e_completion_pop_search (comp);
-
-	g_signal_emit (comp, e_completion_signals[E_COMPLETION_BEGIN_COMPLETION], 0,
-		comp->priv->search_text, comp->priv->pos, comp->priv->limit);
-
-	comp->priv->match_count = 0;
-	--comp->priv->refinement_count;
-
-	comp->priv->searching = TRUE;
-
-	m = comp->priv->matches;
-	for (i = 0; i < m->len; ++i) {
-		ECompletionMatch *match = g_ptr_array_index (m, i);
-		if (comp->priv->refinement_count <= match->hit_count) {
-			match->hit_count = comp->priv->refinement_count;
-			g_signal_emit (comp, e_completion_signals[E_COMPLETION_COMPLETION], 0, match);
-			++comp->priv->match_count;
-		}
-	}
-
-	g_signal_emit (comp, e_completion_signals[E_COMPLETION_END_COMPLETION], 0);
-
-	comp->priv->searching = FALSE;
-	comp->priv->refining  = FALSE;
-}
-
-void
 e_completion_begin_search (ECompletion *complete, const gchar *text, gint pos, gint limit)
 {
 	ECompletionClass *klass;
-	ECompletionRefineFn refine_fn;
 
 	g_return_if_fail (complete != NULL);
 	g_return_if_fail (E_IS_COMPLETION (complete));
@@ -391,35 +189,6 @@ e_completion_begin_search (ECompletion *complete, const gchar *text, gint pos, g
 
 	klass = E_COMPLETION_CLASS (GTK_OBJECT_GET_CLASS (complete));
 
-	if (!complete->priv->searching && complete->priv->done_search) {
-
-		/* If the search we are requesting is the same as what we had before our last refinement,
-		   treat the request as an unrefine. */
-		if (complete->priv->search_stack != NULL) {
-			ECompletionSearch *search = complete->priv->search_stack->data;
-			if ((klass->ignore_pos_on_auto_unrefine || search->pos == pos)
-			    && !strcmp (search->text, text)) {
-				e_completion_unrefine_search (complete);
-				return;
-			}
-		}
-
-		if (klass->auto_refine 
-		    && (refine_fn = klass->auto_refine (complete,
-							complete->priv->search_text, complete->priv->pos,
-							text, pos))) {
-			e_completion_refine_search (complete, text, pos, refine_fn);
-			return;
-		}
-
-	}
-
-	/* Stop any prior search. */
-	if (complete->priv->searching)
-		e_completion_cancel_search (complete);
-
-	e_completion_clear_search_stack (complete);
-
 	g_free (complete->priv->search_text);
 	complete->priv->search_text = g_strdup (text);
 
@@ -430,25 +199,10 @@ e_completion_begin_search (ECompletion *complete, const gchar *text, gint pos, g
 	e_completion_clear_matches (complete);
 
 	complete->priv->limit = limit > 0 ? limit : G_MAXINT;
-	complete->priv->refinement_count = 0;
-
-	g_signal_emit (complete, e_completion_signals[E_COMPLETION_BEGIN_COMPLETION], 0, text, pos, limit);
-	g_signal_emit (complete, e_completion_signals[E_COMPLETION_REQUEST_COMPLETION], 0, text, pos, limit);
-}
-
-void
-e_completion_cancel_search (ECompletion *complete)
-{
-	g_return_if_fail (complete != NULL);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-
-	/* If there is no search to cancel, just silently return. */
-	if (!complete->priv->searching)
-		return;
-
-	g_signal_emit (complete, e_completion_signals[E_COMPLETION_CANCEL_COMPLETION], 0);
 
-	complete->priv->searching = FALSE;
+	g_signal_emit (complete, e_completion_signals[COMPLETION_STARTED], 0, text, pos, limit);
+	if (klass->request_completion)
+		klass->request_completion (complete, text, pos, limit);
 }
 
 gboolean
@@ -460,15 +214,6 @@ e_completion_searching (ECompletion *complete)
 	return complete->priv->searching;
 }
 
-gboolean
-e_completion_refining (ECompletion *complete)
-{
-	g_return_val_if_fail (complete != NULL, FALSE);
-	g_return_val_if_fail (E_IS_COMPLETION (complete), FALSE);
-
-	return complete->priv->refining;
-}
-
 const gchar *
 e_completion_search_text (ECompletion *complete)
 {
@@ -493,7 +238,7 @@ e_completion_match_count (ECompletion *complete)
 	g_return_val_if_fail (complete != NULL, 0);
 	g_return_val_if_fail (E_IS_COMPLETION (complete), 0);
 
-	return complete->priv->refinement_count > 0 ? complete->priv->match_count : complete->priv->matches->len;
+	return complete->priv->matches->len;
 }
 
 void
@@ -511,9 +256,7 @@ e_completion_foreach_match (ECompletion *complete, ECompletionMatchFn fn, gpoint
 	m = complete->priv->matches;
 	for (i = 0; i < m->len; i++) {
 		ECompletionMatch *match = g_ptr_array_index (m, i);
-		if (match->hit_count == complete->priv->refinement_count) {
-			fn (match, closure);
-		}
+		fn (match, closure);
 	}
 }
 
@@ -554,25 +297,6 @@ e_completion_sort (ECompletion *complete)
 	return diff;
 }
 
-/* Emit a restart signal and re-declare our matches, up to the limit. */
-static void
-e_completion_restart (ECompletion *complete)
-{
-	GPtrArray *m;
-	gint i, count;
-
-	g_signal_emit (complete, e_completion_signals[E_COMPLETION_RESTART_COMPLETION], 0);
-	
-	m = complete->priv->matches;
-	for (i = count = 0; 
-	     i < m->len && count < complete->priv->limit; 
-	     i++, count++) {
-		g_signal_emit (complete,
-			       e_completion_signals[E_COMPLETION_COMPLETION], 0,
-			       g_ptr_array_index (m, i));
-	}
-}
-
 void
 e_completion_found_match (ECompletion *complete, ECompletionMatch *match)
 {
@@ -594,47 +318,22 @@ e_completion_found_match (ECompletion *complete, ECompletionMatch *match)
 
 	e_completion_add_match (complete, match);
 
-	g_signal_emit (complete, e_completion_signals[E_COMPLETION_COMPLETION], 0, match);
-}
-
-/* to optimize this, make the match a hash table */
-void
-e_completion_lost_match (ECompletion *complete, ECompletionMatch *match)
-{
-	gboolean removed;
-
-	g_return_if_fail (E_IS_COMPLETION (complete));
-	g_return_if_fail (match != NULL);
-
-	/* FIXME: remove fast */
-	removed = g_ptr_array_remove (complete->priv->matches,
-				      match);
-
-	/* maybe just return here? */
-	g_return_if_fail (removed);
-
-	g_signal_emit (complete, e_completion_signals[E_COMPLETION_LOST_COMPLETION], 0, match);
-
-	e_completion_match_unref (match);
+	g_signal_emit (complete, e_completion_signals[COMPLETION_FOUND], 0, match);
 }
 
 void
-e_completion_end_search (ECompletion *complete)
+e_completion_end_search (ECompletion *comp)
 {
-	g_return_if_fail (complete != NULL);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-	g_return_if_fail (complete->priv->searching);
-
-	/* our table model should be sorted by a non-visible column of
-	 * doubles (the score) rather than whatever we are doing 
-	 */
-	/* If sorting by score accomplishes anything, issue a restart right before we end. */
-	if (e_completion_sort (complete))
-		e_completion_restart (complete);
+	g_return_if_fail (comp != NULL);
+	g_return_if_fail (E_IS_COMPLETION (comp));
+	g_return_if_fail (comp->priv->searching);
 
-	g_signal_emit (complete, e_completion_signals[E_COMPLETION_END_COMPLETION], 0);
+	if (E_COMPLETION_CLASS (GTK_OBJECT_GET_CLASS (comp))->end_completion) {
+		E_COMPLETION_CLASS (GTK_OBJECT_GET_CLASS (comp))->end_completion (comp);
+	}
+	g_signal_emit (comp, e_completion_signals[COMPLETION_FINISHED], 0);
 
-	complete->priv->searching = FALSE;
-	complete->priv->done_search = TRUE;
+	comp->priv->searching = FALSE;
+	comp->priv->done_search = TRUE;
 }