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, 10 insertions, 5 deletions

diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
index 3f2334023b..242c9738b7 100644
--- a/addressbook/backend/ebook/e-card.h
+++ b/addressbook/backend/ebook/e-card.h
@@ -142,12 +142,14 @@ gboolean              e_card_evolution_list_show_addresses                (ECard
 /* ECardPhone manipulation */
 ECardPhone           *e_card_phone_new                                    (void);
 ECardPhone           *e_card_phone_copy                                   (const ECardPhone           *phone);
-void                  e_card_phone_free                                   (ECardPhone                 *phone);
+ECardPhone           *e_card_phone_ref                                    (const ECardPhone           *phone);
+void                  e_card_phone_unref                                  (ECardPhone                 *phone);
 
 /* ECardDeliveryAddress manipulation */
 ECardDeliveryAddress *e_card_delivery_address_new                         (void);
 ECardDeliveryAddress *e_card_delivery_address_copy                        (const ECardDeliveryAddress *addr);
-void                  e_card_delivery_address_free                        (ECardDeliveryAddress       *addr);
+ECardDeliveryAddress *e_card_delivery_address_ref                         (const ECardDeliveryAddress *addr);
+void                  e_card_delivery_address_unref                       (ECardDeliveryAddress       *addr);
 gboolean              e_card_delivery_address_is_empty                    (const ECardDeliveryAddress *addr);
 char                 *e_card_delivery_address_to_string                   (const ECardDeliveryAddress *addr);
 ECardDeliveryAddress *e_card_delivery_address_from_label                  (const ECardAddrLabel       *label);
@@ -156,19 +158,22 @@ ECardAddrLabel       *e_card_delivery_address_to_label                    (const
 /* ECardAddrLabel manipulation */
 ECardAddrLabel       *e_card_address_label_new                            (void);
 ECardAddrLabel       *e_card_address_label_copy                           (const ECardAddrLabel       *addr);
-void                  e_card_address_label_free                           (ECardAddrLabel             *addr);
+ECardAddrLabel       *e_card_address_label_ref                            (const ECardAddrLabel       *addr);
+void                  e_card_address_label_unref                          (ECardAddrLabel             *addr);
 
 /* ECardName manipulation */
 ECardName            *e_card_name_new                                     (void);
 ECardName            *e_card_name_copy                                    (const ECardName            *name);
-void                  e_card_name_free                                    (ECardName                  *name);
+ECardName            *e_card_name_ref                                     (const ECardName            *name);
+void                  e_card_name_unref                                   (ECardName                  *name);
 char                 *e_card_name_to_string                               (const ECardName            *name);
 ECardName            *e_card_name_from_string                             (const char                 *full_name);
 
 /* ECardArbitrary manipulation */
 ECardArbitrary       *e_card_arbitrary_new                                (void);
 ECardArbitrary       *e_card_arbitrary_copy                               (const ECardArbitrary       *arbitrary);
-void                  e_card_arbitrary_free                               (ECardArbitrary             *arbitrary);
+ECardArbitrary       *e_card_arbitrary_ref                                (const ECardArbitrary       *arbitrary);
+void                  e_card_arbitrary_unref                              (ECardArbitrary             *arbitrary);
 
 /* ECard email manipulation */
 gboolean              e_card_email_match_string                           (const ECard                *card,