[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=3801551

The following commit has been merged in the master branch:
commit 3801551b810bba7879e747d902d4a3f6d7ef76a7
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Fri Dec 23 13:57:57 2011 +0100

    s/telepathy-contact/ktp-contact
---
 CMakeLists.txt            | 2 +-
 src/telepathy-contact.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3280f0..0b34038 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,6 +50,6 @@ target_link_libraries(plasma_applet_ktp_contact
                         ${KTP_MODELS_LIBRARIES}
                         ${QT_QTDECLARATIVE_LIBRARY})
 
-install(DIRECTORY src/declarative/ DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.telepathy-contact)
+install(DIRECTORY src/declarative/ DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.ktp-contact)
 install(TARGETS plasma_applet_ktp_contact DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES plasma_applet_ktp_contact.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/src/telepathy-contact.cpp b/src/telepathy-contact.cpp
index 9ee1bf9..0670bf7 100644
--- a/src/telepathy-contact.cpp
+++ b/src/telepathy-contact.cpp
@@ -73,7 +73,7 @@ void TelepathyContact::init()
     kDebug() << "APPLET ID: " << id();
 
     if (m_declarative) {
-        QString qmlFile = KGlobal::dirs()->findResource("data", "plasma/plasmoids/org.kde.telepathy-contact/contents/ui/main.qml");
+        QString qmlFile = KGlobal::dirs()->findResource("data", "plasma/plasmoids/org.kde.ktp-contact/contents/ui/main.qml");
         kDebug() << "LOADING: " << qmlFile;
         m_declarative->setQmlPath(qmlFile);
         m_declarative->engine()->rootContext()->setContextProperty("TelepathyContact", m_contact);
@@ -232,4 +232,4 @@ void TelepathyContact::showConfigurationInterface()
 }
 
 // This is the command that links your applet to the .desktop file
-K_EXPORT_PLASMA_APPLET(telepathy-contact, TelepathyContact)
+K_EXPORT_PLASMA_APPLET(ktp-contact, TelepathyContact)

-- 
ktp-contact-applet packaging