[evolution/gnome-3-16] Bug 587476 - Hide appointment icons in the Month view

[Milan Crha <mcrha src gnome org>]

commit 0081f4da71b6a50627d143f416034a0aa3a0cf27
Author: Milan Crha <mcrha redhat com>
Date:   Mon Jun 15 19:10:46 2015 +0200

    Bug 587476 - Hide appointment icons in the Month view

 calendar/gui/e-week-view-event-item.c |    3 +++
 calendar/gui/e-week-view.c            |    2 ++
 2 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index f94081f..6a64484 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -446,6 +446,9 @@ week_view_event_item_draw_icons (EWeekViewEventItem *event_item,
        parent = gtk_widget_get_parent (GTK_WIDGET (canvas));
        week_view = E_WEEK_VIEW (parent);
 
+       if (e_week_view_get_multi_week_view (week_view))
+               return;
+
        if (!is_array_index_in_bounds (week_view->events, event_item->priv->event_num))
                return;
 
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index a9432a5..e499861 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -3582,6 +3582,8 @@ e_week_view_reshape_event_span (EWeekView *week_view,
            && week_view->editing_span_num == span_num) {
                show_icons = FALSE;
                use_max_width = TRUE;
+       } else if (e_week_view_get_multi_week_view (week_view)) {
+               show_icons = FALSE;
        }
 
        /* Calculate how many icons we need to show. */