From d545bdb78cc302db6f3b4bd82dc3570fd5561949 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 12 Jan 2013 15:05:35 -0500
Subject: Avoid deprecated libedataserver APIs.

I forgot to include this in 3.7.4, but no matter.
---
 plugins/bbdb/bbdb.c        |  8 +++++---
 plugins/bbdb/gaimbuddies.c | 13 ++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'plugins/bbdb')

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;
 		}
 
-- 
cgit v1.2.3