ignore test-completion.

2003-02-09  Chris Toshok  <toshok@ximian.com>

	* tests/.cvsignore: ignore test-completion.

	* tests/test-completion.c: new program, completion test.

	* tests/Makefile.am (noinst_PROGRAMS): add test-completion.

	* gal/e-text/Makefile.am: remove e-completion-test from the build
	here, moving it to ../../tests.

	* gal/e-text/e-completion.c (e_completion_class_init): we've
	removed the restart, cancel, clear, and lost signals.  Also, we've
	renamed some so it's easier to tell from the name which it is
	(virtual func or signal.)
	(e_completion_dispose): remove call to clear_search_stack, as we
	don't do auto-refinement anymore.
	(e_completion_clear): gone.
	(e_completion_push_search): gone.
	(e_completion_pop_search): gone.
	(e_completion_clear_search_stack): gone.
	(e_completion_refine_search): gone.
	(e_completion_unrefine_search): gone.
	(e_completion_begin_search): substantially clear this up, since we
	don't have the refinement stuff anymore.  Also, the call to
	request_completion is a virtual function call, not a signal.
	(e_completion_match_count): always return matches->len here, never
	match_count, which is gone (with the refinement stuff)
	(e_completion_foreach_match): remove the hit_count stuff.
	(e_completion_restart): gone.
	(e_completion_lost_match): gone.
	(e_completion_end_search): remove the sorting stuff from here (and
	the call to restart.)  the etable sorting stuff will have to take
	up the slack, but for now there's no reason to restart the search
	here.

	* gal/e-text/e-completion.h (struct _ECompletionClass): straighten
	out what's a virtual function and what's a signal, instead of
	using signals for both.  Also, remove the auto_refine stuff, as
	it's not used.

	* gal/e-text/e-completion-view.c (e_completion_view_size_request):
	make the damn drop down window bigger (100 pixels, or the
	requisition height, whichever is bigger.)
	(e_completion_view_disconnect): remove handling for signals that
	are gone.
	(restart_completion_cb): gone.
	(cancel_completion_cb): gone.
	(clear_completion_cb): gone.
	(lost_completion_cb): gone.
	(e_completion_view_construct): track new names of ECompletion
	signals.

	* gal/e-text/e-completion-view.h (struct _ECompletionView): remove
	restart_signal_id, cancel_signal_id, clear_signal_id, and
	lost_signal_id.

	* gal/e-text/e-entry.c (get_borders): new function, ala gtkentry.
	(canvas_size_request): use get_borders instead of computing it
	here.
	(e_entry_init): remove duplicate assignment of
	emulate_label_resize.
	(e_entry_show_popup): remove some ifdef'ed crap.
	(e_entry_start_completion): don't cancel the completion before
	starting again.  This keeps the popup from disappearing.

	* gal/e-text/e-completion-match.c (e_completion_match_construct):
	no more hit_count.

	* gal/e-text/e-completion-match.h (struct _ECompletionMatch):
	remove hit_count.

	* gal/e-text/e-completion-callbacks.[ch]: new class so we can use
	callbacks instead of subclassing.

svn path=/trunk/; revision=19859

1 files changed, 5 insertions, 16 deletions

diff --git a/widgets/text/e-completion.h b/widgets/text/e-completion.h
index f8d38e45a7..74976e579c 100644
--- a/widgets/text/e-completion.h
+++ b/widgets/text/e-completion.h
@@ -52,29 +52,20 @@ struct _ECompletionClass {
 	GtkObjectClass parent_class;
 
 	/* virtual functions */
-	ECompletionRefineFn (*auto_refine) (ECompletion *comp,
-					    const gchar *old_text, gint old_pos,
-					    const gchar *new_text, gint new_pos);
-	gboolean            ignore_pos_on_auto_unrefine;
-
-	/* Signals */
 	void     (*request_completion)  (ECompletion *comp, const gchar *search_text, gint pos, gint limit);
+	void     (*end_completion)      (ECompletion *comp);
 
-	void     (*begin_completion)    (ECompletion *comp, const gchar *search_text, gint pos, gint limit);
-	void     (*restart_completion)  (ECompletion *comp);
+	/* Signals */
+	void     (*completion_started)  (ECompletion *comp, const gchar *search_text, gint pos, gint limit);
 
-	void     (*completion)         (ECompletion *comp, ECompletionMatch *match);
-	void     (*lost_completion)    (ECompletion *comp, ECompletionMatch *match);
+	void     (*completion_found)    (ECompletion *comp, ECompletionMatch *match);
 
-	void     (*cancel_completion)  (ECompletion *comp);
-	void     (*end_completion)     (ECompletion *comp);
-	void     (*clear_completion)   (ECompletion *comp);
+	void     (*completion_finished) (ECompletion *comp);
 };
 
 GtkType      e_completion_get_type (void);
 
 void         e_completion_begin_search    (ECompletion *comp, const gchar *text, gint pos, gint limit);
-void         e_completion_cancel_search   (ECompletion *comp);
 
 gboolean     e_completion_searching       (ECompletion *comp);
 gboolean     e_completion_refining        (ECompletion *comp);
@@ -91,8 +82,6 @@ ECompletion *e_completion_new (void);
    or very bad things might happen. */
 
 void         e_completion_found_match (ECompletion *comp, ECompletionMatch *);
-void         e_completion_lost_match  (ECompletion *comp, ECompletionMatch *);
-void         e_completion_clear       (ECompletion *comp);
 void         e_completion_end_search  (ECompletion *comp);
 
 G_END_DECLS