aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/Makefile.am2
-rw-r--r--addressbook/backend/ebook/load-pine-addressbook.c6
3 files changed, 12 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 553ba6b3ac..6c5f6006fd 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-25 Michael Meeks <michael@helixcode.com>
+
+ * backend/ebook/load-pine-addressbook.c (book_open_cb): check we
+ opened ok.
+
2000-07-25 Seth Alves <alves@hungry.com>
* ename/Makefile.am (libename_static_la_LDFLAGS): build static
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 92b5fe5607..0b429e62f3 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,2 +1,2 @@
SUBDIRS = \
- ename backend printing contact-editor gui conduit
+ ename backend printing contact-editor gui
diff --git a/addressbook/backend/ebook/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c
index 1bf85cb1a6..ee0d8c1ac3 100644
--- a/addressbook/backend/ebook/load-pine-addressbook.c
+++ b/addressbook/backend/ebook/load-pine-addressbook.c
@@ -56,6 +56,12 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure)
{
FILE *fp = fopen (".addressbook", "r");
char line[1024];
+
+ if (!fp) {
+ g_warning ("Can't find .addressbook");
+ return;
+ }
+
while(fgets(line, 1024, fp)) {
int length = strlen(line);
char **strings;