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/d622f890dbaee58d7d09c0c2baaf5a= 217d295eba 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 #include = -#include +#include = 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_modul= e_config_UI}) +kde4_add_ui_files(kcm_ktp_integration_module_SRCS ${kcm_ktp_integration_mo= dule_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_LIB= S} ${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_int= egration_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=3Dpreferences-other +StartupNotify=3Dtrue +Terminal=3Dfalse +Type=3DService +X-KDE-ServiceTypes=3DKCModule +X-DBUS-StartupType=3D +X-KDE-HasReadOnlyMode=3Dfalse +X-KDE-Library=3Dkcm_ktp_integration_module +X-KDE-ParentApp=3Dkcontrol +X-KDE-SubstituteUID=3Dfalse +X-KDE-RootOnly=3Dfalse +X-KDE-System-Settings-Parent-Category=3Dim-and-voip +Categories=3DQt;KDE;X-KDE-settings-network; + +Name=3DGeneral +Name[cs]=3DObecn=C3=A9 +Name[da]=3DGenerelt +Name[de]=3DAllgemein +Name[es]=3DGeneral +Name[hu]=3D=C3=81ltal=C3=A1nos +Name[it]=3DGenerali +Name[nds]=3DAllmeen +Name[nl]=3DAlgemeen +Name[pt]=3DGeral +Name[pt_BR]=3DGeral +Name[sv]=3DAllm=C3=A4nt +Name[uk]=3D=D0=97=D0=B0=D0=B3=D0=B0=D0=BB=D1=8C=D0=BD=D0=B5 +Name[x-test]=3DxxGeneralxx +Comment=3DGeneral settings for Instant Messaging and VoIP +Comment[da]=3DGenerelle indstillinger for instant messaging og VoIP +Comment[es]=3DPreferencias generales para mensajer=C3=ADa instant=C3=A1nea= y VoIP +Comment[hu]=3DAz azonnali =C3=BCzenetk=C3=BCld=C3=A9s =C3=A9s VoIP =C3=A1l= tal=C3=A1nos be=C3=A1ll=C3=ADt=C3=A1sai +Comment[it]=3DImpostazioni generali per messaggistica e VoIP +Comment[pt]=3DConfigura=C3=A7=C3=A3o geral das Mensagens Instant=C3=A2neas= e VoIP +Comment[pt_BR]=3DConfigura=C3=A7=C3=B5es gerais de mensagens instant=C3=A2= neas e VoIP +Comment[sv]=3DAllm=C3=A4nna inst=C3=A4llningar f=C3=B6r direktmeddelanden = och Internettelefon +Comment[uk]=3D=D0=97=D0=B0=D0=B3=D0=B0=D0=BB=D1=8C=D0=BD=D1=96 =D0=BF=D0= =B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=B8 =D0=BC=D0=B5=D1=80=D0=B5=D0= =B6 =D1=81=D0=BF=D1=96=D0=BB=D0=BA=D1=83=D0=B2=D0=B0=D0=BD=D0=BD=D1=8F =D1= =82=D0=B0 =D0=B3=D0=BE=D0=BB=D0=BE=D1=81=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE =D1= =96=D0=BD=D1=82=D0=B5=D1=80=D0=BD=D0=B5=D1=82-=D0=B7=D0=B2=E2=80=99=D1=8F= =D0=B7=D0=BA=D1=83 +Comment[x-test]=3DxxGeneral 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 #include = -#include +#include = #include = 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 #include = -#include +#include = ErrorHandler::ErrorHandler(const Tp::AccountManagerPtr& am, QObject* paren= t) : QObject(parent) diff --git a/kded_ktp_integration_module.desktop b/kded_ktp_integration_mod= ule.desktop new file mode 100644 index 0000000..670a15d --- /dev/null +++ b/kded_ktp_integration_module.desktop @@ -0,0 +1,30 @@ +[Desktop Entry] +Type=3DService +X-KDE-ServiceTypes=3DKDEDModule +X-KDE-Library=3Dktp_integration_module +X-KDE-DBus-ModuleName=3Dktp_integration_module +X-KDE-Kded-autoload=3Dtrue +X-KDE-Kded-phase=3D2 +X-KDE-Kded-load-on-demand=3Dfalse +Name=3DTelepathy Integration Module +Name[da]=3DModul til Telepathy-integration +Name[es]=3DM=C3=B3dulo de integraci=C3=B3n de Telepathy +Name[hu]=3DTelepathy integr=C3=A1ci=C3=B3s modul +Name[it]=3DModulo di integrazione con Telepathy +Name[nl]=3DIntegratiemodule van Telepathy +Name[pt]=3DM=C3=B3dulo de Integra=C3=A7=C3=A3o do Telepathy +Name[pt_BR]=3DM=C3=B3dulo de integra=C3=A7=C3=A3o do Telepathy +Name[sv]=3DIntegreringsmodul f=C3=B6r Telepathy +Name[uk]=3D=D0=9C=D0=BE=D0=B4=D1=83=D0=BB=D1=8C =D1=96=D0=BD=D1=82=D0=B5= =D0=B3=D1=80=D0=B0=D1=86=D1=96=D1=97 =D0=B7 Telepathy +Name[x-test]=3DxxTelepathy Integration Modulexx +Comment=3DModule providing deeper integration of Instant Messaging with KD= E. +Comment[da]=3DModul som giver dybere integration af instant messaging i KDE +Comment[es]=3DM=C3=B3dulo que proporciona una mayor integraci=C3=B3n de la= mensajer=C3=ADa instant=C3=A1nea con KDE. +Comment[hu]=3DA KDE =C3=A9s az azonnali =C3=BCzenetk=C3=BCld=C3=A9s m=C3= =A9lyebb integr=C3=A1ci=C3=B3j=C3=A1t biztos=C3=ADt=C3=B3 modul. +Comment[it]=3DModulo che fornisce una maggiore integrazione di messaggisti= ca istantanea in KDE. +Comment[nl]=3DDeze module biedt een diepere integratie van Instant Messagi= ng met KDE. +Comment[pt]=3DUm m=C3=B3dulo que fornece maior integra=C3=A7=C3=A3o com as= Mensagens Instant=C3=A2neas no KDE. +Comment[pt_BR]=3DM=C3=B3dulo que fornece uma maior integra=C3=A7=C3=A3o co= m as mensagens instant=C3=A2neas no KDE. +Comment[sv]=3DModul som tillhandah=C3=A5ller b=C3=A4ttre integrering av di= rektmeddelanden med KDE. +Comment[uk]=3D=D0=9C=D0=BE=D0=B4=D1=83=D0=BB=D1=8C, =D1=8F=D0=BA=D0=B8=D0= =B9 =D0=BD=D0=B0=D0=B4=D0=B0=D1=94 =D0=B3=D0=BB=D0=B8=D0=B1=D1=88=D1=96 =D0= =BC=D0=BE=D0=B6=D0=BB=D0=B8=D0=B2=D0=BE=D1=81=D1=82=D1=96 =D0=B7 =D1=96=D0= =BD=D1=82=D0=B5=D0=B3=D1=80=D0=B0=D1=86=D1=96=D1=97 =D0=B7=D1=96 =D1=81=D0= =BB=D1=83=D0=B6=D0=B1=D0=B0=D0=BC=D0=B8 =D1=81=D0=BF=D1=96=D0=BB=D0=BA=D1= =83=D0=B2=D0=B0=D0=BD=D0=BD=D1=8F =D1=83 KDE. +Comment[x-test]=3DxxModule providing deeper integration of Instant Messagi= ng with KDE.xx diff --git a/telepathy-kded-module-plugin.cpp b/telepathy-kded-module-plugi= n.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 +#include = 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 #include = -#include +#include = #include "telepathy-mpris.h" #include "autoaway.h" @@ -38,7 +38,7 @@ #include "contact-request-handler.h" = K_PLUGIN_FACTORY(TelepathyModuleFactory, registerPlugin()= ; ) -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& a= rgs) : 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 = #include -#include +#include = 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 = -#include +#include = TelepathyMPRIS::TelepathyMPRIS(KTp::GlobalPresence* globalPresence, QObjec= t* parent) : TelepathyKDEDModulePlugin(globalPresence, parent),