[evolution-kolab/gnome-3-4-0] Bug #673369 - Evolution critical warning when switching calendar views

[Christian Hilberg <chilberg src gnome org>]

commit 1b7d01553cd30afda1b8d8dd14987ec8a6444ba9
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Apr 2 17:23:01 2012 +0200

    Bug #673369 - Evolution critical warning when switching calendar views
    
    * there has been a check missing whether the object
      returned by KolabMailAccess actually matches the
      EDataCalView requirements
    * once the KolabMailAccess Cal/Book query processing
      is fully functional, the check added with this
      commit becomes redundant but can remain in place
      for samity checking (and possibly for throwing a
      warning should there still be non-matching objects
      returned by KolabMailAccess)

 src/calendar/e-cal-backend-kolab.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-kolab.c b/src/calendar/e-cal-backend-kolab.c
index 188fc6a..98de5d9 100644
--- a/src/calendar/e-cal-backend-kolab.c
+++ b/src/calendar/e-cal-backend-kolab.c
@@ -1792,8 +1792,15 @@ e_cal_backend_kolab_start_view (ECalBackend *backend,
 			tmp_err = NULL;
 		}
 		if (ecalcomp != NULL) {
-			iCal_objects = g_slist_append (iCal_objects,
-			                               e_cal_component_get_as_string (ecalcomp));
+			gboolean do_add = FALSE;
+			gchar *compstr = NULL;
+			do_add = e_data_cal_view_component_matches (view,
+			                                            ecalcomp);
+			if (do_add) {
+				compstr = e_cal_component_get_as_string (ecalcomp);
+				iCal_objects = g_slist_append (iCal_objects,
+				                               compstr);
+			}
 			g_object_unref (ecalcomp);
 		}
 	}