diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-06-15 20:24:47 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-06-15 20:26:18 +0800 |
| commit | 9311500db857b2427322733ef4b20cedca00ad9e (patch) | |
| tree | 1c2c7835cf238f560bf3df9007927178c37da256 /mail | |
| parent | f642e03d4967c80aaad45475475752264c95de5c (diff) | |
| download | gsoc2013-evolution-9311500db857b2427322733ef4b20cedca00ad9e.tar.gz gsoc2013-evolution-9311500db857b2427322733ef4b20cedca00ad9e.tar.zst gsoc2013-evolution-9311500db857b2427322733ef4b20cedca00ad9e.zip | |
Avoid em_utils_uids_free() in other places.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-composer-utils.c | 4 | ||||
| -rw-r--r-- | mail/em-utils.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index b89b995f23..a3ffc853ff 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -110,7 +110,7 @@ forward_data_free (ForwardData *data) g_object_unref (data->folder); if (data->uids != NULL) - em_utils_uids_free (data->uids); + g_ptr_array_unref (data->uids); g_slice_free (ForwardData, data); } @@ -1597,7 +1597,7 @@ setup_forward_attached_callbacks (EMsgComposer *composer, data = g_slice_new0 (ForwardData); data->folder = g_object_ref (folder); - data->uids = em_utils_uids_copy (uids); + data->uids = g_ptr_array_ref (uids); g_signal_connect ( composer, "send", diff --git a/mail/em-utils.c b/mail/em-utils.c index 16a0d677ae..8d3a25758e 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -869,6 +869,7 @@ em_utils_selection_get_uidlist (GtkSelectionData *selection_data, return; items = g_ptr_array_new (); + g_ptr_array_set_free_func (items, (GDestroyNotify) g_free); inptr = (gchar *) data; inend = (gchar *) (data + length); @@ -884,7 +885,7 @@ em_utils_selection_get_uidlist (GtkSelectionData *selection_data, } if (items->len == 0) { - g_ptr_array_free (items, TRUE); + g_ptr_array_unref (items); return; } @@ -927,7 +928,7 @@ em_utils_selection_get_uidlist (GtkSelectionData *selection_data, } g_hash_table_destroy (uids_by_uri); - em_utils_uids_free (items); + g_ptr_array_unref (items); if (local_error) g_propagate_error (error, local_error); |