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

No need to query for the persist-stream interface here, just re-use

Browse Source 
2002-04-08  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (set_editor_text): No need to query for the
	persist-stream interface here, just re-use
	composer->persist_stream_interface - this might improve the speed
	at which a reply action brings up the composer.

svn path=/trunk/; revision=16425
This commit is contained in:
Jeffrey Stedfast
2002-04-10 19:38:56 +00:00
committed by Jeffrey Stedfast
parent 796b9fe197
commit f6b7c9d6e5
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
composer/ChangeLog
View File

@ -1,3 +1,10 @@
2002-04-08 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (set_editor_text): No need to query for the
persist-stream interface here, just re-use
composer->persist_stream_interface - this might improve the speed
at which a reply action brings up the composer.
2002-04-09 Not Zed <NotZed@Ximian.com> 2002-04-09 Not Zed <NotZed@Ximian.com>
* e-msg-composer-hdrs.c (set_recipients_from_destv): Use decode * e-msg-composer-hdrs.c (set_recipients_from_destv): Use decode

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

@ -882,28 +882,25 @@ set_editor_text (EMsgComposer *composer, const char *text)
BonoboWidget *editor; BonoboWidget *editor;
CORBA_Environment ev; CORBA_Environment ev;
g_return_if_fail (composer->persist_stream_interface != CORBA_OBJECT_NIL);
persist = composer->persist_stream_interface;
editor = BONOBO_WIDGET (composer->editor); editor = BONOBO_WIDGET (composer->editor);
CORBA_exception_init (&ev); 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), TRUE, FALSE);
stream = bonobo_stream_mem_create (text, strlen (text),
TRUE, FALSE);
Bonobo_PersistStream_load (persist, (Bonobo_Stream)bonobo_object_corba_objref (BONOBO_OBJECT (stream)), Bonobo_PersistStream_load (persist, (Bonobo_Stream)bonobo_object_corba_objref (BONOBO_OBJECT (stream)),
"text/html", &ev); "text/html", &ev);
if (ev._major != CORBA_NO_EXCEPTION) { if (ev._major != CORBA_NO_EXCEPTION) {
/* FIXME. Some error message. */ /* FIXME. Some error message. */
return; return;
} }
if (ev._major != CORBA_SYSTEM_EXCEPTION)
CORBA_Object_release (persist, &ev);
Bonobo_Unknown_unref (persist, &ev);
CORBA_exception_free (&ev); CORBA_exception_free (&ev);
bonobo_object_unref (BONOBO_OBJECT(stream));
bonobo_object_unref (BONOBO_OBJECT (stream));
} }
static void static void
@ -2736,7 +2733,7 @@ create_composer (void)
gtk_widget_show (composer->editor); gtk_widget_show (composer->editor);
e_msg_composer_show_attachments (composer, FALSE); e_msg_composer_show_attachments (composer, FALSE);
prepare_engine (composer); prepare_engine (composer);
if (composer->editor_engine == CORBA_OBJECT_NIL) { if (composer->editor_engine == CORBA_OBJECT_NIL) {
e_activation_failure_dialog (GTK_WINDOW (composer), e_activation_failure_dialog (GTK_WINDOW (composer),
@ -2749,12 +2746,12 @@ create_composer (void)
} }
gtk_signal_connect (GTK_OBJECT (composer), "map", map_default_cb, NULL); gtk_signal_connect (GTK_OBJECT (composer), "map", map_default_cb, NULL);
if (am == NULL) { if (am == NULL) {
am = autosave_manager_new (); am = autosave_manager_new ();
} }
autosave_manager_register (am, composer); autosave_manager_register (am, composer);
return composer; return composer;
} }