[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=34856aa

The following commit has been merged in the master branch:
commit 34856aa54f8fccd3e110b587c49142932d59a0a6
Author: George Goldberg <george.goldberg at collabora.co.uk>
Date:   Wed Jun 8 16:01:37 2011 +0100

    Increase required version of tpqt4 so that contact factories work correctly, and simulate changes of all contact properties after constructing the contacts to ensure Nepomuk database is up to date.
    
    Reviewed-By: Dario Freddi <dario.freddi at collabora.co.uk>
    REVIEW: 101544
---
 .../nepomuk-feeder/cmake/modules/FindTelepathyQt4.cmake  |  2 +-
 kpeople/nepomuk-feeder/contact.cpp                       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/kpeople/nepomuk-feeder/cmake/modules/FindTelepathyQt4.cmake b/kpeople/nepomuk-feeder/cmake/modules/FindTelepathyQt4.cmake
index f949c8c..8569415 100644
--- a/kpeople/nepomuk-feeder/cmake/modules/FindTelepathyQt4.cmake
+++ b/kpeople/nepomuk-feeder/cmake/modules/FindTelepathyQt4.cmake
@@ -17,7 +17,7 @@ endif(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=0.5.1)
+    pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=0.7.0)
 endif(PKG_CONFIG_FOUND)
 
 find_path(TELEPATHY_QT4_INCLUDE_DIR
diff --git a/kpeople/nepomuk-feeder/contact.cpp b/kpeople/nepomuk-feeder/contact.cpp
index 8c78a2a..bc5a291 100644
--- a/kpeople/nepomuk-feeder/contact.cpp
+++ b/kpeople/nepomuk-feeder/contact.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of telepathy-nepomuk-service
  *
- * Copyright (C) 2010 Collabora Ltd. <info at collabora.co.uk>
+ * Copyright (C) 2010-2011 Collabora Ltd. <info at collabora.co.uk>
  *   @author George Goldberg <george.goldberg at collabora.co.uk>
  *
  * This library is free software; you can redistribute it and/or
@@ -75,15 +75,15 @@ void Contact::init()
     emit created(m_contact->id());
 
     // Synthesize all the properties being changed
-    // FIXME: Make this bit correct
-    /*
-    onPublishStateChanged(m_contact->publishState());
+    // FIXME: Make sure all needed properties are included
+    onPresenceChanged(m_contact->presence());
+    onAliasChanged(m_contact->alias());
+    onAddedToGroup(QString());  // Arg is ignored.
+    // No need to call onRemovedFromGroup too since does the same as added.
+    onCapabilitiesChanged(m_contact->capabilities());
     onSubscriptionStateChanged(m_contact->subscriptionState());
+    onPublishStateChanged(m_contact->publishState());
     onBlockStatusChanged(m_contact->isBlocked());
-    if (contact->capabilities() != 0) {
-        onCapabilitiesChanged(m_contact->capabilities());
-    }
-    */
 }
 
 Contact::~Contact()

-- 
ktp-common-internals packaging