aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorHarish Krishnaswamy <kharish@novell.com>2006-05-13 15:58:02 +0800
committerHarish Krishnaswamy <kharish@src.gnome.org>2006-05-13 15:58:02 +0800
commita71fd4b47943daf59597ecac6034c22d03cf007e (patch)
treef0698c955ede4a9cdbe5e498c8a96ae5b2d068b6 /calendar
parent783f44840ac69f8bf98870c02cd971a370d4caff (diff)
downloadgsoc2013-evolution-a71fd4b47943daf59597ecac6034c22d03cf007e.tar.gz
gsoc2013-evolution-a71fd4b47943daf59597ecac6034c22d03cf007e.tar.zst
gsoc2013-evolution-a71fd4b47943daf59597ecac6034c22d03cf007e.zip
Patch suggested by Yu-Hui Liu Check for timezone before passing the
2006-05-13 Harish Krishnaswamy <kharish@novell.com> Patch suggested by Yu-Hui Liu * conduits/todo/todo-conduit.c: (pre_sync): Check for timezone before passing the context. svn path=/trunk/; revision=31981
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/conduits/todo/todo-conduit.c12
2 files changed, 12 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 61459af294..7f3aa42278 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-13 Harish Krishnaswamy <kharish@novell.com>
+
+ Patch suggested by Yu-Hui Liu
+ * conduits/todo/todo-conduit.c: (pre_sync):
+ Check for timezone before passing the context.
+
2006-04-20 Chenthill Palanisamy <pchenthill@novell.com>
Fixes the events appearing in different timezone appear in
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index c81a4a6817..9a00d46364 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -1027,12 +1027,6 @@ pre_sync (GnomePilotConduit *conduit,
ctxt->dbi = dbi;
ctxt->client = NULL;
-
- if (start_calendar_server (ctxt) != 0) {
- WARN(_("Could not start evolution-data-server"));
- gnome_pilot_conduit_error (conduit, _("Could not start evolution-data-server"));
- return -1;
- }
/* Get the timezone */
ctxt->timezone = get_default_timezone ();
@@ -1040,6 +1034,12 @@ pre_sync (GnomePilotConduit *conduit,
return -1;
LOG (g_message ( " Using timezone: %s", icaltimezone_get_tzid (ctxt->timezone) ));
+ if (start_calendar_server (ctxt) != 0) {
+ WARN(_("Could not start evolution-data-server"));
+ gnome_pilot_conduit_error (conduit, _("Could not start evolution-data-server"));
+ return -1;
+ }
+
/* Get the default component */
if (!e_cal_get_default_object (ctxt->client, &icalcomp, NULL))
return -1;