diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-09-17 04:54:07 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-09-17 04:54:07 +0800 |
| commit | 7054bd6586285a9d8c8e7b3e02c67c5c69bc85e7 (patch) | |
| tree | cefe53d5196057e5a452d7293253294ccd627746 /composer/e-msg-composer-hdrs.c | |
| parent | 01435199611a59f028c9093ab0cc476bad70fcc5 (diff) | |
| download | gsoc2013-evolution-7054bd6586285a9d8c8e7b3e02c67c5c69bc85e7.tar.gz gsoc2013-evolution-7054bd6586285a9d8c8e7b3e02c67c5c69bc85e7.tar.zst gsoc2013-evolution-7054bd6586285a9d8c8e7b3e02c67c5c69bc85e7.zip | |
Don't gtk_object_destroy() the pixbuf loader, unref it instead.
2001-09-16 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer-attachment-bar.c (update): Don't
gtk_object_destroy() the pixbuf loader, unref it instead.
* e-msg-composer-hdrs.c (destroy): Don't forget to free the
private structure.
svn path=/trunk/; revision=12862
Diffstat (limited to 'composer/e-msg-composer-hdrs.c')
| -rw-r--r-- | composer/e-msg-composer-hdrs.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index 231c036e90..90bbddd941 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -517,6 +517,8 @@ destroy (GtkObject *object) } g_slist_free (priv->from_options); + g_free (priv); + if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } @@ -963,7 +965,7 @@ e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs) EDestination **cc_destv; EDestination **bcc_destv; EDestination **recip_destv; - gint i, j, N; + gint i, j, n; g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL); @@ -971,16 +973,16 @@ e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs) cc_destv = e_msg_composer_hdrs_get_cc (hdrs); bcc_destv = e_msg_composer_hdrs_get_bcc (hdrs); - N = 0; + n = 0; - for (i = 0; to_destv && to_destv[i] != NULL; ++i, ++N); - for (i = 0; cc_destv && cc_destv[i] != NULL; ++i, ++N); - for (i = 0; bcc_destv && bcc_destv[i] != NULL; ++i, ++N); + for (i = 0; to_destv && to_destv[i] != NULL; ++i, ++n); + for (i = 0; cc_destv && cc_destv[i] != NULL; ++i, ++n); + for (i = 0; bcc_destv && bcc_destv[i] != NULL; ++i, ++n); - if (N == 0) + if (n == 0) return NULL; - recip_destv = g_new (EDestination *, N+1); + recip_destv = g_new (EDestination *, n+1); j = 0; @@ -991,7 +993,7 @@ e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs) for (i = 0; bcc_destv && bcc_destv[i] != NULL; ++i, ++j) recip_destv[j] = bcc_destv[i]; - g_assert (j == N); + g_assert (j == n); recip_destv[j] = NULL; g_free (to_destv); |