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

Use set_editor_text() (e_msg_composer_new_from_url): Same.

Browse Source 
2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (e_msg_composer_flush_pending_body): Use
	set_editor_text()
	(e_msg_composer_new_from_url): Same.
	(e_msg_composer_set_body_text): Re-Show the signature.

svn path=/trunk/; revision=15692
This commit is contained in:
Jeffrey Stedfast
2002-02-12 21:42:00 +00:00
committed by Jeffrey Stedfast
parent 80b691582f
commit 24c0e32fa5
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
composer/ChangeLog
View File

@ -1,3 +1,10 @@
2002-02-12 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (e_msg_composer_flush_pending_body): Use
set_editor_text()
(e_msg_composer_new_from_url): Same.
(e_msg_composer_set_body_text): Re-Show the signature.
2002-02-12 Radek Doulik <rodo@ximian.com>
* e-msg-composer.c (e_msg_composer_is_dirty): reflect gtkhtml API

17
composer/e-msg-composer.c
View File

@ -843,7 +843,7 @@ set_editor_text (EMsgComposer *composer, const char *text)
CORBA_exception_init (&ev);
persist = (Bonobo_PersistStream) bonobo_object_client_query_interface (
bonobo_widget_get_server (editor), "IDL:Bonobo/PersistStream:1.0", &ev);
g_return_if_fail (persist != CORBA_OBJECT_NIL);
stream = bonobo_stream_mem_create (text, strlen (text),
@ -2614,7 +2614,7 @@ e_msg_composer_flush_pending_body (EMsgComposer *composer, gboolean apply)
body = gtk_object_get_data (GTK_OBJECT (composer), "body:text");
if (body) {
if (apply)
e_msg_composer_set_body_text (composer, body);
set_editor_text (composer, body);
gtk_object_set_data (GTK_OBJECT (composer), "body:text", NULL);
g_free (body);
@ -3124,8 +3124,10 @@ e_msg_composer_new_from_url (const char *url_in)
}
if (body) {
char *htmlbody = e_text_to_html (body, E_TEXT_TO_HTML_PRE);
e_msg_composer_set_body_text (composer, htmlbody);
char *htmlbody;
htmlbody = e_text_to_html (body, E_TEXT_TO_HTML_PRE);
set_editor_text (composer, htmlbody);
g_free (htmlbody);
}
@ -3195,10 +3197,11 @@ e_msg_composer_set_body_text (EMsgComposer *composer, const char *text)
{
g_return_if_fail (E_IS_MSG_COMPOSER (composer));
printf ("setting as body text:\n-----\n%s\n-----\n", text);
fflush (stdout);
set_editor_text (composer, text);
/* set editor text unfortunately kills the signature so we
have to re-show it */
e_msg_composer_show_sig_file (composer);
}