[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=abe31d1

The following commit has been merged in the master branch:
commit abe31d1a2b42bb0c4ec3dd1493c4529c0ec641db
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Dec 3 21:31:07 2013 +0100

    Remove "nepomuk" from debug output and a comment
---
 KTp/Models/contacts-model.cpp | 4 ++--
 KTp/core.cpp                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/KTp/Models/contacts-model.cpp b/KTp/Models/contacts-model.cpp
index 2a84636..df1d487 100644
--- a/KTp/Models/contacts-model.cpp
+++ b/KTp/Models/contacts-model.cpp
@@ -61,7 +61,7 @@ KTp::ContactsModel::ContactsModel(QObject *parent)
     d->trackUnread = false;
     if (KTp::kpeopleEnabled()) {
         #ifdef HAVE_KPEOPLE
-        kDebug() << "Nepomuk is enabled, using kpeople model";
+        kDebug() << "Built with kpeople support, using kpeople model";
         KPeople::PersonsModel *personsModel = new KPeople::PersonsModel(this);
 
         connect(personsModel, SIGNAL(modelInitialized()),
@@ -73,7 +73,7 @@ KTp::ContactsModel::ContactsModel(QObject *parent)
     }
     else
     {
-        kDebug() << "Nepomuk is disabled, using normal model";
+        kDebug() << "KPeople support not built-in, using normal model";
         d->source = new KTp::ContactsListModel(this);
         connect(d->source, SIGNAL(modelInitialized()),
                 this, SIGNAL(modelInitialized()));
diff --git a/KTp/core.cpp b/KTp/core.cpp
index 0a95f6c..783b7cd 100644
--- a/KTp/core.cpp
+++ b/KTp/core.cpp
@@ -44,7 +44,7 @@ CorePrivate::CorePrivate()
     : m_kPeopleEnabled(false),
       m_contactManager(0)
 {
-    //if built with kpeople support, enable kpeople if Nepomuk is running
+    //if built with kpeople support, enable it
     #ifdef HAVE_KPEOPLE
     m_kPeopleEnabled = true;
     #endif

-- 
ktp-common-internals packaging