diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-01 18:44:36 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-01 18:44:36 +0800 |
| commit | 5f55aba5b052fb7284973f50009f8b369334d084 (patch) | |
| tree | e7a5149f56fd8550915c3141a408fb79a14d0239 /calendar/gui/gnome-cal.c | |
| parent | 6824309c1179f1346b4877f67e386f237d954196 (diff) | |
| download | gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.gz gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.zst gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.zip | |
Merge in changes from master.
Diffstat (limited to 'calendar/gui/gnome-cal.c')
| -rw-r--r-- | calendar/gui/gnome-cal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 7e685dcf91..2217cd5b0e 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -628,7 +628,7 @@ get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_ /* FIXME We should be using the same day of the week enum every where */ display_start = (E_WEEK_VIEW (priv->views[view_type])->display_start_day + 1) % 7; - if (!priv->range_selected) + if (!priv->range_selected && (!E_WEEK_VIEW (priv->views[view_type])->multi_week_view || !E_WEEK_VIEW (priv->views[view_type])->month_scroll_by_week)) *start_time = time_month_begin_with_zone (*start_time, priv->zone); *start_time = time_week_begin_with_zone (*start_time, display_start, priv->zone); *end_time = time_add_week_with_zone (*start_time, shown, priv->zone); |