1 files changed, 20 insertions, 19 deletions

diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
index c7fd626372..8a22da19db 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c
@@ -30,7 +30,7 @@ contact_list_value_at (ETableModel *etc, int col, int row)
 {
 	EContactListModel *model = E_CONTACT_LIST_MODEL (etc);
 
-	return (void *) eab_destination_get_textrep (model->data[row], TRUE);
+	return (void *) e_destination_get_textrep (model->data[row], TRUE);
 }
 
 /* This function sets the value at a particular point in our ETableModel. */
@@ -80,7 +80,7 @@ contact_list_value_to_string (ETableModel *etc, int col, const void *value)
 }
 
 static void
-contact_list_model_destroy (GtkObject *o)
+contact_list_model_dispose (GObject *o)
 {
 	EContactListModel *model = E_CONTACT_LIST_MODEL (o);
 	int i;
@@ -96,17 +96,17 @@ contact_list_model_destroy (GtkObject *o)
 	model->data_count = 0;
 	model->data_alloc = 0;
 
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (o);
+	(* G_OBJECT_CLASS (parent_class)->dispose) (o);
 }
 
 static void
-e_contact_list_model_class_init (GtkObjectClass *object_class)
+e_contact_list_model_class_init (GObjectClass *object_class)
 {
 	ETableModelClass *model_class = (ETableModelClass *) object_class;
 
 	parent_class = g_type_class_ref (PARENT_TYPE);
 
-	object_class->destroy = contact_list_model_destroy;
+	object_class->dispose = contact_list_model_dispose;
 
 	model_class->column_count = contact_list_col_count;
 	model_class->row_count = contact_list_row_count;
@@ -121,13 +121,13 @@ e_contact_list_model_class_init (GtkObjectClass *object_class)
 }
 
 static void
-e_contact_list_model_init (GtkObject *object)
+e_contact_list_model_init (GObject *object)
 {
 	EContactListModel *model = E_CONTACT_LIST_MODEL(object);
 
 	model->data_alloc = 10;
 	model->data_count = 0;
-	model->data = g_new (EABDestination*, model->data_alloc);
+	model->data = g_new (EDestination*, model->data_alloc);
 }
 
 GType
@@ -172,16 +172,16 @@ e_contact_list_model_new ()
 }
 
 void
-e_contact_list_model_add_destination (EContactListModel *model, EABDestination *dest)
+e_contact_list_model_add_destination (EContactListModel *model, EDestination *dest)
 {
 	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (EAB_IS_DESTINATION (dest));
+	g_return_if_fail (E_IS_DESTINATION (dest));
 
 	e_table_model_pre_change (E_TABLE_MODEL (model));
 
 	if (model->data_count + 1 >= model->data_alloc) {
 		model->data_alloc *= 2;
-		model->data = g_renew (EABDestination*, model->data, model->data_alloc);
+		model->data = g_renew (EDestination*, model->data, model->data_alloc);
 	}
 
 	model->data[model->data_count ++] = dest;
@@ -194,28 +194,29 @@ void
 e_contact_list_model_add_email (EContactListModel *model,
 				const char *email)
 {
-	EABDestination *new_dest;
+	EDestination *new_dest;
 
 	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
 	g_return_if_fail (email != NULL);
 
-	new_dest = eab_destination_new ();
-	eab_destination_set_email (new_dest, email);
+	new_dest = e_destination_new ();
+	e_destination_set_email (new_dest, email);
 
 	e_contact_list_model_add_destination (model, new_dest);
 }
 
 void
 e_contact_list_model_add_contact (EContactListModel *model,
-				  EContact *contact)
+				  EContact *contact,
+				  int email_num)
 {
-	EABDestination *new_dest;
+	EDestination *new_dest;
 
 	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
 	g_return_if_fail (E_IS_CONTACT (contact));
 
-	new_dest = eab_destination_new ();
-	eab_destination_set_contact (new_dest, contact, 0); /* Hard-wired for default e-mail */
+	new_dest = e_destination_new ();
+	e_destination_set_contact (new_dest, contact, email_num);
 
 	e_contact_list_model_add_destination (model, new_dest);
 }
@@ -229,7 +230,7 @@ e_contact_list_model_remove_row (EContactListModel *model, int row)
 	e_table_model_pre_change (E_TABLE_MODEL (model));
 
 	g_object_unref (model->data[row]);
-	memmove (model->data + row, model->data + row + 1, sizeof (EABDestination*) * (model->data_count - row - 1));
+	memmove (model->data + row, model->data + row + 1, sizeof (EDestination*) * (model->data_count - row - 1));
 	model->data_count --;
 
 	e_table_model_row_deleted (E_TABLE_MODEL (model), row);
@@ -255,7 +256,7 @@ e_contact_list_model_remove_all (EContactListModel *model)
 }
 
 
-const EABDestination *
+const EDestination *
 e_contact_list_model_get_destination (EContactListModel *model, int row)
 {
 	g_return_val_if_fail (E_IS_CONTACT_LIST_MODEL (model), NULL);