[planner/f14/master] Resolves: rhbz#654733 implement set_default_zone_sync
Caolan McNamara
caolanm at fedoraproject.org
Fri Nov 19 09:34:26 UTC 2010
commit 1d75f896a40b0f50dd3c7f8074e316548d06f24c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 19 09:34:26 2010 +0000
Resolves: rhbz#654733 implement set_default_zone_sync
planner-0.14.4-edsapi.patch | 95 +++++++++++++++++++++++++------------------
planner.spec | 5 ++-
2 files changed, 59 insertions(+), 41 deletions(-)
---
diff --git a/planner-0.14.4-edsapi.patch b/planner-0.14.4-edsapi.patch
index 8616255..1eba442 100644
--- a/planner-0.14.4-edsapi.patch
+++ b/planner-0.14.4-edsapi.patch
@@ -10,7 +10,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
/* Private part of the ECalBackendPlanner structure */
struct _ECalBackendPlannerPrivate {
/* uri to get planner data from */
-@@ -58,97 +60,111 @@
+@@ -58,97 +60,115 @@
/* Backend implementation */
static void cbp_dispose (GObject *object);
static void cbp_finalize (GObject *object);
@@ -90,6 +90,10 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
-static ECalBackendSyncStatus cbp_get_object_list (ECalBackendSync *backend,
+ const gchar *tzobj,
+ GError **perror);
++static void cbp_set_default_zone_sync (ECalBackendSync *backend,
++ EDataCal *cal,
++ const gchar *tzid,
++ GError **perror);
+static void cbp_get_object_list (ECalBackendSync *backend,
EDataCal *cal,
const gchar *sexp,
@@ -168,7 +172,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
static icaltimezone * cbp_internal_get_default_timezone (ECalBackend *backend);
static icaltimezone * cbp_internal_get_timezone (ECalBackend *backend,
-@@ -374,56 +390,51 @@
+@@ -374,56 +394,51 @@
/* Is_read_only handler for the file backend */
/* It will be read and write in the future */
@@ -240,7 +244,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
static ECalComponent *
-@@ -805,12 +816,13 @@
+@@ -805,12 +820,13 @@
}
/* Open handler for the file backend */
@@ -256,7 +260,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -827,7 +839,8 @@
+@@ -827,7 +843,8 @@
}
if (!uri) {
e_cal_backend_notify_error (E_CAL_BACKEND (backend), _("Invalid server URI"));
@@ -266,7 +270,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
cbplanner = E_CAL_BACKEND_PLANNER (backend);
-@@ -835,7 +848,7 @@
+@@ -835,7 +852,7 @@
if (priv->project_loaded) {
g_warning ("Reopening project ... we need to check for new tasks ...");
@@ -275,7 +279,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
} else {
g_warning ("Openinig project for the first time ...");
}
-@@ -848,17 +861,19 @@
+@@ -848,17 +865,19 @@
task_add_properties (priv->project);
g_idle_add ((GSourceFunc) get_planner_tasks_cb, cbplanner);
priv->project_loaded = TRUE;
@@ -299,7 +303,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -868,7 +883,7 @@
+@@ -868,7 +887,7 @@
/* e_file_cache_remove (E_FILE_CACHE (priv->cache)); */
/* FIXME: we need to remove the task from Planner */
@@ -308,7 +312,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
/* is_loaded handler for the planner backend */
-@@ -904,7 +919,7 @@
+@@ -904,7 +923,7 @@
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
@@ -317,7 +321,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
-@@ -917,27 +932,28 @@
+@@ -917,27 +936,28 @@
break;
case CAL_MODE_ANY:
priv->mode = CAL_MODE_REMOTE;
@@ -353,7 +357,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -951,17 +967,16 @@
+@@ -951,17 +971,16 @@
icalcomp = e_cal_util_new_component (kind);
*object = g_strdup (icalcomponent_as_ical_string (icalcomp));
icalcomponent_free (icalcomp);
@@ -374,7 +378,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -970,83 +985,43 @@
+@@ -970,83 +989,56 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
@@ -447,35 +451,44 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
- g_return_val_if_fail (E_IS_CAL_BACKEND_PLANNER (cbplanner),
- GNOME_Evolution_Calendar_OtherError);
- g_return_val_if_fail (tzobj != NULL, GNOME_Evolution_Calendar_OtherError);
--
-- priv = cbplanner->priv;
++ if (!E_IS_CAL_BACKEND_PLANNER (cbplanner) || tzobj == NULL)
++ {
++ g_propagate_error (perror, EDC_ERROR (OtherError));
++ return;
++ }
+
+ priv = cbplanner->priv;
-
- /* FIXME: add the timezone to the cache */
- return GNOME_Evolution_Calendar_Success;
--}
--
+ }
+
-static ECalBackendSyncStatus
-cbp_set_default_timezone (ECalBackendSync *backend,
- EDataCal *cal,
- const gchar *tzid)
--{
++static void
++cbp_set_default_zone_sync (ECalBackendSync *backend,
++ EDataCal *cal,
++ const gchar *tzid,
++ GError **perror)
+ {
- ECalBackendPlanner *cbplanner;
- ECalBackendPlannerPrivate *priv;
-+ if (!E_IS_CAL_BACKEND_PLANNER (cbplanner) || tzobj == NULL)
-+ {
-+ g_propagate_error (perror, EDC_ERROR (OtherError));
-+ return;
-+ }
++ ECalBackendPlanner *cbplanner;
++ ECalBackendPlannerPrivate *priv;
- cbplanner = E_CAL_BACKEND_PLANNER (backend);
- priv = cbplanner->priv;
+- priv = cbplanner->priv;
-
- /* FIXME */
- return GNOME_Evolution_Calendar_Success;
++ cbplanner = E_CAL_BACKEND_PLANNER (backend);
++ priv = cbplanner->priv;
}
static void
-@@ -1061,11 +1036,12 @@
+@@ -1061,11 +1053,12 @@
/* Get_objects_in_range handler for the planner backend */
@@ -490,7 +503,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1092,7 +1068,6 @@
+@@ -1092,7 +1085,6 @@
g_list_free (comps);
g_object_unref (cbsexp);
@@ -498,7 +511,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
/* get_query handler for the planner backend */
-@@ -1133,17 +1108,18 @@
+@@ -1133,17 +1125,18 @@
g_list_free (objects);
g_object_unref (cbsexp);
@@ -520,7 +533,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1151,22 +1127,19 @@
+@@ -1151,22 +1144,19 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
@@ -548,7 +561,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1174,34 +1147,31 @@
+@@ -1174,34 +1164,31 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
@@ -591,7 +604,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1215,17 +1185,29 @@
+@@ -1215,17 +1202,29 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
@@ -625,7 +638,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
/* Get the UID to try to find the object */
-@@ -1236,7 +1218,8 @@
+@@ -1236,7 +1235,8 @@
new_uid = e_cal_component_gen_uid ();
if (!new_uid) {
icalcomponent_free (icalcomp);
@@ -635,7 +648,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
icalcomponent_set_uid (icalcomp, new_uid);
-@@ -1251,7 +1234,8 @@
+@@ -1251,7 +1251,8 @@
/* check the object is not in our cache */
if (lookup_component (cbplanner, comp_uid)) {
icalcomponent_free (icalcomp);
@@ -645,7 +658,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
/* Create the cal component */
-@@ -1271,21 +1255,20 @@
+@@ -1271,21 +1272,20 @@
/* Save the planner project */
mrp_project_save (priv->project, TRUE, &error);
@@ -671,7 +684,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1300,14 +1283,24 @@
+@@ -1300,14 +1300,24 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
@@ -700,7 +713,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
comp_uid = icalcomponent_get_uid (icalcomp);
g_message ("Modifying calendar object %s\n%s", comp_uid, calobj);
-@@ -1318,7 +1311,8 @@
+@@ -1318,7 +1328,8 @@
if (!(cache_comp = lookup_component (cbplanner, comp_uid))) {
g_message ("CRITICAL : Could not find the object in cache %s", comp_uid);
icalcomponent_free (icalcomp);
@@ -710,7 +723,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
} else {
g_message ("Cache object found %s... modifying it", comp_uid);
}
-@@ -1330,13 +1324,15 @@
+@@ -1330,13 +1341,15 @@
if (task == NULL) {
g_message ("Cache fail: can't find task for component %s", comp_uid);
g_object_unref (cache_comp);
@@ -728,7 +741,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
g_hash_table_replace (priv->tasks_comp, (gpointer) comp_uid, comp);
task_replace (priv->project, task, task_new);
-@@ -1349,19 +1345,18 @@
+@@ -1349,19 +1362,18 @@
*old_object = e_cal_component_get_as_string (cache_comp);
g_object_unref (cache_comp);
@@ -752,7 +765,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1372,7 +1367,11 @@
+@@ -1372,7 +1384,11 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
@@ -765,7 +778,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
g_message ("Removing object %s ...", uid);
comp = lookup_component (cbplanner, uid);
-@@ -1382,15 +1381,14 @@
+@@ -1382,15 +1398,14 @@
mrp_project_remove_task (priv->project, task);
g_object_unref (task);
mrp_project_save (priv->project, TRUE, &error);
@@ -784,7 +797,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1400,26 +1398,29 @@
+@@ -1400,26 +1415,29 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
@@ -823,7 +836,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1432,7 +1433,7 @@
+@@ -1432,7 +1450,7 @@
g_message ("Sending objects ...");
@@ -832,13 +845,15 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
static icaltimezone *
-@@ -1518,9 +1519,7 @@
+@@ -1518,9 +1536,9 @@
sync_class->get_default_object_sync = cbp_get_default_object;
sync_class->get_object_sync = cbp_get_object;
sync_class->get_object_list_sync = cbp_get_object_list;
- sync_class->get_timezone_sync = cbp_get_timezone;
sync_class->add_timezone_sync = cbp_add_timezone;
- sync_class->set_default_timezone_sync = cbp_set_default_timezone;
++ sync_class->set_default_zone_sync = cbp_set_default_zone_sync;
++
sync_class->get_freebusy_sync = cbp_get_free_busy;
sync_class->get_changes_sync = cbp_get_changes;
diff --git a/planner.spec b/planner.spec
index 881b481..7be5cbd 100644
--- a/planner.spec
+++ b/planner.spec
@@ -7,7 +7,7 @@
Summary: A graphical project management tool
Name: planner
Version: 0.14.4
-Release: 26%{?dist}
+Release: 27%{?dist}
License: GPLv2+
Group: Applications/Productivity
URL: http://live.gnome.org/Planner
@@ -193,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/*
%changelog
+* Fri Nov 19 2010 Caolán McNamara <caolanm at redhat.com> - 0.14.4-27
+- Resolves: rhbz#654733 implement set_default_zone_sync
+
* Mon Sep 27 2010 Caolán McNamara <caolanm at redhat.com> - 0.14.4-26
- rebuild for dependencies
More information about the scm-commits
mailing list