Avoid deprecated libedataserver APIs.

I forgot to include this in 3.7.4, but no matter.

7 files changed, 39 insertions, 36 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index ef0700baed..b168b79985 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -4174,17 +4174,15 @@ e_contact_editor_dispose (GObject *object)
 		e_contact_editor->file_selector = NULL;
 	}
 
-	if (e_contact_editor->writable_fields) {
-		e_client_util_free_string_slist (
-			e_contact_editor->writable_fields);
-		e_contact_editor->writable_fields = NULL;
-	}
+	g_slist_free_full (
+		e_contact_editor->writable_fields,
+		(GDestroyNotify) g_free);
+	e_contact_editor->writable_fields = NULL;
 
-	if (e_contact_editor->required_fields) {
-		e_client_util_free_string_slist (
-			e_contact_editor->required_fields);
-		e_contact_editor->required_fields = NULL;
-	}
+	g_slist_free_full (
+		e_contact_editor->required_fields,
+		(GDestroyNotify) g_free);
+	e_contact_editor->required_fields = NULL;
 
 	if (e_contact_editor->contact) {
 		g_object_unref (e_contact_editor->contact);
@@ -4260,7 +4258,7 @@ supported_fields_cb (GObject *source_object,
 
 	g_object_set (ce, "writable_fields", fields, NULL);
 
-	e_client_util_free_string_slist (fields);
+	g_slist_free_full (fields, (GDestroyNotify) g_free);
 	g_free (prop_value);
 
 	eab_editor_show (EAB_EDITOR (ce));
@@ -4305,7 +4303,7 @@ required_fields_cb (GObject *source_object,
 
 	g_object_set (ce, "required_fields", fields, NULL);
 
-	e_client_util_free_string_slist (fields);
+	g_slist_free_full (fields, (GDestroyNotify) g_free);
 	g_free (prop_value);
 }
 
@@ -4499,21 +4497,22 @@ e_contact_editor_set_property (GObject *object,
 		break;
 	}
 	case PROP_WRITABLE_FIELDS:
-		if (editor->writable_fields)
-			e_client_util_free_string_slist (editor->writable_fields);
-
-		editor->writable_fields =
-			e_client_util_copy_string_slist (
-			NULL, g_value_get_pointer (value));
+		g_slist_free_full (
+			editor->writable_fields,
+			(GDestroyNotify) g_free);
+		editor->writable_fields = g_slist_copy_deep (
+			g_value_get_pointer (value),
+			(GCopyFunc) g_strdup, NULL);
 
 		sensitize_all (editor);
 		break;
 	case PROP_REQUIRED_FIELDS:
-		if (editor->required_fields)
-			e_client_util_free_string_slist (editor->required_fields);
-		editor->required_fields =
-			e_client_util_copy_string_slist (
-			NULL, g_value_get_pointer (value));
+		g_slist_free_full (
+			editor->required_fields,
+			(GDestroyNotify) g_free);
+		editor->required_fields = g_slist_copy_deep (
+			g_value_get_pointer (value),
+			(GCopyFunc) g_strdup, NULL);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index f68470d103..58ea7046dc 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -650,7 +650,7 @@ contact_list_editor_drag_data_received_cb (GtkWidget *widget,
 		g_object_unref (dest);
 	}
 
-	e_client_util_free_object_slist (list);
+	g_slist_free_full (list, (GDestroyNotify) g_object_unref);
 
 	contact_list_editor_scroll_to_end (editor);
 
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 8b24ea3d57..1cd5228873 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -661,8 +661,8 @@ query_cb (GObject *source_object,
 	if (best_contact)
 		best_contact = g_object_ref (best_contact);
 
-	e_client_util_free_object_slist (contacts);
-	e_client_util_free_object_slist (remaining_contacts);
+	g_slist_free_full (contacts, (GDestroyNotify) g_object_unref);
+	g_slist_free_full (remaining_contacts, (GDestroyNotify) g_object_unref);
 
 	info->cb (info->contact, best_contact, best_match, info->closure);
 	match_search_info_free (info);
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 53402a9e6e..14293f5344 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -280,7 +280,7 @@ table_drag_data_get (ETable *table,
 			break;
 	}
 
-	e_client_util_free_object_slist (contact_list);
+	g_slist_free_full (contact_list, (GDestroyNotify) g_object_unref);
 }
 
 static void
@@ -689,7 +689,7 @@ addressbook_view_copy_clipboard (ESelectable *selectable)
 	e_clipboard_set_directory (clipboard, string, -1);
 	g_free (string);
 
-	e_client_util_free_object_slist (contact_list);
+	g_slist_free_full (contact_list, (GDestroyNotify) g_object_unref);
 }
 
 static void
@@ -724,7 +724,7 @@ addressbook_view_paste_clipboard (ESelectable *selectable)
 			registry, book_client, contact, NULL, NULL);
 	}
 
-	e_client_util_free_object_slist (contact_list);
+	g_slist_free_full (contact_list, (GDestroyNotify) g_object_unref);
 }
 
 static void
@@ -1198,7 +1198,9 @@ e_addressbook_view_print (EAddressbookView *view,
 
 		contact_list = e_addressbook_view_get_selected (view);
 		e_contact_print (NULL, NULL, contact_list, action);
-		e_client_util_free_object_slist (contact_list);
+		g_slist_free_full (
+			contact_list,
+			(GDestroyNotify) g_object_unref);
 
 	/* Print the latest query results. */
 	} else if (GAL_IS_VIEW_MINICARD (gal_view)) {
@@ -1395,7 +1397,7 @@ e_addressbook_view_delete_selection (EAddressbookView *view,
 			GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))),
 			plural, is_list, name)) {
 		g_free (name);
-		e_client_util_free_object_slist (list);
+		g_slist_free_full (list, (GDestroyNotify) g_object_unref);
 		return;
 	}
 
@@ -1454,7 +1456,7 @@ e_addressbook_view_delete_selection (EAddressbookView *view,
 		row = e_table_view_to_model_row (E_TABLE (etable), select);
 		e_table_set_cursor_row (E_TABLE (etable), row);
 	}
-	e_client_util_free_object_slist (list);
+	g_slist_free_full (list, (GDestroyNotify) g_object_unref);
 }
 
 void
@@ -1499,7 +1501,7 @@ e_addressbook_view_view (EAddressbookView *view)
 			addressbook_view_emit_open_contact (
 				view, iter->data, FALSE);
 
-	e_client_util_free_object_slist (list);
+	g_slist_free_full (list, (GDestroyNotify) g_object_unref);
 }
 
 void
diff --git a/addressbook/gui/widgets/e-contact-map-window.c b/addressbook/gui/widgets/e-contact-map-window.c
index 2e3aec5bcb..aa31f297fe 100644
--- a/addressbook/gui/widgets/e-contact-map-window.c
+++ b/addressbook/gui/widgets/e-contact-map-window.c
@@ -101,7 +101,7 @@ book_contacts_received_cb (GObject *source_object,
 		e_contact_map_add_contact (
 			window->priv->map, (EContact *) p->data);
 
-	e_client_util_free_object_slist (contacts);
+	g_slist_free_full (contacts, (GDestroyNotify) g_object_unref);
 	g_object_unref (client);
 }
 
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 08b0cdabf4..1a35f3aa09 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -124,7 +124,7 @@ e_minicard_view_drag_data_get (GtkWidget *widget,
 static void
 clear_drag_data (EMinicardView *view)
 {
-	e_client_util_free_object_slist (view->drag_list);
+	g_slist_free_full (view->drag_list, (GDestroyNotify) g_object_unref);
 	view->drag_list = NULL;
 }
 
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 1fc8644833..b692fdf2ce 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -469,7 +469,9 @@ process_unref (ContactCopyProcess *process)
 			if (process->count > 0)
 				return;
 		}
-		e_client_util_free_object_slist (process->contacts);
+		g_slist_free_full (
+			process->contacts,
+			(GDestroyNotify) g_object_unref);
 		g_object_unref (process->source);
 		g_object_unref (process->destination);
 		g_object_unref (process->registry);