Changed these to use the new ref and unref functions for ECard auxillary

2001-10-11  Christopher James Lahey  <clahey@ximian.com>

	* backend/ebook/e-card-simple.c (e_card_simple_destroy,
	fill_in_info, e_card_simple_sync_card, e_card_simple_set_phone,
	e_card_simple_set_address, e_card_simple_set_delivery_address,
	file_as_get_style, file_as_set_style, e_card_simple_set,
	e_card_simple_set_arbitrary),
	gui/contact-editor/e-contact-editor-address.c
	(e_contact_editor_address_destroy,
	e_contact_editor_address_set_arg,
	e_contact_editor_address_get_arg),
	gui/contact-editor/e-contact-editor-fullname.c
	(e_contact_editor_fullname_destroy,
	e_contact_editor_fullname_set_arg,
	e_contact_editor_fullname_get_arg),
	gui/contact-editor/e-contact-editor.c (phone_entry_changed,
	address_text_changed, name_entry_changed, full_name_clicked,
	full_addr_clicked, fill_in_info): Changed these to use the new ref
	and unref functions for ECard auxillary types.

	* backend/ebook/e-card-simple.h: Added a comment.

	* backend/ebook/e-card-types.h: Added ref_count field to all the
	types.

	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added ref and
	unref functions here for all the ECard auxillary types.  Removed
	the corresponding free functions.  Switched to using these
	functions where appropriate.

	* gui/component/addressbook-factory.c: #include
	<e-util/e-passwords.h>

	* gui/component/addressbook.c (load_uri_cb): const correctify.

	* gui/component/select-names/e-select-names-manager.c,
	gui/component/select-names/e-select-names.c: #include
	<addressbook/gui/component/addressbook.h>

	* gui/widgets/e-addressbook-model.c (modify_card): Removed an
	unnecessary ref here.

svn path=/trunk/; revision=13604

1 files changed, 3 insertions, 4 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index 0af0de3236..ddf69d861c 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -123,7 +123,7 @@ e_contact_editor_fullname_destroy (GtkObject *object)
 
 	if (e_contact_editor_fullname->gui)
 		gtk_object_unref(GTK_OBJECT(e_contact_editor_fullname->gui));
-	e_card_name_free(e_contact_editor_fullname->name);
+	e_card_name_unref(e_contact_editor_fullname->name);
 }
 
 GtkWidget*
@@ -145,8 +145,7 @@ e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 	
 	switch (arg_id){
 	case ARG_NAME:
-		if (e_contact_editor_fullname->name)
-			e_card_name_free(e_contact_editor_fullname->name);
+		e_card_name_unref(e_contact_editor_fullname->name);
 		e_contact_editor_fullname->name = e_card_name_copy(GTK_VALUE_POINTER (*arg));
 		fill_in_info(e_contact_editor_fullname);
 		break;
@@ -188,7 +187,7 @@ e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 	switch (arg_id) {
 	case ARG_NAME:
 		extract_info(e_contact_editor_fullname);
-		GTK_VALUE_POINTER (*arg) = e_card_name_copy(e_contact_editor_fullname->name);
+		GTK_VALUE_POINTER (*arg) = e_card_name_ref(e_contact_editor_fullname->name);
 		break;
 	case ARG_IS_READ_ONLY:
 		GTK_VALUE_BOOL (*arg) = e_contact_editor_fullname->editable ? TRUE : FALSE;