[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=4a0ff5f

The following commit has been merged in the master branch:
commit 4a0ff5f2e566f8ed60b30a6dea072b4656ec9687
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Fri Aug 1 14:45:49 2014 +0200

    Fixed service autostarting by adding client file and changing service names.
    
    Signed-off-by: Marcin Ziemiński <zieminn at gmail.com>
---
 otr-proxy/KTpProxy/proxy-service.cpp | 2 +-
 otr-proxy/data/CMakeLists.txt        | 1 +
 otr-proxy/data/KTp.Proxy.client      | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/otr-proxy/KTpProxy/proxy-service.cpp b/otr-proxy/KTpProxy/proxy-service.cpp
index ac1904c..d5c60b4 100644
--- a/otr-proxy/KTpProxy/proxy-service.cpp
+++ b/otr-proxy/KTpProxy/proxy-service.cpp
@@ -97,7 +97,7 @@ void ProxyService::addChannel(const Tp::ChannelPtr &channel, const Tp::AccountPt
 void ProxyService::registerService(Tp::DBusError *error)
 {
     Tp::AbstractClientPtr baseObserverPtr = Tp::AbstractClientPtr::dynamicCast(observer);
-    const bool isRegistered = registrar->registerClient(baseObserverPtr, QString::fromLatin1("ProxyObserver"));
+    const bool isRegistered = registrar->registerClient(baseObserverPtr, QString::fromLatin1("KTp.Proxy"));
     if(!isRegistered) {
         error->set(
                 QString::fromLatin1("Client registering error"),
diff --git a/otr-proxy/data/CMakeLists.txt b/otr-proxy/data/CMakeLists.txt
index 23fdb7b..121d012 100644
--- a/otr-proxy/data/CMakeLists.txt
+++ b/otr-proxy/data/CMakeLists.txt
@@ -4,3 +4,4 @@ configure_file(org.freedesktop.Telepathy.Client.KTp.Proxy.service.in
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.Proxy.service
         DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
+install(FILES KTp.Proxy.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
diff --git a/otr-proxy/data/KTp.Proxy.client b/otr-proxy/data/KTp.Proxy.client
new file mode 100644
index 0000000..cef3eb9
--- /dev/null
+++ b/otr-proxy/data/KTp.Proxy.client
@@ -0,0 +1,6 @@
+[org.freedesktop.Telepathy.Client]
+Interfaces=org.freedesktop.Telepathy.Client.Observer;
+
+[org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 0]
+org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text
+org.freedesktop.Telepathy.Channel.TargetHandleType u=1

-- 
ktp-common-internals packaging