[evolution-patches] Fix for bug #328522

[Irene Huang <Irene Huang Sun COM>]

Hi, 

	The attached is the patch for review. 

	Thanks

--Irene

Index: components/html-editor/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
retrieving revision 1.523
diff -u -r1.523 ChangeLog
--- components/html-editor/ChangeLog	13 Jan 2006 13:17:23 -0000	1.523
+++ components/html-editor/ChangeLog	25 Jan 2006 08:01:10 -0000
@@ -1,3 +1,12 @@
+2006-01-25  Irene Huang <Irene Huang sun com>
+
+	Fixes bug #328522
+
+	* search.c: (search_dialog_response), (search):
+	No use hiding search dialog in search_dialog_response
+	when response_id equals GTK_RESPONSE_CANCEL. Destroy it
+	in search_dialog_response instead of in search.
+	
 2006-01-13  Srinivasa Ragavan  <sragavan novell com>
 
 	** Fixes bug #326381
Index: components/html-editor/search.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/search.c,v
retrieving revision 1.31
diff -u -r1.31 search.c
--- components/html-editor/search.c	17 May 2005 14:48:59 -0000	1.31
+++ components/html-editor/search.c	25 Jan 2006 08:01:10 -0000
@@ -95,8 +95,8 @@
 	case GTK_RESPONSE_DELETE_EVENT:
 	case GTK_RESPONSE_CLOSE:
 	case GTK_RESPONSE_CANCEL:
-		gtk_dialog_set_response_sensitive (d->dialog, 0, TRUE);
-		gtk_widget_hide (GTK_WIDGET (d->dialog));
+		d->cd->search_dialog = NULL;
+		gtk_html_search_dialog_destroy (d);
 		gtk_widget_grab_focus (GTK_WIDGET (d->cd->html));
 		break;
 	}
@@ -169,13 +169,6 @@
 search (GtkHTMLControlData *cd)
 {
 	RUN_DIALOG (search, _("Find"));
-
-	g_assert (cd->search_dialog && cd->search_dialog->dialog);
-
-	if (!GTK_WIDGET_VISIBLE (cd->search_dialog->dialog)) {
-		gtk_html_search_dialog_destroy (cd->search_dialog);
-		cd->search_dialog = NULL;
-	}
 }
 
 void