[ fixes bug #32113 ] add include_email arg to e_destination_get_textrep.

2003-03-23  Chris Toshok  <toshok@ximian.com>

	[ fixes bug #32113 ]
	* backend/ebook/e-destination.h: add include_email arg to
	e_destination_get_textrep.

	* backend/ebook/e-destination.c (e_destination_get_textrep): add
	include_email arg.  if it's TRUE, and if there's an email address to
	add

	* gui/contact-list-editor/e-contact-list-model.c
	(contact_list_value_at): use e_destination_get_textrep so we don't
	display QP text, and pass TRUE for include_email.

	* gui/widgets/e-minicard.c (add_field): same.
	(remodel): same.

	* gui/widgets/e-addressbook-treeview-adapter.c (adapter_get_value): same.

	* gui/widgets/e-addressbook-table-adapter.c (addressbook_value_at): same.

	* gui/component/select-names/e-select-names-text-model.c
	(e_select_names_text_model_insert_length): pass FALSE for
	include_email.

	* gui/component/select-names/e-select-names-model.c
	(e_select_names_model_get_textification): pass FALSE for
	include_email.
	(e_select_names_model_get_string): same.
	(e_select_names_model_replace): same.
	(e_select_names_model_name_pos): same.
	(e_select_names_model_text_pos): same.

svn path=/trunk/; revision=20467

3 files changed, 4 insertions, 4 deletions

diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index c7b0003af6..3680af259c 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -124,7 +124,7 @@ addressbook_value_at (ETableModel *etc, int col, int row)
 		EDestination *dest = e_destination_import (value);
 		if (dest) {
 			/* XXX blech, we leak this */
-			value = g_strdup (e_destination_get_address (dest));
+			value = g_strdup (e_destination_get_textrep (dest, TRUE));
 			g_object_unref (dest);
 		}
 	}
diff --git a/addressbook/gui/widgets/e-addressbook-treeview-adapter.c b/addressbook/gui/widgets/e-addressbook-treeview-adapter.c
index d6401133ec..af4652226e 100644
--- a/addressbook/gui/widgets/e-addressbook-treeview-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-treeview-adapter.c
@@ -380,7 +380,7 @@ adapter_get_value (GtkTreeModel *tree_model,
 		EDestination *dest = e_destination_import (v);
 		if (dest) {
 			/* XXX blech, we leak this */
-			v = g_strdup (e_destination_get_address (dest));
+			v = g_strdup (e_destination_get_textrep (dest, TRUE));
 			g_object_unref (dest);
 		}
 	}
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 822b10041a..8bebb4cdb0 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -803,7 +803,7 @@ add_field (EMinicard *e_minicard, ECardSimpleField field, gdouble left_width)
 	if (!strncmp (string, "<?xml", 5)) {
 		EDestination *dest = e_destination_import (string);
 		if (dest != NULL) {
-			gchar *new_string = g_strdup (e_destination_get_address (dest));
+			gchar *new_string = g_strdup (e_destination_get_textrep (dest, TRUE));
 			g_free (string);
 			string = new_string;
 			g_object_unref (dest);
@@ -906,7 +906,7 @@ remodel( EMinicard *e_minicard )
 					if (!strncmp (string, "<?xml", 4)) {
 						EDestination *dest = e_destination_import (string);
 						if (dest != NULL) {
-							gchar *new_string = g_strdup (e_destination_get_address (dest));
+							gchar *new_string = g_strdup (e_destination_get_textrep (dest, TRUE));
 							g_free (string);
 							string = new_string;
 							g_object_unref (dest);