aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog10
-rw-r--r--calendar/gui/e-cal-model.c4
-rw-r--r--calendar/gui/e-week-view.c1
3 files changed, 12 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 7f04a4c43b..92de5afd33 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-09 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #551382
+
+ * gui/e-week-view.c: (model_comps_deleted_cb):
+ * gui/e-cal-model.c: (redo_queries):
+ Get rid of unused variables.
+ * gui/e-cal-model.c: (e_cal_view_objects_modified_cb):
+ Use result of g_list_prepend, thus report changes properly.
+
2008-09-08 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #544187
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index d78e4f5dbc..0b476a4bd5 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1500,7 +1500,7 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d
/* re-add only the recurrence objects */
for (l = objects; l != NULL; l = g_list_next (l)) {
if (e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES))
- g_list_prepend (list, l->data);
+ list = g_list_prepend (list, l->data);
else {
int pos;
ECalModelComponent *comp_data;
@@ -1865,7 +1865,7 @@ redo_queries (ECalModel *model)
{
ECalModelPrivate *priv;
GList *l;
- GSList *sl, *slist;
+ GSList *slist;
int len;
priv = model->priv;
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 9e3ea5d30e..67dc931c68 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -404,7 +404,6 @@ static void
model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data)
{
EWeekView *week_view = E_WEEK_VIEW (user_data);
- int i;
GSList *l, *list = data;
/* FIXME Stop editing? */