diff options
author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-10-22 02:28:34 +0800 |
---|---|---|
committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-10-22 02:28:34 +0800 |
commit | 0fb08f3ff81575a4749d851404233f34252dd2f2 (patch) | |
tree | 7e03befedc3a76fd104921dbbc616810d87333be /wombat/wombat.c | |
parent | 0e19f2c16de592607a341eb9974d31e4e47e02b5 (diff) | |
download | gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.gz gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.bz2 gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.lz gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.xz gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.zst gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.zip |
Merge new-ui-branch to the trunk.
svn path=/trunk/; revision=22964
Diffstat (limited to 'wombat/wombat.c')
-rw-r--r-- | wombat/wombat.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/wombat/wombat.c b/wombat/wombat.c index 563579f370..4dc6c6b60e 100644 --- a/wombat/wombat.c +++ b/wombat/wombat.c @@ -31,7 +31,8 @@ #include "pas/pas-backend-file.h" #include "calendar/pcs/cal-factory.h" -#include "calendar/pcs/cal-backend-file.h" +#include "calendar/pcs/cal-backend-file-events.h" +#include "calendar/pcs/cal-backend-file-todos.h" #include "wombat-interface-check.h" @@ -64,8 +65,7 @@ static guint termination_handler_id; static gboolean termination_handler (gpointer data) { - if ( - cal_factory_get_n_backends (cal_factory) == 0 && + if (cal_factory_get_n_backends (cal_factory) == 0 && pas_book_factory_get_n_backends (pas_book_factory) == 0) { fprintf (stderr, "termination_handler(): Terminating the Wombat. Have a nice day.\n"); bonobo_main_quit (); @@ -144,9 +144,10 @@ setup_pcs (void) return FALSE; } - cal_factory_register_method (cal_factory, "file", CAL_BACKEND_FILE_TYPE); + cal_factory_register_method (cal_factory, "file", ICAL_VEVENT_COMPONENT, CAL_BACKEND_FILE_EVENTS_TYPE); + cal_factory_register_method (cal_factory, "file", ICAL_VTODO_COMPONENT, CAL_BACKEND_FILE_TODOS_TYPE); - if (!cal_factory_oaf_register (cal_factory, CAL_FACTORY_OAF_ID)) { + if (!cal_factory_register_storage (cal_factory, CAL_FACTORY_OAF_ID)) { bonobo_object_unref (BONOBO_OBJECT (cal_factory)); cal_factory = NULL; return FALSE; |