aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer.c9
2 files changed, 12 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 6a1d6aea09..ee4fb4d89d 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-11 Jon Trowbridge <trow@ximian.com>
+
+ * e-msg-composer.c (e_msg_composer_construct): Rearranged
+ gtk_widget_show()s a bit to fix Bug#3204. The composer is now
+ (like the rest of Evo) properly network transparent.
+
2001-06-08 Jon Trowbridge <trow@ximian.com>
* e-msg-composer.c (save_draft): When saving a draft, attach
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 1248d002b5..a785be5c2a 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1441,7 +1441,7 @@ setup_ui (EMsgComposer *composer)
composer->uic = bonobo_ui_component_new ("evolution-message-composer");
bonobo_ui_component_set_container (
- composer->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
+ composer->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
bonobo_ui_component_add_verb_list_with_data (
composer->uic, verbs, composer);
@@ -1968,9 +1968,7 @@ e_msg_composer_construct (EMsgComposer *composer)
composer->persist_stream_interface
= bonobo_object_query_interface (editor_server, "IDL:Bonobo/PersistStream:1.0");
- gtk_widget_show (composer->editor);
gtk_box_pack_start (GTK_BOX (vbox), composer->editor, TRUE, TRUE, 0);
- gtk_widget_show (composer->editor);
/* Attachment editor, wrapped into an EScrollFrame. We don't
show it for now. */
@@ -1994,6 +1992,11 @@ e_msg_composer_construct (EMsgComposer *composer)
bonobo_window_set_contents (BONOBO_WINDOW (composer), vbox);
gtk_widget_show (vbox);
+
+ /* If we show this widget earlier, we lose network transparency. i.e. the
+ component appears on the machine evo is running on, ignoring any DISPLAY
+ variable. */
+ gtk_widget_show (composer->editor);
e_msg_composer_show_attachments (composer, FALSE);