removed pre-completion code, not needed anymore. (emlv_finalize): no need

2004-06-02  Rodrigo Moya <rodrigo@novell.com>

	* gui/e-meeting-list-view.c (start_addressbook_server): removed
	pre-completion code, not needed anymore.
	(emlv_finalize): no need to unref the book anymore.
	(emlv_init): don't call start_addressbook_server.

	* gui/e-meeting-store.c (start_addressbook_server): removed.
	(ems_finalize): no need to unref the book anymore.

svn path=/trunk/; revision=26156

2 files changed, 9 insertions, 24 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 589f7ef797..021a7b7db0 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,13 @@
 2004-06-02  Rodrigo Moya <rodrigo@novell.com>
 
+	* gui/e-meeting-list-view.c (start_addressbook_server): removed
+	pre-completion code, not needed anymore.
+	(emlv_finalize): no need to unref the book anymore.
+	(emlv_init): don't call start_addressbook_server.
+
+	* gui/e-meeting-store.c (start_addressbook_server): removed.
+	(ems_finalize): no need to unref the book anymore.
+
 	* gui/dialogs/copy-source-dialog.c (copy_source): fixed
 	leak and pass the correct icalcomponent to e_cal_modify_object.
 
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 85830a2071..82be947d8c 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -48,12 +48,9 @@
 
 #define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION
 
-struct _EMeetingListViewPrivate 
-{
+struct _EMeetingListViewPrivate {
 	EMeetingStore *store;
 
-	EBook *ebook;
-
         GNOME_Evolution_Addressbook_SelectNames corba_select_names;
 };
 
@@ -73,28 +70,10 @@ static icalparameter_role roles[] = {ICAL_ROLE_CHAIR,
 static GtkTreeViewClass *parent_class = NULL;
 
 static void
-start_addressbook_server (EMeetingListView *view)
-{
-	GError *error = NULL;
-
-	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);
-
-		return;
-	}
-}
-
-static void
 emlv_finalize (GObject *obj)
 {
 	EMeetingListView *view = E_MEETING_LIST_VIEW (obj);
 	EMeetingListViewPrivate *priv = view->priv;
-	
-	if (priv->ebook != NULL)
-		g_object_unref (priv->ebook);
 
 	if (priv->corba_select_names != CORBA_OBJECT_NIL) {
 		CORBA_Environment ev;
@@ -128,8 +107,6 @@ emlv_init (EMeetingListView *view)
 	view->priv = priv;
 
 	priv->corba_select_names = CORBA_OBJECT_NIL;
-	
-	start_addressbook_server (view);
 }
 
 E_MAKE_TYPE (e_meeting_list_view, "EMeetingListView", EMeetingListView, emlv_class_init, emlv_init, GTK_TYPE_TREE_VIEW);