aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog12
-rw-r--r--addressbook/backend/pas/pas-backend-file.c4
-rw-r--r--addressbook/gui/widgets/e-minicard-view-model.c2
-rw-r--r--addressbook/gui/widgets/e-minicard.c3
4 files changed, 20 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index ba1802dad5..8959f321cd 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,15 @@
+2001-05-11 Christopher James Lahey <clahey@ximian.com>
+
+ * backend/pas/pas-backend-file.c: Reordered the includes here.
+ (string_to_dbt): The sleepycat libdb documentation suggests
+ memseting the DBT to 0 so we do that here.
+
+ * gui/widgets/e-minicard-view-model.c (addressbook_height): Skip
+ the E_CARD_SIMPLE_FIELD_FAMILY_NAME field.
+
+ * gui/widgets/e-minicard.c (remodel): Skip the
+ E_CARD_SIMPLE_FIELD_FAMILY_NAME field.
+
2001-05-11 Chris Toshok <toshok@ximian.com>
* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 9a088cae75..c4d1e0792f 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -7,6 +7,8 @@
*/
#include "config.h"
+#include "pas-backend-file.h"
+
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
@@ -30,7 +32,6 @@
#include <ebook/e-card-simple.h>
#include <e-util/e-sexp.h>
#include <e-util/e-dbhash.h>
-#include "pas-backend-file.h"
#include "pas-book.h"
#include "pas-card-cursor.h"
@@ -211,6 +212,7 @@ view_destroy(GtkObject *object, gpointer data)
static void
string_to_dbt(const char *str, DBT *dbt)
{
+ memset (dbt, 0, sizeof (*dbt));
dbt->data = (void*)str;
dbt->size = strlen (str) + 1;
}
diff --git a/addressbook/gui/widgets/e-minicard-view-model.c b/addressbook/gui/widgets/e-minicard-view-model.c
index d2e60d569e..ab0999518b 100644
--- a/addressbook/gui/widgets/e-minicard-view-model.c
+++ b/addressbook/gui/widgets/e-minicard-view-model.c
@@ -311,6 +311,8 @@ 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)
+ field ++;
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 0db903a790..98a12f4983 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -759,6 +759,9 @@ remodel( EMinicard *e_minicard )
for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST - 2 && count < 5; field++) {
EMinicardField *minicard_field = NULL;
+ if (field == E_CARD_SIMPLE_FIELD_FAMILY_NAME)
+ field ++;
+
if (list)
minicard_field = list->data;
if (minicard_field && minicard_field->field == field) {