diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-01-13 04:05:35 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-01-15 22:43:40 +0800 |
| commit | d545bdb78cc302db6f3b4bd82dc3570fd5561949 (patch) | |
| tree | 039d870fe122981e706c58ec20effe9e756c65b4 /modules | |
| parent | 720b43ba4d86bbf2a2f4f4f6d3624bf87bd1cf69 (diff) | |
| download | gsoc2013-evolution-d545bdb78cc302db6f3b4bd82dc3570fd5561949.tar gsoc2013-evolution-d545bdb78cc302db6f3b4bd82dc3570fd5561949.tar.gz gsoc2013-evolution-d545bdb78cc302db6f3b4bd82dc3570fd5561949.tar.bz2 gsoc2013-evolution-d545bdb78cc302db6f3b4bd82dc3570fd5561949.tar.lz gsoc2013-evolution-d545bdb78cc302db6f3b4bd82dc3570fd5561949.tar.xz gsoc2013-evolution-d545bdb78cc302db6f3b4bd82dc3570fd5561949.tar.zst gsoc2013-evolution-d545bdb78cc302db6f3b4bd82dc3570fd5561949.zip | |
Avoid deprecated libedataserver APIs.
I forgot to include this in 3.7.4, but no matter.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/addressbook/e-book-shell-view-actions.c | 8 | ||||
| -rw-r--r-- | modules/vcard-inline/e-mail-parser-vcard-inline.c | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c index 01064f2da6..cbe2ef4e32 100644 --- a/modules/addressbook/e-book-shell-view-actions.c +++ b/modules/addressbook/e-book-shell-view-actions.c @@ -412,7 +412,7 @@ action_address_book_save_as_cb (GtkAction *action, g_object_unref (file); exit: - e_client_util_free_object_slist (list); + g_slist_free_full (list, (GDestroyNotify) g_object_unref); } static void @@ -506,7 +506,7 @@ action_contact_forward_cb (GtkAction *action, eab_send_as_attachment (shell, list); - e_client_util_free_object_slist (list); + g_slist_free_full (list, (GDestroyNotify) g_object_unref); } static void @@ -708,7 +708,7 @@ action_contact_save_as_cb (GtkAction *action, g_object_unref (file); exit: - e_client_util_free_object_slist (list); + g_slist_free_full (list, (GDestroyNotify) g_object_unref); } static void @@ -747,7 +747,7 @@ action_contact_send_message_cb (GtkAction *action, eab_send_as_to (shell, list); - e_client_util_free_object_slist (list); + g_slist_free_full (list, (GDestroyNotify) g_object_unref); } static void diff --git a/modules/vcard-inline/e-mail-parser-vcard-inline.c b/modules/vcard-inline/e-mail-parser-vcard-inline.c index 44032d4376..b871351d0a 100644 --- a/modules/vcard-inline/e-mail-parser-vcard-inline.c +++ b/modules/vcard-inline/e-mail-parser-vcard-inline.c @@ -127,7 +127,7 @@ client_loaded_cb (ESource *source, g_object_unref (client); exit: - e_client_util_free_object_slist (contact_list); + g_slist_free_full (contact_list, (GDestroyNotify) g_object_unref); } static void @@ -168,7 +168,9 @@ save_vcard_cb (WebKitDOMEventTarget *button, g_return_if_fail (source != NULL); - contact_list = e_client_util_copy_object_slist (NULL, vcard_part->contact_list); + contact_list = g_slist_copy_deep ( + vcard_part->contact_list, + (GCopyFunc) g_object_ref, NULL); e_client_utils_open_new ( source, E_CLIENT_SOURCE_TYPE_CONTACTS, |