diff options
| -rw-r--r-- | composer/ChangeLog | 8 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 14 |
2 files changed, 15 insertions, 7 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 12c3ec2805..aa3994c218 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,11 @@ +2003-03-20 Jeffrey Stedfast <fejj@ximian.com> + + Fixes for bug #39813 + + * e-msg-composer.c (composer_finalise): Don't unregister the + signature event handler here. + (destroy): Unregister it here instead. + 2003-03-19 Jeffrey Stedfast <fejj@ximian.com> * e-msg-composer.c (add_attachments_handle_mime_part): Change the diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 1217a1d22d..e913e52e67 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2311,11 +2311,9 @@ static void composer_finalise (GObject *object) { EMsgComposer *composer; - + composer = E_MSG_COMPOSER (object); - - mail_config_signature_unregister_client ((MailConfigSignatureClient) sig_event_client, composer); - + if (composer->extra_hdr_names) { int i; @@ -2334,10 +2332,10 @@ composer_finalise (GObject *object) g_free (composer->charset); g_free (composer->mime_type); g_free (composer->mime_body); - + if (composer->redirect) camel_object_unref (composer->redirect); - + if (G_OBJECT_CLASS (parent_class)->finalize != NULL) (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -2362,7 +2360,7 @@ destroy (GtkObject *object) CORBA_Environment ev; composer = E_MSG_COMPOSER (object); - + CORBA_exception_init (&ev); if (composer->uic) { @@ -2407,6 +2405,8 @@ destroy (GtkObject *object) composer->editor_listener = NULL; } + mail_config_signature_unregister_client ((MailConfigSignatureClient) sig_event_client, composer); + if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } |