[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=8951a24

The following commit has been merged in the master branch:
commit 8951a24cb33547e0ab2571565e6c0ce7eb6cd3cf
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Oct 26 11:32:32 2011 +0200

    Fix some probably-drunk-written code, less crashes and better checking
    
    Reviewed-by: Daniele E. Domenichelli
---
 src/salut-enable-dialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/salut-enable-dialog.cpp b/src/salut-enable-dialog.cpp
index abc2b2c..a4fef49 100644
--- a/src/salut-enable-dialog.cpp
+++ b/src/salut-enable-dialog.cpp
@@ -112,10 +112,10 @@ void SalutEnableDialog::onProfileManagerReady(Tp::PendingOperation* op)
     ParameterEditModel *parameterModel = new ParameterEditModel(this);
     d->profile = d->profileManager->profilesForCM("salut").first();
 
-    Q_ASSERT(d->profile.isNull());
+    Q_ASSERT(!d->profile.isNull());
     Q_ASSERT(d->profile->isValid());
     Q_ASSERT(d->profile->protocolName() == QLatin1String("local-xmpp"));
-    if(!d->profile.isNull() || !d->profile->isValid() || d->profile->protocolName() == QLatin1String("local-xmpp"))
+    if(d->profile.isNull() || !d->profile->isValid() || d->profile->protocolName() != QLatin1String("local-xmpp"))
     {
         kWarning() << "Something went wrong with telepathy salut";
     }

-- 
ktp-accounts-kcm packaging