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

The following commit has been merged in the master branch:
commit f128d2c8062ab3be2751b7da4c870c2b724a4ffd
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Thu Dec 22 16:16:48 2011 +0100

    Rename according to the new policy
---
 presence/CMakeLists.txt                     | 22 +++++++++++-----------
 presence/plasma-applet-ktp-presence.desktop | 21 +++++++++++++++++++++
 presence/src/presence-applet.cpp            |  8 ++++----
 presence/src/presence-applet.h              |  6 +++---
 4 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/presence/CMakeLists.txt b/presence/CMakeLists.txt
index 44fc061..29b48c8 100644
--- a/presence/CMakeLists.txt
+++ b/presence/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(telepathy-kde-presence-applet)
+project(ktp-presence-applet)
 
 cmake_minimum_required(VERSION 2.8)
 
@@ -9,11 +9,11 @@ set(CMAKE_MODULE_PATH
 
 set(KDE_MIN_VERSION "4.6.0")
 
-set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
+set(IS_KTP_INTERNAL_MODULE TRUE)
 
 find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
 find_package(TelepathyQt4 0.8.90 REQUIRED)
-find_package(KTelepathy REQUIRED)
+find_package(KTp REQUIRED)
 
 include(KDE4Defaults)
 
@@ -25,26 +25,26 @@ include_directories(${CMAKE_SOURCE_DIR}
                     ${CMAKE_BINARY_DIR}
                     ${KDE4_INCLUDES}
                     ${TELEPATHY_QT4_INCLUDE_DIR}
-                    ${KTELEPATHY_INCLUDE_DIR}
+                    ${KTP_INCLUDE_DIR}
 )
 
 
-set(telepathy-kde-presence-applet_SRCS
+set(ktp-presence-applet_SRCS
     src/generalsettings.cpp
     src/presenceapplet.cpp
 )
 
-kde4_add_ui_files(telepathy-kde-presence-applet_SRCS
+kde4_add_ui_files(ktp-presence-applet_SRCS
                     src/generalsettings.ui
 )
 
-kde4_add_plugin(telepathy-kde-presence-applet ${telepathy-kde-presence-applet_SRCS})
-target_link_libraries(telepathy-kde-presence-applet
+kde4_add_plugin(ktp-presence-applet ${ktp-presence-applet_SRCS})
+target_link_libraries(ktp-presence-applet
                         ${KDE4_PLASMA_LIBS}
                         ${KDE4_KDEUI_LIBS}
                         ${TELEPATHY_QT4_LIBRARIES}
-                        ${KTELEPATHY_LIBRARIES}
+                        ${KTP_LIBRARIES}
                      )
 
-install(TARGETS telepathy-kde-presence-applet DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES telepathy-kde-presence-applet.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(TARGETS ktp-presence-applet DESTINATION ${PLUGIN_INSTALL_DIR})
+install(FILES ktp-presence-applet.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/presence/plasma-applet-ktp-presence.desktop b/presence/plasma-applet-ktp-presence.desktop
new file mode 100644
index 0000000..17b1c14
--- /dev/null
+++ b/presence/plasma-applet-ktp-presence.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Name=Instant Messaging Presence Applet
+Type=Service
+ServiceTypes=Plasma/Applet,Plasma/PopupApplet
+Icon=user-online
+
+X-Plasma-DefaultSize=128,128
+
+X-KDE-Library=ktp-presence-applet
+X-KDE-PluginInfo-Name=ktp-presence-applet
+X-KDE-PluginInfo-Category=Online Services
+X-KDE-PluginInfo-Author=Francesco Nwokeka
+X-KDE-PluginInfo-Email=francesco.nwokeka at gmail.com
+X-KDE-PluginInfo-Version=0.3
+X-KDE-PluginInfo-Website=http://telepathy.freedesktop.org/
+X-KDE-PluginInfo-Depends=
+X-KDE-PluginInfo-License=LGPL
+X-KDE-PluginInfo-EnabledByDefault=true
+
+X-Plasma-NotificationArea=true
+
diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index 2a1a5c1..bc5442d 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -152,7 +152,7 @@ void TelepathyPresenceApplet::setupContextMenuActions()
     goOfflineAction->setData(QVariant::fromValue(KTp::Presence(Tp::Presence::offline())));
 
     // application actions
-    KAction *showAccountManagerAction = new KAction(KIcon("telepathy-kde"), i18n("Account Manager"), this);
+    KAction *showAccountManagerAction = new KAction(KIcon("ktp"), i18n("Account Manager"), this);
     KAction *showContactListAction = new KAction(KIcon("meeting-attending"), i18n("Contact List"), this);
 
     // connect actions
@@ -222,7 +222,7 @@ void TelepathyPresenceApplet::startAccountManager() const
 
 void TelepathyPresenceApplet::startContactList() const
 {
-    KToolInvocation::startServiceByDesktopName("telepathy-kde-contactlist");
+    KToolInvocation::startServiceByDesktopName("ktp-contactlist");
 }
 
 void TelepathyPresenceApplet::toolTipAboutToShow()
@@ -232,7 +232,7 @@ void TelepathyPresenceApplet::toolTipAboutToShow()
 
     QString presenceMsg = QString(m_globalPresence->currentPresence().statusMessage());
 
-    content.setImage(KIcon("telepathy-kde"));
+    content.setImage(KIcon("ktp"));
     content.setMainText(user.loginName());
 
     if (m_globalPresence->isChangingPresence()) {
@@ -259,4 +259,4 @@ void TelepathyPresenceApplet::updateClickAction(TelepathyPresenceApplet::OnClick
 #include "presenceapplet.moc"
 
 // This is the command that links your applet to the .desktop file
-K_EXPORT_PLASMA_APPLET(telepathy-kde-presence-applet, TelepathyPresenceApplet)
+K_EXPORT_PLASMA_APPLET(ktp-presence-applet, TelepathyPresenceApplet)
diff --git a/presence/src/presence-applet.h b/presence/src/presence-applet.h
index ae9450d..7042538 100644
--- a/presence/src/presence-applet.h
+++ b/presence/src/presence-applet.h
@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#ifndef TELEPATHY_KDE_PRESENCE_APPLET_H
-#define TELEPATHY_KDE_PRESENCE_APPLET_H
+#ifndef KTP_PRESENCE_APPLET_H
+#define KTP_PRESENCE_APPLET_H
 
 #include <Plasma/PopupApplet>
 #include <Plasma/DeclarativeWidget>
@@ -99,4 +99,4 @@ public:
     ~DBusExporter() {};
 };
 
-#endif  // TELEPATHY_KDE_PRESENCE_APPLET_H
+#endif  // KTP_PRESENCE_APPLET_H

-- 
ktp-contact-applet packaging