diff options
| -rw-r--r-- | addressbook/ChangeLog | 9 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard.c | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index f9958c8aea..462db8c4aa 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,12 @@ +2001-05-25 Christopher James Lahey <clahey@ximian.com> + + * gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height): + Correct the height calculation here to not include the + E_CARD_SIMPLE_FIELD_FAMILY_NAME since it won't be displayed. + + * gui/widgets/e-minicard.c (remodel): Changed this to continue to + be more consistent and simpler. + 2001-05-23 Chris Toshok <toshok@ximian.com> * backend/pas/pas-backend-ldap.c (view_destroy): fix strings such diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index f4e6b4cbfc..dc767c142d 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -284,6 +284,10 @@ addressbook_height (EReflowModel *erm, int i, GnomeCanvasGroup *parent) g_free(string); for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST - 2 && count < 5; field++) { + + if (field == E_CARD_SIMPLE_FIELD_FAMILY_NAME) + continue; + string = e_card_simple_get(simple, field); if (string && *string) { int this_height; diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 98a12f4983..167e977d12 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -760,7 +760,7 @@ remodel( EMinicard *e_minicard ) EMinicardField *minicard_field = NULL; if (field == E_CARD_SIMPLE_FIELD_FAMILY_NAME) - field ++; + continue; if (list) minicard_field = list->data; |