aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c4
-rw-r--r--calendar/conduits/todo/todo-conduit.c4
3 files changed, 13 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c2611bb544..3cc38c39f1 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-18 Jeffrey Stedfast <fejj@novell.com>
+
+ Fixes bug #57592
+
+ * conduits/calendar/calendar-conduit.c (pre_sync): Same as below.
+
+ * conduits/todo/todo-conduit.c (pre_sync):
+ s/wombat/evolution-data-server/g
+
2004-06-18 Rodrigo Moya <rodrigo@novell.com>
Fixes #58747
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index f733cd8c50..e1ab03f7f8 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -1327,8 +1327,8 @@ pre_sync (GnomePilotConduit *conduit,
ctxt->client = NULL;
if (start_calendar_server (ctxt) != 0) {
- WARN(_("Could not start wombat server"));
- gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
+ WARN(_("Could not start evolution-data-server"));
+ gnome_pilot_conduit_error (conduit, _("Could not start evolution-data-server"));
return -1;
}
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index ca254a90e8..d6cb918dd8 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -846,8 +846,8 @@ pre_sync (GnomePilotConduit *conduit,
ctxt->client = NULL;
if (start_calendar_server (ctxt) != 0) {
- WARN(_("Could not start wombat server"));
- gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
+ WARN(_("Could not start evolution-data-server"));
+ gnome_pilot_conduit_error (conduit, _("Could not start evolution-data-server"));
return -1;
}