From a66943ec821cda5eaef68ea8ecc07d3593dda893 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Sun, 23 Mar 2003 09:18:04 +0000 Subject: [ fixes bug #32113 ] add include_email arg to e_destination_get_textrep. 2003-03-23 Chris Toshok [ 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 --- .../gui/component/select-names/e-select-names-model.c | 12 ++++++------ .../gui/component/select-names/e-select-names-text-model.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/select-names/e-select-names-model.c b/addressbook/gui/component/select-names/e-select-names-model.c index 4c99d68f22..595b4a257e 100644 --- a/addressbook/gui/component/select-names/e-select-names-model.c +++ b/addressbook/gui/component/select-names/e-select-names-model.c @@ -213,7 +213,7 @@ e_select_names_model_get_textification (ESelectNamesModel *model, const char *se while (iter) { EDestination *dest = E_DESTINATION (iter->data); - strv[i] = (gchar *) e_destination_get_textrep (dest); + strv[i] = (gchar *) e_destination_get_textrep (dest, FALSE); ++i; iter = g_list_next (iter); } @@ -393,7 +393,7 @@ e_select_names_model_get_string (ESelectNamesModel *model, gint index) dest = e_select_names_model_get_destination (model, index); - return dest ? e_destination_get_textrep (dest) : ""; + return dest ? e_destination_get_textrep (dest, FALSE) : ""; } static void @@ -483,7 +483,7 @@ e_select_names_model_replace (ESelectNamesModel *model, gint index, EDestination g_return_if_fail (model->priv->data == NULL || (0 <= index && index < g_list_length (model->priv->data))); g_return_if_fail (dest && E_IS_DESTINATION (dest)); - new_str = e_destination_get_textrep (dest); + new_str = e_destination_get_textrep (dest, FALSE); new_strlen = new_str ? strlen (new_str) : 0; if (model->priv->data == NULL) { @@ -502,7 +502,7 @@ e_select_names_model_replace (ESelectNamesModel *model, gint index, EDestination disconnect_destination (model, E_DESTINATION (node->data)); connect_destination (model, dest); - old_str = e_destination_get_textrep (E_DESTINATION (node->data)); + old_str = e_destination_get_textrep (E_DESTINATION (node->data), FALSE); old_strlen = old_str ? strlen (old_str) : 0; g_object_unref (node->data); @@ -649,7 +649,7 @@ e_select_names_model_name_pos (ESelectNamesModel *model, gint seplen, gint index iter = model->priv->data; while (iter && i <= index) { rp += len + (i > 0 ? seplen : 0); - str = e_destination_get_textrep (E_DESTINATION (iter->data)); + str = e_destination_get_textrep (E_DESTINATION (iter->data), FALSE); len = str ? strlen (str) : 0; ++i; iter = g_list_next (iter); @@ -679,7 +679,7 @@ e_select_names_model_text_pos (ESelectNamesModel *model, gint seplen, gint pos, iter = model->priv->data; while (iter != NULL) { - str = e_destination_get_textrep (E_DESTINATION (iter->data)); + str = e_destination_get_textrep (E_DESTINATION (iter->data), FALSE); len = str ? strlen (str) : 0; if (sp <= pos && pos <= sp + len + adj) { diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.c b/addressbook/gui/component/select-names/e-select-names-text-model.c index 1fbc0aa7fd..269e0599a3 100644 --- a/addressbook/gui/component/select-names/e-select-names-text-model.c +++ b/addressbook/gui/component/select-names/e-select-names-text-model.c @@ -367,7 +367,7 @@ e_select_names_text_model_insert_length (ETextModel *model, gint pos, const gcha if (text[i] == *text_model->sep && index >= 0) { /* Is this a quoted or an unquoted separator we are dealing with? */ const EDestination *dest = e_select_names_model_get_destination (source, index); if (dest) { - const gchar *str = e_destination_get_textrep (dest); + const gchar *str = e_destination_get_textrep (dest, FALSE); gint j; if (out) fprintf (out, "str=%s pos=%d\n", str, pos); -- cgit v1.2.3