diff options
Diffstat (limited to 'addressbook/gui')
6 files changed, 12 insertions, 12 deletions
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); diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c index 971b1a58e2..6e8357d93c 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c @@ -30,7 +30,7 @@ contact_list_value_at (ETableModel *etc, int col, int row) { EContactListModel *model = E_CONTACT_LIST_MODEL (etc); - return (void *) e_destination_get_address (model->data[row]); + return (void *) e_destination_get_textrep (model->data[row], TRUE); } /* This function sets the value at a particular point in our ETableModel. */ 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); |