callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't set our parent window as the efhd, ehfd isn't even a widget.

Browse Source 
2004-03-05  Jeffrey Stedfast  <fejj@ximian.com>

	* em-format-html-display.c (em_format_html_display_search): Don't
	set our parent window as the efhd, ehfd isn't even a widget.

	Fixes bug #54030

	* em-format-html-display.c (efhd_search_response): Reset the
	searching tokeniser on Cancel.

	* e-searching-tokenizer.c (e_searching_tokenizer_reset): New
	function to reset a search tokeniser.

svn path=/trunk/; revision=24977
This commit is contained in:
Jeffrey Stedfast
2004-03-05 19:46:20 +00:00
committed by Jeffrey Stedfast
parent 771d438d34
commit b11b2abeeb
5 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mail/ChangeLog
View File

@ -1,3 +1,16 @@
2004-03-05 Jeffrey Stedfast <fejj@ximian.com>
* em-format-html-display.c (em_format_html_display_search): Don't
set our parent window as the efhd, ehfd isn't even a widget.
Fixes bug #54030
* em-format-html-display.c (efhd_search_response): Reset the
searching tokeniser on Cancel.
* e-searching-tokenizer.c (e_searching_tokenizer_reset): New
function to reset a search tokeniser.
2004-03-05 Not Zed <NotZed@Ximian.com>
** See bug #55096.

11
mail/e-searching-tokenizer.c
View File

@ -1242,10 +1242,19 @@ e_searching_tokenizer_set_secondary_case_sensitivity (ESearchingTokenizer *st, g
gint
e_searching_tokenizer_match_count (ESearchingTokenizer *st)
{
g_return_val_if_fail (st && E_IS_SEARCHING_TOKENIZER (st), -1);
g_return_val_if_fail (E_IS_SEARCHING_TOKENIZER (st), -1);
if (st->priv->engine)
return st->priv->engine->matchcount;
return 0;
}
void
e_searching_tokenizer_reset (ESearchingTokenizer *st)
{
if (st->priv->engine) {
searcher_free (st->priv->engine);
st->priv->engine = NULL;
}
}

2
mail/e-searching-tokenizer.h
View File

@ -70,5 +70,7 @@ void e_searching_tokenizer_set_secondary_case_sensitivity (ESearchingTokenizer *
int e_searching_tokenizer_match_count (ESearchingTokenizer *);
void e_searching_tokenizer_reset (ESearchingTokenizer *);
#endif /* __E_SEARCHING_TOKENIZER_H__ */

2
mail/em-format-html-display.c
View File

@ -457,6 +457,7 @@ efhd_search_response(GtkWidget *w, int button, EMFormatHTMLDisplay *efhd)
g_free(p->search_text);
p->search_text = NULL;
gtk_widget_destroy((GtkWidget *)p->search_dialog);
e_searching_tokenizer_reset (efhd->search_tok);
p->search_dialog = NULL;
}
}
@ -516,7 +517,6 @@ em_format_html_display_search(EMFormatHTMLDisplay *efhd)
g_signal_connect(p->search_entry, "activate", G_CALLBACK(efhd_search_entry_activate), efhd);
g_signal_connect(p->search_case_check, "toggled", G_CALLBACK(efhd_search_case_toggled), efhd);
g_signal_connect(p->search_dialog, "response", G_CALLBACK(efhd_search_response), efhd);
e_dialog_set_transient_for((GtkWindow *)p->search_dialog, (GtkWidget *)efhd);
gtk_widget_show((GtkWidget *)p->search_dialog);
}

2
mail/em-format-html.c
View File

@ -1392,7 +1392,7 @@ efh_format_address (GString *out, struct _camel_header_address *a)
case CAMEL_HEADER_ADDRESS_NAME:
if (name && *name) {
char *real, *mailaddr;
g_string_append_printf (out, "%s &lt;", name);
/* rfc2368 for mailto syntax and url encoding extras */
real = camel_header_encode_phrase(a->name);