Use e_card_get_vcard_assume_utf8 instead of e_card_get_vcard here since

2001-09-02  Christopher James Lahey  <clahey@ximian.com>

	* backend/ebook/e-book.c (e_book_add_card, e_book_commit_card),
	backend/pas/pas-backend-file.c (do_create),
	backend/pas/pas-backend-ldap.c
	(create_card_handler, remove_card_handler, modify_card_handler,
	pas_backend_ldap_process_get_vcard, poll_ldap): Use
	e_card_get_vcard_assume_utf8 instead of e_card_get_vcard here
	since all internal communications and database storage are assumed
	to be utf8.

	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
	(e_card_simple_duplicate): Simplified this function considerably.
	(e_card_simple_get_vcard_assume_utf8): Added this function.

	* backend/ebook/e-card.c, backend/ebook/e-card.h (e_card_new,
	e_card_load_cards_from_file, e_card_load_cards_from_string): Made
	these functions pay attention to charset attributes.
	(e_card_new_with_default_charset,
	e_card_load_cards_from_file_with_default_charset,
	e_card_load_cards_from_string_with_default_charset): New functions
	that let you change the default charset from UTF-8.
	(e_card_get_vcard): Made this write out charset attributes when
	necessary.
	(e_card_get_vcard_assume_utf8): New function that writes out a
	card without writing out charset attributes.

	* backend/ebook/evolution-vcard-importer.c (book_open_cb),
	backend/ebook/load-gnomecard-addressbook.c (book_open_cb),
	backend/ebook/test-card.c (main),
	gui/component/addressbook-component.c
	(destination_folder_handle_drop), gui/contact-editor/test-editor.c
	(main), gui/contact-list-editor/e-contact-list-editor.c
	(table_drag_data_received_cb), gui/widgets/e-addressbook-view.c
	(selection_received), gui/widgets/e-minicard-control.c
	(pstream_load): Changed the default charset to be used here to
	ISO-8859-1.

	* backend/ebook/load-gnomecard-addressbook.c (add_card_cb),
	backend/ebook/load-pine-addressbook.c (add_card_cb),
	backend/ebook/test-client-list.c (get_cursor_cb),
	backend/ebook/test-client.c (get_cursor_cb, get_card_cb): Use
	e_card_get_vcard_assume_utf8 to print out testing strings.

	* gui/component/select-names/e-select-names-model.c,
	gui/component/select-names/e-select-names-model.h
	(e_select_names_model_contains): Changed this to be const
	EDestination *dest to fix a warning.

	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
	Translate window title here.

svn path=/trunk/; revision=12558

1 files changed, 57 insertions, 56 deletions

diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h
index 9e758516d3..675695a7ea 100644
--- a/addressbook/backend/ebook/e-card-simple.h
+++ b/addressbook/backend/ebook/e-card-simple.h
@@ -147,73 +147,74 @@ struct _ECardSimpleClass {
 };
 
 typedef void (*ECardSimpleArbitraryCallback) (const ECardArbitrary *arbitrary, gpointer closure);
-ECardSimple                *e_card_simple_new                   (ECard                        *card);
-const char                 *e_card_simple_get_id                (ECardSimple                  *simple);
-void                        e_card_simple_set_id                (ECardSimple                  *simple,
-								 const gchar                  *character);
-char                       *e_card_simple_get_vcard             (ECardSimple                  *simple);
-ECardSimple                *e_card_simple_duplicate             (ECardSimple                  *simple);
-char                       *e_card_simple_get                   (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-const char                 *e_card_simple_get_const             (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-void                        e_card_simple_set                   (ECardSimple                  *simple,
-								 ECardSimpleField              field,
-								 const char                   *data);
-ECardSimpleType             e_card_simple_type                  (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-
-const char                 *e_card_simple_get_ecard_field       (ECardSimple         *simple,
-								 ECardSimpleField     field);
-const char                 *e_card_simple_get_name              (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-const char                 *e_card_simple_get_short_name        (ECardSimple                  *simple,
-								 ECardSimpleField              field);
+ECardSimple                *e_card_simple_new                    (ECard                        *card);
+const char                 *e_card_simple_get_id                 (ECardSimple                  *simple);
+void                        e_card_simple_set_id                 (ECardSimple                  *simple,
+								  const gchar                  *character);
+char                       *e_card_simple_get_vcard              (ECardSimple                  *simple);
+char                       *e_card_simple_get_vcard_assume_utf8  (ECardSimple                  *simple);
+ECardSimple                *e_card_simple_duplicate              (ECardSimple                  *simple);
+char                       *e_card_simple_get                    (ECardSimple                  *simple,
+								  ECardSimpleField              field);
+const char                 *e_card_simple_get_const              (ECardSimple                  *simple,
+								  ECardSimpleField              field);
+void                        e_card_simple_set                    (ECardSimple                  *simple,
+								  ECardSimpleField              field,
+								  const char                   *data);
+ECardSimpleType             e_card_simple_type                   (ECardSimple                  *simple,
+								  ECardSimpleField              field);
+
+const char                 *e_card_simple_get_ecard_field        (ECardSimple                  *simple,
+								  ECardSimpleField              field);
+const char                 *e_card_simple_get_name               (ECardSimple                  *simple,
+								  ECardSimpleField              field);
+const char                 *e_card_simple_get_short_name         (ECardSimple                  *simple,
+								  ECardSimpleField              field);
 
 
 /* Use these only if building lists of specific types.  It should be
  * easier to use the above if you consider a phone field to be the
  * same as any other field.
  */
-const ECardPhone           *e_card_simple_get_phone             (ECardSimple                  *simple,
-								 ECardSimplePhoneId            id);
-const char                 *e_card_simple_get_email             (ECardSimple                  *simple,
-								 ECardSimpleEmailId            id);
-const ECardAddrLabel       *e_card_simple_get_address           (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id);
-const ECardDeliveryAddress *e_card_simple_get_delivery_address  (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id);
-void                        e_card_simple_set_phone             (ECardSimple                  *simple,
-								 ECardSimplePhoneId            id,
-								 const ECardPhone             *phone);
-void                        e_card_simple_set_email             (ECardSimple                  *simple,
-								 ECardSimpleEmailId            id,
-								 const char                   *email);
-void                        e_card_simple_set_address           (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id,
-								 const ECardAddrLabel         *address);
-void                        e_card_simple_set_delivery_address  (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id,
-								 const ECardDeliveryAddress   *delivery);
-void                        e_card_simple_arbitrary_foreach     (ECardSimple                  *simple,
-								 ECardSimpleArbitraryCallback *callback,
-								 gpointer                      closure);
-const ECardArbitrary       *e_card_simple_get_arbitrary         (ECardSimple                  *simple,
-								 const char                   *key);
+const ECardPhone           *e_card_simple_get_phone              (ECardSimple                  *simple,
+								  ECardSimplePhoneId            id);
+const char                 *e_card_simple_get_email              (ECardSimple                  *simple,
+								  ECardSimpleEmailId            id);
+const ECardAddrLabel       *e_card_simple_get_address            (ECardSimple                  *simple,
+								  ECardSimpleAddressId          id);
+const ECardDeliveryAddress *e_card_simple_get_delivery_address   (ECardSimple                  *simple,
+								  ECardSimpleAddressId          id);
+void                        e_card_simple_set_phone              (ECardSimple                  *simple,
+								  ECardSimplePhoneId            id,
+								  const ECardPhone             *phone);
+void                        e_card_simple_set_email              (ECardSimple                  *simple,
+								  ECardSimpleEmailId            id,
+								  const char                   *email);
+void                        e_card_simple_set_address            (ECardSimple                  *simple,
+								  ECardSimpleAddressId          id,
+								  const ECardAddrLabel         *address);
+void                        e_card_simple_set_delivery_address   (ECardSimple                  *simple,
+								  ECardSimpleAddressId          id,
+								  const ECardDeliveryAddress   *delivery);
+void                        e_card_simple_arbitrary_foreach      (ECardSimple                  *simple,
+								  ECardSimpleArbitraryCallback *callback,
+								  gpointer                      closure);
+const ECardArbitrary       *e_card_simple_get_arbitrary          (ECardSimple                  *simple,
+								  const char                   *key);
 /* Any of these except key can be NULL */	      
-void                        e_card_simple_set_arbitrary         (ECardSimple                  *simple,
-								 const char                   *key,
-								 const char                   *type,
-								 const char                   *value);
-void                        e_card_simple_sync_card             (ECardSimple                  *simple);
+void                        e_card_simple_set_arbitrary          (ECardSimple                  *simple,
+								  const char                   *key,
+								  const char                   *type,
+								  const char                   *value);
+void                        e_card_simple_sync_card              (ECardSimple                  *simple);
 
 /* These map between the individual list types and ECardSimpleField */
-ECardSimpleField            e_card_simple_map_phone_to_field    (ECardSimplePhoneId            phone_id);
-ECardSimpleField            e_card_simple_map_email_to_field    (ECardSimpleEmailId            email_id);
-ECardSimpleField            e_card_simple_map_address_to_field  (ECardSimpleAddressId          address_id);
+ECardSimpleField            e_card_simple_map_phone_to_field     (ECardSimplePhoneId            phone_id);
+ECardSimpleField            e_card_simple_map_email_to_field     (ECardSimpleEmailId            email_id);
+ECardSimpleField            e_card_simple_map_address_to_field   (ECardSimpleAddressId          address_id);
 
 /* Standard Gtk function */			      
-GtkType                     e_card_simple_get_type              (void);
+GtkType                     e_card_simple_get_type               (void);
 
 #endif /* ! __E_CARD_SIMPLE_H__ */