[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=1d86203

The following commit has been merged in the master branch:
commit 1d86203e6f5d93d725ed791d0c508b9b87bac79c
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date:   Sun Jan 1 21:46:40 2012 +0100

    Fix crash.
    
    Do not crash when d->profileItem has been deleted previously, is not NULL and not created again with "new" yet.
---
 src/KCMTelepathyAccounts/simple-profile-select-widget.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
index 88fef12..2cfd8d5 100644
--- a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
@@ -151,9 +151,8 @@ void SimpleProfileSelectWidget::onProfileManagerReady(Tp::PendingOperation *op)
 // Return the selected ProfileItem or 0 if nothing is selected.
 ProfileItem *SimpleProfileSelectWidget::selectedProfile()
 {
-    if (d->profileItem != NULL) {
-        delete d->profileItem;
-    }
+    delete d->profileItem;
+    d->profileItem = NULL;
 
     Tp::ProfilePtr profilePtr = d->profileManager->profileForService(d->profileName);
 

-- 
ktp-accounts-kcm packaging