[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-i18n-doc
Subject: [telepathy-kded-module] /: Rename kded module according to the new
From: Martin Klapetek <martin.klapetek () gmail ! com>
Date: 2011-12-22 19:19:06
Message-ID: 20111222191906.63D63A60A6 () git ! kde ! org
[Download RAW message or body]
Git commit d622f890dbaee58d7d09c0c2baaf5a217d295eba by Martin Klapetek.
Committed on 22/12/2011 at 19:10.
Pushed by mklapetek into branch 'master'.
Rename kded module according to the new policy
Reviewed-by: Dario Freddi
REVIEW: 103503
CCMAIL: kde-i18n-doc@kde.org
M +11 -11 CMakeLists.txt
M +1 -1 Messages.sh
M +1 -1 autoaway.cpp
M +8 -8 config/CMakeLists.txt
A +39 -0 config/kcm_ktp_integration_module.desktop
M +1 -1 contact-request-handler.cpp
M +1 -1 error-handler.cpp
A +30 -0 kded_ktp_integration_module.desktop
M +1 -1 telepathy-kded-module-plugin.cpp
M +2 -2 telepathy-module.cpp
M +1 -1 telepathy-module.h
M +1 -1 telepathy-mpris.cpp
http://commits.kde.org/telepathy-kded-module/d622f890dbaee58d7d09c0c2baaf5a217d295eba
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25c569d..3b97bca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,14 @@
-project(telepathy-kded-module)
+project(ktp-kded-integration-module)
set (CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
${CMAKE_MODULE_PATH}
)
-set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
+set(IS_KTP_INTERNAL_MODULE TRUE)
find_package (KDE4 REQUIRED)
find_package (TelepathyQt4 0.8.9 REQUIRED)
-find_package (KTelepathy REQUIRED)
+find_package (KTp REQUIRED)
# set some default settings
include (KDE4Defaults)
@@ -25,10 +25,10 @@ include_directories (${KDE4_INCLUDES}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${TELEPATHY_QT4_INCLUDE_DIR}
- ${KTELEPATHY_INCLUDE_DIR}
+ ${KTP_INCLUDE_DIR}
)
-set (telepathy_module_SRCS
+set (kded_ktp_integration_module_SRCS
contact-request-handler.cpp
telepathy-kded-module-plugin.cpp
telepathy-module.cpp
@@ -37,24 +37,24 @@ set (telepathy_module_SRCS
error-handler.cpp
)
-kde4_add_plugin (kded_telepathy_module
- ${telepathy_module_SRCS}
+kde4_add_plugin (kded_ktp_integration_module
+ ${kded_ktp_integration_module_SRCS}
)
-target_link_libraries (kded_telepathy_module
+target_link_libraries (kded_ktp_integration_module
${KDE4_KDECORE_LIBS}
${TELEPATHY_QT4_LIBRARIES}
- ${KTELEPATHY_LIBRARIES}
+ ${KTP_LIBRARIES}
${KDE4_KDEUI_LIBS}
kidletime
)
-install (TARGETS kded_telepathy_module
+install (TARGETS kded_ktp_integration_module
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-install (FILES telepathy_kded_module.desktop
+install (FILES kded_ktp_integration_module.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kded
)
diff --git a/Messages.sh b/Messages.sh
index fec435c..b986187 100644
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,4 +1,4 @@
#! /usr/bin/env bash
$EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
-$XGETTEXT `find . -name "*.cpp"` -o $podir/telepathy-kded-module.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/kded_ktp_integration_module.pot
rm -f rc.cpp
diff --git a/autoaway.cpp b/autoaway.cpp
index 3826f4b..c4d282d 100644
--- a/autoaway.cpp
+++ b/autoaway.cpp
@@ -27,7 +27,7 @@
#include <KConfig>
#include <KConfigGroup>
-#include <KTelepathy/global-presence.h>
+#include <KTp/global-presence.h>
AutoAway::AutoAway(KTp::GlobalPresence* globalPresence, QObject* parent)
: TelepathyKDEDModulePlugin(globalPresence, parent),
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 6505631..bd0b3f8 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -1,27 +1,27 @@
-set(telepathy_kded_module_config_SRCS
+set(kcm_ktp_integration_module_SRCS
column-resizer.cpp
telepathy-kded-config.cpp
)
-set(telepathy_kded_module_config_UI
+set(kcm_ktp_integration_module_UI
telepathy-kded-config.ui
)
-kde4_add_ui_files(telepathy_kded_module_config_SRCS \
${telepathy_kded_module_config_UI}) \
+kde4_add_ui_files(kcm_ktp_integration_module_SRCS ${kcm_ktp_integration_module_UI}) \
-kde4_add_plugin(kcm_telepathy_kded_module_config
- ${telepathy_kded_module_config_SRCS})
+kde4_add_plugin(kcm_ktp_integration_module
+ ${kcm_ktp_integration_module_SRCS})
-target_link_libraries(kcm_telepathy_kded_module_config ${KDE4_KDECORE_LIBS}
+target_link_libraries(kcm_ktp_integration_module ${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_KCMUTILS_LIBS}
${KDE4_KIO_LIBS}
)
-install(TARGETS kcm_telepathy_kded_module_config
+install(TARGETS kcm_ktp_integration_module
DESTINATION ${PLUGIN_INSTALL_DIR})
-install (FILES kcm_telepathy_kded_module_config.desktop
+install (FILES kcm_ktp_integration_module.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
diff --git a/config/kcm_ktp_integration_module.desktop \
b/config/kcm_ktp_integration_module.desktop new file mode 100644
index 0000000..5263cb2
--- /dev/null
+++ b/config/kcm_ktp_integration_module.desktop
@@ -0,0 +1,39 @@
+[Desktop Entry]
+Icon=preferences-other
+StartupNotify=true
+Terminal=false
+Type=Service
+X-KDE-ServiceTypes=KCModule
+X-DBUS-StartupType=
+X-KDE-HasReadOnlyMode=false
+X-KDE-Library=kcm_ktp_integration_module
+X-KDE-ParentApp=kcontrol
+X-KDE-SubstituteUID=false
+X-KDE-RootOnly=false
+X-KDE-System-Settings-Parent-Category=im-and-voip
+Categories=Qt;KDE;X-KDE-settings-network;
+
+Name=General
+Name[cs]=Obecné
+Name[da]=Generelt
+Name[de]=Allgemein
+Name[es]=General
+Name[hu]=Általános
+Name[it]=Generali
+Name[nds]=Allmeen
+Name[nl]=Algemeen
+Name[pt]=Geral
+Name[pt_BR]=Geral
+Name[sv]=Allmänt
+Name[uk]=Загальне
+Name[x-test]=xxGeneralxx
+Comment=General settings for Instant Messaging and VoIP
+Comment[da]=Generelle indstillinger for instant messaging og VoIP
+Comment[es]=Preferencias generales para mensajería instantánea y VoIP
+Comment[hu]=Az azonnali üzenetküldés és VoIP általános beállításai
+Comment[it]=Impostazioni generali per messaggistica e VoIP
+Comment[pt]=Configuração geral das Mensagens Instantâneas e VoIP
+Comment[pt_BR]=Configurações gerais de mensagens instantâneas e VoIP
+Comment[sv]=Allmänna inställningar för direktmeddelanden och Internettelefon
+Comment[uk]=Загальні параметри мереж спілкування \
та голосового інтернет-зв'язку +Comment[x-test]=xxGeneral \
settings for Instant Messaging and VoIPxx
diff --git a/contact-request-handler.cpp b/contact-request-handler.cpp
index 91b743f..13c9924 100644
--- a/contact-request-handler.cpp
+++ b/contact-request-handler.cpp
@@ -26,7 +26,7 @@
#include <TelepathyQt/PendingComposite>
#include <TelepathyQt/Account>
-#include <KTelepathy/error-dictionary.h>
+#include <KTp/error-dictionary.h>
#include <QtCore/QFutureWatcher>
diff --git a/error-handler.cpp b/error-handler.cpp
index fbecd19..9b54b91 100644
--- a/error-handler.cpp
+++ b/error-handler.cpp
@@ -23,7 +23,7 @@
#include <KNotification>
#include <KAboutData>
-#include <KTelepathy/error-dictionary.h>
+#include <KTp/error-dictionary.h>
ErrorHandler::ErrorHandler(const Tp::AccountManagerPtr& am, QObject* parent)
: QObject(parent)
diff --git a/kded_ktp_integration_module.desktop \
b/kded_ktp_integration_module.desktop new file mode 100644
index 0000000..670a15d
--- /dev/null
+++ b/kded_ktp_integration_module.desktop
@@ -0,0 +1,30 @@
+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=KDEDModule
+X-KDE-Library=ktp_integration_module
+X-KDE-DBus-ModuleName=ktp_integration_module
+X-KDE-Kded-autoload=true
+X-KDE-Kded-phase=2
+X-KDE-Kded-load-on-demand=false
+Name=Telepathy Integration Module
+Name[da]=Modul til Telepathy-integration
+Name[es]=Módulo de integración de Telepathy
+Name[hu]=Telepathy integrációs modul
+Name[it]=Modulo di integrazione con Telepathy
+Name[nl]=Integratiemodule van Telepathy
+Name[pt]=Módulo de Integração do Telepathy
+Name[pt_BR]=Módulo de integração do Telepathy
+Name[sv]=Integreringsmodul för Telepathy
+Name[uk]=Модуль інтеграції з Telepathy
+Name[x-test]=xxTelepathy Integration Modulexx
+Comment=Module providing deeper integration of Instant Messaging with KDE.
+Comment[da]=Modul som giver dybere integration af instant messaging i KDE
+Comment[es]=Módulo que proporciona una mayor integración de la mensajería \
instantánea con KDE. +Comment[hu]=A KDE és az azonnali üzenetküldés mélyebb \
integrációját biztosító modul. +Comment[it]=Modulo che fornisce una maggiore \
integrazione di messaggistica istantanea in KDE. +Comment[nl]=Deze module biedt een \
diepere integratie van Instant Messaging met KDE. +Comment[pt]=Um módulo que fornece \
maior integração com as Mensagens Instantâneas no KDE. +Comment[pt_BR]=Módulo que \
fornece uma maior integração com as mensagens instantâneas no KDE. \
+Comment[sv]=Modul som tillhandahåller bättre integrering av direktmeddelanden med \
KDE. +Comment[uk]=Модуль, який надає глибші можливості \
з інтеграції зі службами спілкування у KDE. \
+Comment[x-test]=xxModule providing deeper integration of Instant Messaging with \
KDE.xx
diff --git a/telepathy-kded-module-plugin.cpp b/telepathy-kded-module-plugin.cpp
index 4f2f99c..418e96a 100644
--- a/telepathy-kded-module-plugin.cpp
+++ b/telepathy-kded-module-plugin.cpp
@@ -20,7 +20,7 @@
#include "telepathy-kded-module-plugin.h"
-#include <KTelepathy/global-presence.h>
+#include <KTp/global-presence.h>
TelepathyKDEDModulePlugin::TelepathyKDEDModulePlugin(KTp::GlobalPresence* \
globalPresence, QObject* parent) : QObject(parent),
diff --git a/telepathy-module.cpp b/telepathy-module.cpp
index 54e1d77..955ceec 100644
--- a/telepathy-module.cpp
+++ b/telepathy-module.cpp
@@ -27,7 +27,7 @@
#include <TelepathyQt/PendingReady>
#include <TelepathyQt/Debug>
-#include <KTelepathy/global-presence.h>
+#include <KTp/global-presence.h>
#include "telepathy-mpris.h"
#include "autoaway.h"
@@ -38,7 +38,7 @@
#include "contact-request-handler.h"
K_PLUGIN_FACTORY(TelepathyModuleFactory, registerPlugin<TelepathyModule>(); )
-K_EXPORT_PLUGIN(TelepathyModuleFactory("telepathy_module", "telepathy-kded-module"))
+K_EXPORT_PLUGIN(TelepathyModuleFactory("ktp_integration_module", \
"kded_ktp_integration_module"))
TelepathyModule::TelepathyModule(QObject* parent, const QList<QVariant>& args)
: KDEDModule(parent)
diff --git a/telepathy-module.h b/telepathy-module.h
index b0a9f3b..05d8c38 100644
--- a/telepathy-module.h
+++ b/telepathy-module.h
@@ -24,7 +24,7 @@
#include <KDEDModule>
#include <TelepathyQt/AccountManager>
-#include <KTelepathy/presence.h>
+#include <KTp/presence.h>
class ContactRequestHandler;
namespace Tp {
diff --git a/telepathy-mpris.cpp b/telepathy-mpris.cpp
index 93fe531..8dae701 100644
--- a/telepathy-mpris.cpp
+++ b/telepathy-mpris.cpp
@@ -30,7 +30,7 @@
#include <TelepathyQt/AccountSet>
-#include <KTelepathy/global-presence.h>
+#include <KTp/global-presence.h>
TelepathyMPRIS::TelepathyMPRIS(KTp::GlobalPresence* globalPresence, QObject* parent)
: TelepathyKDEDModulePlugin(globalPresence, parent),
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic