aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/e-meeting-list-view.c5
-rw-r--r--calendar/gui/e-meeting-store.c4
3 files changed, 13 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index aff9ae4258..69c4d07e81 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-19 Chris Toshok <toshok@ximian.com>
+
+ * gui/e-meeting-store.c (start_addressbook_server): use the new
+ e_book_new_* and e_book_open apis.
+
+ * gui/e-meeting-list-view.c (start_addressbook_server): use the
+ new e_book_new_* and e_book_open apis.
+
2004-05-05 William Jon McCann <mccann@jhu.edu>
* gui/GNOME_Evolution_Calendar.server.in.in: Add menu_label and
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index ac3b3f2697..85830a2071 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -77,8 +77,9 @@ start_addressbook_server (EMeetingListView *view)
{
GError *error = NULL;
- view->priv->ebook = e_book_new ();
- if (!e_book_load_local_addressbook (view->priv->ebook, &error)) {
+ view->priv->ebook = e_book_new_system_addressbook (&error);
+ if (!view->priv->ebook
+ || !e_book_open (view->priv->ebook, FALSE, &error)) {
g_warning ("start_addressbook_server(): %s", error->message);
g_error_free (error);
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index bd89a46f83..9aba639232 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -80,8 +80,8 @@ static GObjectClass *parent_class = NULL;
static void
start_addressbook_server (EMeetingStore *store)
{
- store->priv->ebook = e_book_new ();
- e_book_load_local_addressbook (store->priv->ebook, NULL);
+ store->priv->ebook = e_book_new_system_addressbook (NULL);
+ e_book_open (store->priv->ebook, FALSE, NULL);
}
static icalparameter_cutype