aboutsummaryrefslogtreecommitdiffstats
path: root/wombat
diff options
context:
space:
mode:
Diffstat (limited to 'wombat')
-rw-r--r--wombat/ChangeLog15
-rw-r--r--wombat/GNOME_Evolution_WombatLDAP.server.in.in3
-rw-r--r--wombat/wombat.c11
3 files changed, 24 insertions, 5 deletions
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 6d643b4ff6..b96d759db7 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,8 +1,23 @@
+2003-10-15 Rodrigo Moya <rodrigo@ximian.com>
+
+ * wombat.c (termination_handler): re-enabled the call to
+ cal_factory_get_n_backends, so that we only terminate if there
+ are no active backends (either addressbook or calendar).
+
2003-10-09 Jeffrey Stedfast <fejj@ximian.com>
* Makefile.am: INCLUDE path fixes for changes made to libical
build.
+2003-08-13 JP Rosevear <jpr@ximian.com>
+
+ * wombat.c (termination_handler): comment out some bits
+ (setup_pcs): register kind and method
+
+ * GNOME_Evolution_Wombat.server.in.in: add calendar protocol
+
+ * GNOME_Evolution_WombatLDAP.server.in.in: ditto
+
2003-06-26 Rodrigo Moya <rodrigo@ximian.com>
* Evolution-Wombat.idl: removed WombatClient interface.
diff --git a/wombat/GNOME_Evolution_WombatLDAP.server.in.in b/wombat/GNOME_Evolution_WombatLDAP.server.in.in
index 714763b8ac..6e6e02bc80 100644
--- a/wombat/GNOME_Evolution_WombatLDAP.server.in.in
+++ b/wombat/GNOME_Evolution_WombatLDAP.server.in.in
@@ -30,6 +30,9 @@
<oaf_attribute name="name" type="string"
_value="Evolution Calendar local file backend"/>
+ <oaf_attribute name="calendar:supported_protocols" type="stringv">
+ <item value="file"/>
+ </oaf_attribute>
</oaf_server>
<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_InterfaceCheck"
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;