diff options
-rw-r--r-- | composer/ChangeLog | 4 | ||||
-rw-r--r-- | composer/e-msg-composer.c | 21 | ||||
-rw-r--r-- | composer/e-msg-composer.h | 1 | ||||
-rw-r--r-- | composer/evolution-composer.c | 2 |
4 files changed, 6 insertions, 22 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 45e7d946e4..6461add96f 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,8 +1,12 @@ 2001-09-10 Jeffrey Stedfast <fejj@ximian.com> + * evolution-composer.c (init): Don't call new_with_sig_file, it no + longer exists. + * e-msg-composer.c (setup_ui): Make sure that the session is non-NULL. (menu_file_send_cb): And here too. + (e_msg_composer_new_with_sig_file): Removed. 2001-09-10 Jeffrey Stedfast <fejj@ximian.com> diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 69d63dfb93..1ffade52be 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2423,30 +2423,11 @@ e_msg_composer_new (void) EMsgComposer *new; new = create_composer (); - if (new) - set_editor_text (new, ""); - - return new; -} - -/** - * e_msg_composer_new_with_sig_file: - * - * Create a new message composer widget. Sets the signature file. - * - * Return value: A pointer to the newly created widget - **/ -EMsgComposer * -e_msg_composer_new_with_sig_file () -{ - EMsgComposer *new; - - new = create_composer (); if (new) { e_msg_composer_set_send_html (new, mail_config_get_send_html ()); set_editor_text (new, ""); } - + return new; } diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h index e661909662..e3cc8537ee 100644 --- a/composer/e-msg-composer.h +++ b/composer/e-msg-composer.h @@ -106,7 +106,6 @@ struct _EMsgComposerClass { GtkType e_msg_composer_get_type (void); void e_msg_composer_construct (EMsgComposer *composer); EMsgComposer *e_msg_composer_new (void); -EMsgComposer *e_msg_composer_new_with_sig_file (void); EMsgComposer *e_msg_composer_new_with_message (CamelMimeMessage *msg); EMsgComposer *e_msg_composer_new_from_url (const char *url); void e_msg_composer_show_attachments (EMsgComposer *composer, diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c index 6a24186fa2..2562c7c70d 100644 --- a/composer/evolution-composer.c +++ b/composer/evolution-composer.c @@ -248,7 +248,7 @@ init (EvolutionComposer *composer) const MailConfigAccount *account; account = mail_config_get_default_account (); - composer->composer = e_msg_composer_new_with_sig_file (); + composer->composer = e_msg_composer_new (); gtk_signal_connect (GTK_OBJECT (composer->composer), "send", GTK_SIGNAL_FUNC (send_cb), NULL); |