[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace/plasma/generic/dataengines/calendar/akonadi
From: Aaron J. Seigo <aseigo () kde ! org>
Date: 2011-01-04 21:45:26
Message-ID: 20110104214526.90784AC8B0 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1211753 by aseigo:
check pointers before using
BUG:262117
M +9 -3 calendar.cpp
--- trunk/KDE/kdebase/workspace/plasma/generic/dataengines/calendar/akonadi/calendar.cpp #1211752:1211753
@@ -165,8 +165,11 @@
Calendar::Private::~Private()
{
Q_FOREACH ( const Akonadi::Item &item, m_itemMap ) {
- CalendarSupport::incidence( item )->unRegisterObserver( q );
+ KCalCore::Incidence::Ptr incidence = CalendarSupport::incidence( item );
+ if (incidence) {
+ incidence->unRegisterObserver( q );
}
+ }
delete mTimeZones;
delete mDefaultFilter;
@@ -417,8 +420,11 @@
unseen_item.collection = unseen_parent.collection = item.storageCollectionId();
- unseen_item.uid = CalendarSupport::incidence( item )->uid();
- unseen_parent.uid = CalendarSupport::incidence( item )->relatedTo();
+ KCalCore::Incidence::Ptr incidence = CalendarSupport::incidence( item );
+ if (incidence) {
+ unseen_item.uid = incidence->uid();
+ unseen_parent.uid = incidence->relatedTo();
+ }
if ( m_childToParent.contains( item.id() ) ) {
Akonadi::Item::Id parentId = m_childToParent.take( item.id() );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic