diff options
| -rw-r--r-- | addressbook/ChangeLog | 10 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-table-adapter.c | 12 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard.c | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index b4946614a6..855db06dc4 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,4 +1,12 @@ -2001-10-29 Jon Trowbridge <trow@ximian.com> +2001-10-29 Jon Trowbridge <trow@ximian.com. + + * gui/widgets/e-minicard.c (add_field): Five characters, not four! + + * gui/widgets/e-addressbook-table-adapter.c + (addressbook_value_at): Convert xml-ified destinations into proper + addresses. + +2001-10-29 Jon Trowbridge <trow@ximian.com. * gui/component/select-names/e-select-names-bonobo.c (init): Connect to manager's "ok" signal. diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index 980e0adbcc..f055b34a03 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -111,10 +111,22 @@ addressbook_value_at (ETableModel *etc, int col, int row) EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc); EAddressbookTableAdapterPrivate *priv = adapter->priv; const char *value; + if ( col >= COLS || row >= e_addressbook_model_card_count (priv->model) ) return NULL; value = e_card_simple_get_const(priv->simples[row], col); + + if (value && !strncmp (value, "<?xml", 5)) { + EDestination *dest = e_destination_import (value); + if (dest) { + g_free ((gchar *) value); + value = g_strdup (e_destination_get_address (dest)); + gtk_object_unref (GTK_OBJECT (dest)); + } + } + + return (void *)(value ? value : ""); } diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 0fd4428a0e..d8e34577b2 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -732,7 +732,7 @@ add_field (EMinicard *e_minicard, ECardSimpleField field, gdouble left_width) string = e_card_simple_get(e_minicard->simple, field); /* Magically convert embedded XML into an address. */ - if (!strncmp (string, "<?xml", 4)) { + if (!strncmp (string, "<?xml", 5)) { EDestination *dest = e_destination_import (string); if (dest != NULL) { gchar *new_string = g_strdup (e_destination_get_address (dest)); |