[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=5a3ce55

The following commit has been merged in the master branch:
commit 5a3ce55acdc8d318cd8175f5546394f5f4d2da49
Author: Alexandr Akulich <akulichalexander at gmail.com>
Date:   Sun Dec 1 05:09:58 2013 +0600

    Follow upstream renaming in Tp::AccountManager.
    
    Use accountForObjectPath() instead of accountForPath().
    
    REVIEW: 114230
---
 KTp/global-contact-manager.cpp        | 2 +-
 kpeople/uiplugins/imdetailswidget.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/KTp/global-contact-manager.cpp b/KTp/global-contact-manager.cpp
index 2b4960d..eec0d4f 100644
--- a/KTp/global-contact-manager.cpp
+++ b/KTp/global-contact-manager.cpp
@@ -176,7 +176,7 @@ Tp::AccountPtr GlobalContactManager::accountForAccountId(const QString &accountI
 Tp::AccountPtr GlobalContactManager::accountForAccountPath(const QString &accountPath) const
 {
     if (!d->accountManager.isNull() && d->accountManager->isReady()) {
-        return d->accountManager->accountForPath(accountPath);
+        return d->accountManager->accountForObjectPath(accountPath);
     }
 
     return Tp::AccountPtr();
diff --git a/kpeople/uiplugins/imdetailswidget.cpp b/kpeople/uiplugins/imdetailswidget.cpp
index 3ca0b48..1d7ddf7 100644
--- a/kpeople/uiplugins/imdetailswidget.cpp
+++ b/kpeople/uiplugins/imdetailswidget.cpp
@@ -63,7 +63,7 @@ QWidget* ImDetailsWidget::createDetailsWidget(const KABC::Addressee& person, con
         const QString contactId = contact.custom(QLatin1String("telepathy"), QLatin1String("contactId"));
         const QString accountPath = contact.custom(QLatin1String("telepathy"), QLatin1String("accountPath")); //probably unused till we fix everything properly
 
-        Tp::AccountPtr account = KTp::accountManager()->accountForPath(accountPath);
+        Tp::AccountPtr account = KTp::accountManager()->accountForObjectPath(accountPath);
         if (!account) {
             continue;
         }

-- 
ktp-common-internals packaging