aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/e-meeting-store.c15
2 files changed, 6 insertions, 15 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 527d6736c0..1597a9f7a3 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-13 Ondrej Jirman <megous@megous.com>
+
+ ** Fix for bug #494323
+
+ * gui/e-meeting-store.c: removed useless EBook use.
+
2007-11-12 Andre Klapper <a9016009@gmx.de>
** Fix for bug #496248
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 1c3b645afe..65a4930d57 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -29,7 +29,6 @@
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomevfs/gnome-vfs.h>
-#include <libebook/e-book.h>
#include <libecal/e-cal-component.h>
#include <libecal/e-cal-util.h>
#include <libecal/e-cal-time-util.h>
@@ -51,8 +50,6 @@ struct _EMeetingStorePrivate {
char *fb_uri;
- EBook *ebook;
-
GPtrArray *refresh_queue;
GHashTable *refresh_data;
GMutex *mutex;
@@ -86,13 +83,6 @@ static GObjectClass *parent_class = NULL;
static void start_async_read (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer data);
-static void
-start_addressbook_server (EMeetingStore *store)
-{
- store->priv->ebook = e_book_new_system_addressbook (NULL);
- e_book_open (store->priv->ebook, FALSE, NULL);
-}
-
static icalparameter_cutype
text_to_type (const char *type)
{
@@ -553,9 +543,6 @@ ems_finalize (GObject *obj)
if (priv->client != NULL)
g_object_unref (priv->client);
- if (priv->ebook != NULL)
- g_object_unref (priv->ebook);
-
while (priv->refresh_queue->len > 0)
refresh_queue_remove (store, g_ptr_array_index (priv->refresh_queue, 0));
g_ptr_array_free (priv->refresh_queue, TRUE);
@@ -604,8 +591,6 @@ ems_init (EMeetingStore *store)
priv->mutex = g_mutex_new ();
priv->num_queries = 0;
-
- start_addressbook_server (store);
}
GType