aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/bbdb
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-01-13 04:05:35 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-01-15 22:43:40 +0800
commitd545bdb78cc302db6f3b4bd82dc3570fd5561949 (patch)
tree039d870fe122981e706c58ec20effe9e756c65b4 /plugins/bbdb
parent720b43ba4d86bbf2a2f4f4f6d3624bf87bd1cf69 (diff)
downloadgsoc2013-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 'plugins/bbdb')
-rw-r--r--plugins/bbdb/bbdb.c8
-rw-r--r--plugins/bbdb/gaimbuddies.c13
2 files changed, 15 insertions, 6 deletions
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index c6e60b005a..26d1e48d27 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -301,7 +301,7 @@ bbdb_do_it (EBookClient *client,
status = e_book_client_get_contacts_sync (client, query_string, &contacts, NULL, NULL);
g_free (query_string);
if (contacts != NULL || !status) {
- e_client_util_free_object_slist (contacts);
+ g_slist_free_full (contacts, (GDestroyNotify) g_object_unref);
g_free (temp_name);
return;
@@ -329,7 +329,9 @@ bbdb_do_it (EBookClient *client,
* name, just give up; we're not smart enough for
* this. */
if (!status || contacts->next != NULL) {
- e_client_util_free_object_slist (contacts);
+ g_slist_free_full (
+ contacts,
+ (GDestroyNotify) g_object_unref);
g_free (temp_name);
return;
}
@@ -341,7 +343,7 @@ bbdb_do_it (EBookClient *client,
g_error_free (error);
}
- e_client_util_free_object_slist (contacts);
+ g_slist_free_full (contacts, (GDestroyNotify) g_object_unref);
g_free (temp_name);
return;
}
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index d9a0cd9bd3..228eae2613 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -245,14 +245,18 @@ bbdb_sync_buddy_list_in_thread (gpointer data)
* name, just give up; we're not smart enough for
* this. */
if (contacts->next != NULL) {
- e_client_util_free_object_slist (contacts);
+ g_slist_free_full (
+ contacts,
+ (GDestroyNotify) g_object_unref);
continue;
}
c = E_CONTACT (contacts->data);
if (!bbdb_merge_buddy_to_contact (std->client, b, c)) {
- e_client_util_free_object_slist (contacts);
+ g_slist_free_full (
+ contacts,
+ (GDestroyNotify) g_object_unref);
continue;
}
@@ -261,7 +265,10 @@ bbdb_sync_buddy_list_in_thread (gpointer data)
g_warning ("bbdb: Could not modify contact: %s", error->message);
g_error_free (error);
}
- e_client_util_free_object_slist (contacts);
+
+ g_slist_free_full (
+ contacts,
+ (GDestroyNotify) g_object_unref);
continue;
}