Rework find implementation to integrate better with type ahead and to

2003-07-20  Marco Pesenti Gritti  <marco@it.gnome.org>

	* embed/ephy-embed.c: (ephy_embed_find_set_properties),
	(ephy_embed_find_next):
	* embed/ephy-embed.h:
	* embed/find-dialog.c: (update_navigation_controls), (impl_show),
	(find_dialog_class_init), (set_properties), (sync_page_change),
	(sync_embed), (find_dialog_init), (find_dialog_finalize),
	(find_dialog_go_next), (find_dialog_go_prev),
	(find_close_button_clicked_cb), (find_next_button_clicked_cb),
	(find_prev_button_clicked_cb), (find_entry_changed_cb),
	(find_check_toggled_cb):
	* embed/find-dialog.h:
	* embed/mozilla/EphyWrapper.cpp:
	* embed/mozilla/EphyWrapper.h:
	* embed/mozilla/Makefile.am:
	* embed/mozilla/mozilla-embed.cpp:
	* lib/ephy-dialog.h:
	* src/ephy-window.c: (ephy_window_find):
	* src/ephy-window.h:
	* src/window-commands.c: (window_cmd_edit_find),
	(window_cmd_edit_find_next), (window_cmd_edit_find_prev):

	Rework find implementation to integrate better
	with type ahead and to simplify the code.
	Do not try to set menus sensitivity because
	mozilla doesnt provide an api for it and it breaks
	with type ahead.

	* lib/ephy-dialog.c: (ephy_dialog_class_init),
	(ephy_dialog_finalize), (dialog_destroy_cb), (impl_construct),
	(ephy_dialog_construct):

	Remove no more used destruct crap.

1 files changed, 13 insertions, 15 deletions

diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index 376213c0e..aec3d87a9 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -94,17 +94,6 @@ typedef enum
 
 typedef struct
 {
-        gchar *search_string;
-        gboolean backwards;
-        gboolean wrap;
-        gboolean entire_word;
-        gboolean match_case;
-        gboolean search_frames;
-	gboolean interactive;
-} EmbedFindInfo;
-
-typedef struct
-{
         gboolean print_to_file;
         gchar *printer;
         gchar *file;
@@ -263,8 +252,12 @@ struct EphyEmbedClass
 	gresult   (* get_security_level)   (EphyEmbed *embed,
 					    EmbedSecurityLevel *level,
 					    char **description);
-	gresult   (* find)                 (EphyEmbed *embed,
-				            EmbedFindInfo *find);
+	gresult   (* find_set_properties)  (EphyEmbed *embed,
+					    char *search_string,
+					    gboolean case_sensitive,
+					    gboolean wrap_around);
+	gresult	  (* find_next)	           (EphyEmbed *embed,
+					    gboolean backwards);
 	gresult   (* print)                (EphyEmbed *embed,
 				            EmbedPrintInfo *info);
 	gresult	  (* print_preview_close)  (EphyEmbed *embed);
@@ -384,8 +377,13 @@ gresult       ephy_embed_get_security_level   (EphyEmbed *embed,
 					       EmbedSecurityLevel *level,
 					       char **description);
 
-gresult       ephy_embed_find                 (EphyEmbed *embed,
-					       EmbedFindInfo *find);
+gresult       ephy_embed_find_set_properties  (EphyEmbed *embed,
+					       char *search_string,
+					       gboolean case_sensitive,
+					       gboolean wrap_around);
+
+gresult	      ephy_embed_find_next	      (EphyEmbed *embed,
+					       gboolean backwards);
 
 gresult       ephy_embed_set_encoding         (EphyEmbed *embed,
 					       const char *encoding);