aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog18
-rw-r--r--calendar/gui/e-cal-model.c2
-rw-r--r--calendar/gui/e-day-view.c12
-rw-r--r--calendar/gui/e-week-view.c11
4 files changed, 19 insertions, 24 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 3979c5b771..938297a423 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,21 @@
+2005-01-03 Rodrigo Moya <rodrigo@novell.com>
+
+ * gui/e-cal-model.c (e_cal_model_set_time_range): redo the queries
+ after emitting the 'time_range_changed' signal, since now the
+ views will only update their internal data but not redraw the
+ events on that signal.
+
+ * gui/e-day-view.c (model_changed_cb): removed, no longer needed.
+ (e_day_view_recalc_day_starts): no need to call e_day_view_update_query.
+ (e_day_view_init): no need to connect to 'model_changed' signal
+ on the model, we already connect to the row/cell_changed ones.
+
+ * gui/e-week-view.c (time_range_changed_cb): no need to call
+ e_week_view_update_query.
+ (model_changed_cb): removed, no longer needed.
+ (e_week_view_init): no need to connect to 'model_changed' signal
+ on the model, we already connect to the row/cell_changed ones.
+
2004-12-31 JP Rosevear <jpr@novell.com>
* gui/dialogs/schedule-page.c: add necessary include
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 9d1cf2d0ab..3dd68d2111 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1741,8 +1741,8 @@ e_cal_model_set_time_range (ECalModel *model, time_t start, time_t end)
priv->start = start;
priv->end = end;
- redo_queries (model);
g_signal_emit (G_OBJECT (model), signals[TIME_RANGE_CHANGED], 0, start, end);
+ redo_queries (model);
}
const char *
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 0ea43ba498..e350279cbb 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -539,14 +539,6 @@ process_component (EDayView *day_view, ECalModelComponent *comp_data)
}
static void
-model_changed_cb (ETableModel *etm, gpointer user_data)
-{
- EDayView *day_view = E_DAY_VIEW (user_data);
-
- e_day_view_update_query (day_view);
-}
-
-static void
update_row (EDayView *day_view, int row)
{
ECalModelComponent *comp_data;
@@ -984,8 +976,6 @@ e_day_view_init (EDayView *day_view)
/* connect to ECalModel's signals */
g_signal_connect (G_OBJECT (model), "time_range_changed",
G_CALLBACK (time_range_changed_cb), day_view);
- g_signal_connect (G_OBJECT (model), "model_changed",
- G_CALLBACK (model_changed_cb), day_view);
g_signal_connect (G_OBJECT (model), "model_row_changed",
G_CALLBACK (model_row_changed_cb), day_view);
g_signal_connect (G_OBJECT (model), "model_cell_changed",
@@ -2248,8 +2238,6 @@ e_day_view_recalc_day_starts (EDayView *day_view,
day_view->lower = start_time;
day_view->upper = day_view->day_starts[day_view->days_shown];
-
- e_day_view_update_query (day_view);
}
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 64c2075cb9..08587725b0 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -286,7 +286,6 @@ time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpo
start_time = time_day_begin_with_zone (start_time,
e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
e_week_view_recalc_day_starts (week_view, start_time);
- e_week_view_update_query (week_view);
}
/* Reset the adjustment value to 0 if the base address has changed.
@@ -341,14 +340,6 @@ process_component (EWeekView *week_view, ECalModelComponent *comp_data)
}
static void
-model_changed_cb (ETableModel *etm, gpointer user_data)
-{
- EWeekView *week_view = E_WEEK_VIEW (user_data);
-
- e_week_view_update_query (week_view);
-}
-
-static void
update_row (EWeekView *week_view, int row)
{
ECalModelComponent *comp_data;
@@ -586,8 +577,6 @@ e_week_view_init (EWeekView *week_view)
/* connect to ECalModel's signals */
g_signal_connect (G_OBJECT (model), "time_range_changed",
G_CALLBACK (time_range_changed_cb), week_view);
- g_signal_connect (G_OBJECT (model), "model_changed",
- G_CALLBACK (model_changed_cb), week_view);
g_signal_connect (G_OBJECT (model), "model_row_changed",
G_CALLBACK (model_row_changed_cb), week_view);
g_signal_connect (G_OBJECT (model), "model_cell_changed",