aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/widgets/e-addressbook-reflow-adapter.c2
-rw-r--r--addressbook/gui/widgets/e-minicard.c5
3 files changed, 8 insertions, 5 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2e874185ce..4f7373510f 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-03 Christopher James Lahey <clahey@ximian.com>
+
+ * gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height),
+ gui/widgets/e-minicard.c (remodel): Fixed these to determine the
+ fields to use properly.
+
2001-10-02 Jon Trowbridge <trow@gnu.org>
* gui/component/select-names/e-select-names-completion.c
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index b4092605ed..3c3f716c63 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -322,7 +322,7 @@ addressbook_height (EReflowModel *erm, int i, GnomeCanvasGroup *parent)
height = text_height (GNOME_CANVAS_ITEM (parent)->canvas, string ? string : "") + 10.0;
g_free(string);
- for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST - 2 && count < 5; field++) {
+ for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING && count < 5; field++) {
if (field == E_CARD_SIMPLE_FIELD_FAMILY_NAME)
continue;
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index d6887fc202..fb06a126b1 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -780,12 +780,9 @@ remodel( EMinicard *e_minicard )
list = e_minicard->fields;
e_minicard->fields = NULL;
- for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST - 6 && count < 5; field++) {
+ for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING && count < 5; field++) {
EMinicardField *minicard_field = NULL;
- if (field == E_CARD_SIMPLE_FIELD_FAMILY_NAME)
- continue;
-
if (list)
minicard_field = list->data;
if (minicard_field && minicard_field->field == field) {