[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=6f1939a

The following commit has been merged in the master branch:
commit 6f1939a2a51f42b90ee2b4cd6e3c929593fd6bc1
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Fri Oct 7 01:07:37 2011 +0200

    Added check on null pointer
    
    check for null pointer when loading configuration for the plasmoid.
    If accountPtr doesn't exist, a default plasmoid is created
    
    Reviewed by: David Edmundson
---
 src/telepathy-contact.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/telepathy-contact.cpp b/src/telepathy-contact.cpp
index 4abbd25..2c94265 100644
--- a/src/telepathy-contact.cpp
+++ b/src/telepathy-contact.cpp
@@ -118,8 +118,9 @@ void TelepathyContact::loadConfig()
         Tp::ContactPtr contact;
 
         // check on account. Shouldn't ever be invalid
-        if (!account->isValidAccount()) {
+        if (!account || !account->isValidAccount()) {
             /// TODO add error popup box?
+            kWarning() << "Invalid account";
             return;
         }
 

-- 
ktp-contact-applet packaging