[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=622b30b

The following commit has been merged in the master branch:
commit 622b30bc17ed6304b1cce16084731e06e10cd98a
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Mon Nov 21 20:48:27 2011 +0100

    Fix logical error
---
 CMakeLists.txt          | 2 ++
 models/groups-model.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fab29e2..2b9c15f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,8 @@ set (telepathy_common_internals_private_HDRS
      telepathy-handler-application.h
      text-parser.h
      wallet-interface.h
+
+     ktelepathy-export.h
 )
 
 kde4_add_library (telepathykdecommoninternalsprivate SHARED
diff --git a/models/groups-model.cpp b/models/groups-model.cpp
index a0dd683..2827e86 100644
--- a/models/groups-model.cpp
+++ b/models/groups-model.cpp
@@ -434,7 +434,7 @@ void GroupsModel::addContactToGroups(ContactModelItem* contactItem, QStringList
             }
         }
 
-        if (!groupExists && groupItem) {
+        if (!groupExists && !groupItem) {
             groupItem = new GroupsModelItem(group);
             onItemsAdded(mPriv->mTree, QList<TreeNode *>() << groupItem);
         }

-- 
ktp-common-internals packaging