From 03df6fccdefe8b11215183bf4dcfef71eef2290c Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Fri, 25 May 2001 18:56:25 +0000 Subject: Correct the height calculation here to not include the 2001-05-25 Christopher James Lahey * 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. svn path=/trunk/; revision=9992 --- addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 4 ++++ addressbook/gui/widgets/e-minicard.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'addressbook/gui') 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; -- cgit