[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-i18n-doc
Subject: [telepathy-accounts-kcm] /: Rename accounts-kcm according to the
From: Martin Klapetek <martin.klapetek () gmail ! com>
Date: 2011-12-22 19:31:44
Message-ID: 20111222193144.B97DFA60A6 () git ! kde ! org
[Download RAW message or body]
Git commit 513e0a386a0f7166d22865d1f0c8be9771aafa61 by Martin Klapetek.
Committed on 22/12/2011 at 18:43.
Pushed by mklapetek into branch 'master'.
Rename accounts-kcm according to the new policy
Reviewed-by: Dario Freddi
REVIEW: 103502
CCMAIL: kde-i18n-doc@kde.org
M +3 -3 CMakeLists.txt
D +0 -36 cmake/modules/FindKTelepathy.cmake
A +36 -0 cmake/modules/FindKTp.cmake
M +9 -9 plugins/butterfly/CMakeLists.txt
R +2 -2 plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop [from: \
plugins/butterfly/kcmtelepathyaccounts_plugin_butterfly.desktop - 094% similarity] M \
+9 -9 plugins/gabble/CMakeLists.txt R +2 -2 \
plugins/gabble/ktpaccountskcm_plugin_gabble.desktop [from: \
plugins/gabble/kcmtelepathyaccounts_plugin_gabble.desktop - 096% similarity] M +9 \
-9 plugins/haze/CMakeLists.txt R +2 -2 \
plugins/haze/ktpaccountskcm_plugin_haze.desktop [from: \
plugins/haze/kcmtelepathyaccounts_plugin_haze.desktop - 096% similarity] M +9 -9 \
plugins/idle/CMakeLists.txt R +2 -2 \
plugins/idle/ktpaccountskcm_plugin_idle.desktop [from: \
plugins/idle/kcmtelepathyaccounts_plugin_idle.desktop - 094% similarity] M +9 -9 \
plugins/rakia/CMakeLists.txt R +2 -2 \
plugins/rakia/ktpaccountskcm_plugin_rakia.desktop [from: \
plugins/rakia/kcmtelepathyaccounts_plugin_rakia.desktop - 096% similarity] M +9 \
-9 plugins/salut/CMakeLists.txt R +2 -2 \
plugins/salut/ktpaccountskcm_plugin_salut.desktop [from: \
plugins/salut/kcmtelepathyaccounts_plugin_salut.desktop - 096% similarity] M +9 \
-9 plugins/sunshine/CMakeLists.txt R +2 -2 \
plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop [from: \
plugins/sunshine/kcmtelepathyaccounts_plugin_sunshine.desktop - 096% similarity] M \
+10 -10 src/CMakeLists.txt M +15 -15 src/KCMTelepathyAccounts/CMakeLists.txt
R +1 -1 src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop \
[from: src/KCMTelepathyAccounts/kcmtelepathyaccounts-accountuiplugin.desktop - 096% \
similarity] M +1 -1 src/Messages.sh
M +1 -1 src/account-item.cpp
M +1 -1 src/add-account-assistant.cpp
M +1 -1 src/edit-account-dialog.cpp
M +1 -1 src/kcm-telepathy-accounts.cpp
R +2 -2 src/kcm_ktp_accounts.desktop [from: src/kcm_telepathy_accounts.desktop \
- 097% similarity] M +1 -1 src/salut-message-widget.cpp
http://commits.kde.org/telepathy-accounts-kcm/513e0a386a0f7166d22865d1f0c8be9771aafa61
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a9aef2..61d17ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,13 @@
-project (telepathy-accounts-kcm)
+project (ktp-accounts-kcm)
# Add the modules we ship to the module path
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)
set(KDE_MIN_VERSION "4.7.0")
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)
diff --git a/cmake/modules/FindKTelepathy.cmake b/cmake/modules/FindKTelepathy.cmake
deleted file mode 100644
index c9aa9dc..0000000
--- a/cmake/modules/FindKTelepathy.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-# Try to find the KTelepathy library
-# KTELEPATHY_FOUND
-# KTELEPATHY_INCLUDE_DIR
-# KTELEPATHY_LIBRARIES
-# KTELEPATHY_MODELS_LIBRARIES
-
-# Copyright (c) 2011, Dario Freddi <drf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT IS_TELEPATHY_KDE_INTERNAL_MODULE)
- message (FATAL_ERROR "KTelepathy can be used just from internal components at \
this time")
-endif (NOT IS_TELEPATHY_KDE_INTERNAL_MODULE)
-
-SET (KTELEPATHY_FIND_REQUIRED ${KTelepathy_FIND_REQUIRED})
-if (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
- # Already in cache, be silent
- set(KTELEPATHY_FIND_QUIETLY TRUE)
-endif (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
-
-find_path(KTELEPATHY_INCLUDE_DIR
- NAMES KTelepathy/presence.h
- PATHS ${KDE4_INCLUDE_DIR}
-)
-
-find_library(KTELEPATHY_LIBRARIES NAMES telepathykdecommoninternalsprivate )
-find_library(KTELEPATHY_MODELS_LIBRARIES NAMES telepathykdemodelsprivate )
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTelepathy DEFAULT_MSG
- KTELEPATHY_LIBRARIES
- KTELEPATHY_MODELS_LIBRARIES
- KTELEPATHY_INCLUDE_DIR)
-
-mark_as_advanced(KTELEPATHY_INCLUDE_DIRS KTELEPATHY_LIBRARIES)
diff --git a/cmake/modules/FindKTp.cmake b/cmake/modules/FindKTp.cmake
new file mode 100644
index 0000000..899a120
--- /dev/null
+++ b/cmake/modules/FindKTp.cmake
@@ -0,0 +1,36 @@
+# Try to find the KTp library
+# KTP_FOUND
+# KTP_INCLUDE_DIR
+# KTP_LIBRARIES
+# KTP_MODELS_LIBRARIES
+
+# Copyright (c) 2011, Dario Freddi <drf@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (NOT IS_KTP_INTERNAL_MODULE)
+ message (FATAL_ERROR "KTp can be used just from internal components at this \
time") +endif (NOT IS_KTP_INTERNAL_MODULE)
+
+SET (KTP_FIND_REQUIRED ${KTp_FIND_REQUIRED})
+if (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
+ # Already in cache, be silent
+ set(KTP_FIND_QUIETLY TRUE)
+endif (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
+
+find_path(KTP_INCLUDE_DIR
+ NAMES KTp/presence.h
+ PATHS ${KDE4_INCLUDE_DIR}
+)
+
+find_library(KTP_LIBRARIES NAMES ktpcommoninternalsprivate )
+find_library(KTP_MODELS_LIBRARIES NAMES ktpmodelsprivate )
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTp DEFAULT_MSG
+ KTP_LIBRARIES
+ KTP_MODELS_LIBRARIES
+ KTP_INCLUDE_DIR)
+
+mark_as_advanced(KTP_INCLUDE_DIRS KTP_LIBRARIES)
diff --git a/plugins/butterfly/CMakeLists.txt b/plugins/butterfly/CMakeLists.txt
index 26859c9..7824e0c 100644
--- a/plugins/butterfly/CMakeLists.txt
+++ b/plugins/butterfly/CMakeLists.txt
@@ -1,36 +1,36 @@
-project (kcmtelepathyaccounts-plugin-butterfly)
+project (ktpaccountskcm-plugin-butterfly)
include_directories (${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
-set (kcmtelepathyaccounts_plugin_butterfly_SRCS
+set (ktpaccountskcm_plugin_butterfly_SRCS
butterfly-account-ui-plugin.cpp
butterfly-account-ui.cpp
main-options-widget.cpp
)
-kde4_add_ui_files (kcmtelepathyaccounts_plugin_butterfly_SRCS
+kde4_add_ui_files (ktpaccountskcm_plugin_butterfly_SRCS
main-options-widget.ui
)
-kde4_add_plugin (kcmtelepathyaccounts_plugin_butterfly
- ${kcmtelepathyaccounts_plugin_butterfly_SRCS}
+kde4_add_plugin (ktpaccountskcm_plugin_butterfly
+ ${ktpaccountskcm_plugin_butterfly_SRCS}
)
-target_link_libraries (kcmtelepathyaccounts_plugin_butterfly
- kcmtelepathyaccounts
+target_link_libraries (ktpaccountskcm_plugin_butterfly
+ ktpaccountskcminternal
${QT_LIBRARIES}
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
)
# Install:
-install (TARGETS kcmtelepathyaccounts_plugin_butterfly
+install (TARGETS ktpaccountskcm_plugin_butterfly
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-install (FILES kcmtelepathyaccounts_plugin_butterfly.desktop
+install (FILES ktpaccountskcm_plugin_butterfly.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
diff --git a/plugins/butterfly/kcmtelepathyaccounts_plugin_butterfly.desktop \
b/plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop similarity index 94%
rename from plugins/butterfly/kcmtelepathyaccounts_plugin_butterfly.desktop
rename to plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop
index 3df354a..9c74e82 100644
--- a/plugins/butterfly/kcmtelepathyaccounts_plugin_butterfly.desktop
+++ b/plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop
@@ -13,9 +13,9 @@ Comment[sv]=Användargränssnitt för anpassad kontoinställning av \
konton som a Comment[uk]=Інтерфейс користувача для \
нетипового налаштування облікового запису за \
допомогою керування з'єднаннями Butterfly. \
Comment[x-test]=xxCustom account configuration user interface for accounts using the \
Butterfly connection manager.xx Type=Service
-ServiceTypes=KCMTelepathyAccounts/AccountUiPlugin
+ServiceTypes=KTpAccountsKCM/AccountUiPlugin
-X-KDE-Library=kcmtelepathyaccounts_plugin_butterfly
+X-KDE-Library=ktpaccountskcm_plugin_butterfly
X-KDE-PluginInfo-Author=David Edmundson
X-KDE-PluginInfo-Email=kde@davidedmundson.co.uk
X-KDE-PluginInfo-Name=butterfly
diff --git a/plugins/gabble/CMakeLists.txt b/plugins/gabble/CMakeLists.txt
index 81ba67d..d979ad7 100644
--- a/plugins/gabble/CMakeLists.txt
+++ b/plugins/gabble/CMakeLists.txt
@@ -1,10 +1,10 @@
-project (kcmtelepathyaccounts-plugin-gabble)
+project (ktpaccountskcm-plugin-gabble)
include_directories (${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
-set (kcmtelepathyaccounts_plugin_gabble_SRCS
+set (ktpaccountskcm_plugin_gabble_SRCS
gabble-account-ui-plugin.cpp
gabble-account-ui.cpp
main-options-widget.cpp
@@ -14,7 +14,7 @@ set (kcmtelepathyaccounts_plugin_gabble_SRCS
proxy-settings-widget.cpp
)
-kde4_add_ui_files (kcmtelepathyaccounts_plugin_gabble_SRCS
+kde4_add_ui_files (ktpaccountskcm_plugin_gabble_SRCS
main-options-widget.ui
main-options-widget-googletalk.ui
main-options-widget-facebook.ui
@@ -22,23 +22,23 @@ kde4_add_ui_files (kcmtelepathyaccounts_plugin_gabble_SRCS
proxy-settings-widget.ui
)
-kde4_add_plugin (kcmtelepathyaccounts_plugin_gabble
- ${kcmtelepathyaccounts_plugin_gabble_SRCS}
+kde4_add_plugin (ktpaccountskcm_plugin_gabble
+ ${ktpaccountskcm_plugin_gabble_SRCS}
)
-target_link_libraries (kcmtelepathyaccounts_plugin_gabble
- kcmtelepathyaccounts
+target_link_libraries (ktpaccountskcm_plugin_gabble
+ ktpaccountskcminternal
${QT_LIBRARIES}
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
)
# Install:
-install (TARGETS kcmtelepathyaccounts_plugin_gabble
+install (TARGETS ktpaccountskcm_plugin_gabble
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-install (FILES kcmtelepathyaccounts_plugin_gabble.desktop
+install (FILES ktpaccountskcm_plugin_gabble.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
diff --git a/plugins/gabble/kcmtelepathyaccounts_plugin_gabble.desktop \
b/plugins/gabble/ktpaccountskcm_plugin_gabble.desktop similarity index 96%
rename from plugins/gabble/kcmtelepathyaccounts_plugin_gabble.desktop
rename to plugins/gabble/ktpaccountskcm_plugin_gabble.desktop
index 62c501c..fa2572a 100644
--- a/plugins/gabble/kcmtelepathyaccounts_plugin_gabble.desktop
+++ b/plugins/gabble/ktpaccountskcm_plugin_gabble.desktop
@@ -26,9 +26,9 @@ Name[sv]=Användargränssnitt för inställning av Gabble-konton
Name[uk]=Інтерфейс користувача для налаштування \
Gabble Name[x-test]=xxGabble Account Configuration User Interfacexx
Type=Service
-ServiceTypes=KCMTelepathyAccounts/AccountUiPlugin
+ServiceTypes=KTpAccountsKCM/AccountUiPlugin
-X-KDE-Library=kcmtelepathyaccounts_plugin_gabble
+X-KDE-Library=ktpaccountskcm_plugin_gabble
X-KDE-PluginInfo-Author=George Goldberg
X-KDE-PluginInfo-Email=george.goldberg@collabora.co.uk
X-KDE-PluginInfo-Name=gabble
diff --git a/plugins/haze/CMakeLists.txt b/plugins/haze/CMakeLists.txt
index dfedda5..c3f48cd 100644
--- a/plugins/haze/CMakeLists.txt
+++ b/plugins/haze/CMakeLists.txt
@@ -1,10 +1,10 @@
-project (kcmtelepathyaccounts-plugin-haze)
+project (ktpaccountskcm-plugin-haze)
include_directories (${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
-set (kcmtelepathyaccounts_plugin_haze_SRCS
+set (ktpaccountskcm_plugin_haze_SRCS
haze-account-ui-plugin.cpp
haze-icq-account.cpp
icq-main-options-widget.cpp
@@ -25,7 +25,7 @@ set (kcmtelepathyaccounts_plugin_haze_SRCS
haze-msn-account.cpp
)
-kde4_add_ui_files (kcmtelepathyaccounts_plugin_haze_SRCS
+kde4_add_ui_files (ktpaccountskcm_plugin_haze_SRCS
icq-main-options-widget.ui
icq-server-settings-widget.ui
myspaceim-main-options-widget.ui
@@ -39,22 +39,22 @@ kde4_add_ui_files (kcmtelepathyaccounts_plugin_haze_SRCS
msn-main-options-widget.ui
)
-kde4_add_plugin (kcmtelepathyaccounts_plugin_haze
- ${kcmtelepathyaccounts_plugin_haze_SRCS}
+kde4_add_plugin (ktpaccountskcm_plugin_haze
+ ${ktpaccountskcm_plugin_haze_SRCS}
)
-target_link_libraries (kcmtelepathyaccounts_plugin_haze
- kcmtelepathyaccounts
+target_link_libraries (ktpaccountskcm_plugin_haze
+ ktpaccountskcminternal
${QT_LIBRARIES}
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
)
# Install:
-install (TARGETS kcmtelepathyaccounts_plugin_haze
+install (TARGETS ktpaccountskcm_plugin_haze
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-install (FILES kcmtelepathyaccounts_plugin_haze.desktop
+install (FILES ktpaccountskcm_plugin_haze.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
diff --git a/plugins/haze/kcmtelepathyaccounts_plugin_haze.desktop \
b/plugins/haze/ktpaccountskcm_plugin_haze.desktop similarity index 96%
rename from plugins/haze/kcmtelepathyaccounts_plugin_haze.desktop
rename to plugins/haze/ktpaccountskcm_plugin_haze.desktop
index f044014..699940c 100644
--- a/plugins/haze/kcmtelepathyaccounts_plugin_haze.desktop
+++ b/plugins/haze/ktpaccountskcm_plugin_haze.desktop
@@ -26,9 +26,9 @@ Name[sv]=Användargränssnitt för inställning av Haze-konton
Name[uk]=Інтерфейс користувача для налаштування \
Haze Name[x-test]=xxHaze Account Configuration User Interfacexx
Type=Service
-ServiceTypes=KCMTelepathyAccounts/AccountUiPlugin
+ServiceTypes=KTpAccountsKCM/AccountUiPlugin
-X-KDE-Library=kcmtelepathyaccounts_plugin_haze
+X-KDE-Library=ktpaccountskcm_plugin_haze
X-KDE-PluginInfo-Author=Dominik Schmidt
X-KDE-PluginInfo-Email=kde@dominik-schmidt.de
X-KDE-PluginInfo-Name=haze
diff --git a/plugins/idle/CMakeLists.txt b/plugins/idle/CMakeLists.txt
index 3b91531..d6b1c91 100644
--- a/plugins/idle/CMakeLists.txt
+++ b/plugins/idle/CMakeLists.txt
@@ -1,37 +1,37 @@
-project (kcmtelepathyaccounts-plugin-idle)
+project (ktpaccountskcm-plugin-idle)
include_directories (${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
-set (kcmtelepathyaccounts_plugin_idle_SRCS
+set (ktpaccountskcm_plugin_idle_SRCS
idle-account-ui-plugin.cpp
idle-account-ui.cpp
main-options-widget.cpp
advanced-options-widget.cpp
)
-kde4_add_ui_files (kcmtelepathyaccounts_plugin_idle_SRCS
+kde4_add_ui_files (ktpaccountskcm_plugin_idle_SRCS
main-options-widget.ui
advanced-options-widget.ui
)
-kde4_add_plugin (kcmtelepathyaccounts_plugin_idle
- ${kcmtelepathyaccounts_plugin_idle_SRCS}
+kde4_add_plugin (ktpaccountskcm_plugin_idle
+ ${ktpaccountskcm_plugin_idle_SRCS}
)
-target_link_libraries (kcmtelepathyaccounts_plugin_idle
- kcmtelepathyaccounts
+target_link_libraries (ktpaccountskcm_plugin_idle
+ ktpaccountskcminternal
${QT_LIBRARIES}
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
)
# Install:
-install (TARGETS kcmtelepathyaccounts_plugin_idle
+install (TARGETS ktpaccountskcm_plugin_idle
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-install (FILES kcmtelepathyaccounts_plugin_idle.desktop
+install (FILES ktpaccountskcm_plugin_idle.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
diff --git a/plugins/idle/kcmtelepathyaccounts_plugin_idle.desktop \
b/plugins/idle/ktpaccountskcm_plugin_idle.desktop similarity index 94%
rename from plugins/idle/kcmtelepathyaccounts_plugin_idle.desktop
rename to plugins/idle/ktpaccountskcm_plugin_idle.desktop
index adf8078..5898b3e 100644
--- a/plugins/idle/kcmtelepathyaccounts_plugin_idle.desktop
+++ b/plugins/idle/ktpaccountskcm_plugin_idle.desktop
@@ -13,9 +13,9 @@ Comment[sv]=Användargränssnitt för anpassad kontoinställning av \
konton som a Comment[uk]=Інтерфейс користувача для \
нетипового налаштування облікового запису за \
допомогою керування з'єднаннями Idle. \
Comment[x-test]=xxCustom account configuration user interface for accounts using the \
Idle connection manager.xx Type=Service
-ServiceTypes=KCMTelepathyAccounts/AccountUiPlugin
+ServiceTypes=KTpAccountsKCM/AccountUiPlugin
-X-KDE-Library=kcmtelepathyaccounts_plugin_idle
+X-KDE-Library=ktpaccountskcm_plugin_idle
X-KDE-PluginInfo-Author=Lasse Liehu
X-KDE-PluginInfo-Email=lliehu@kolumbus.fi
X-KDE-PluginInfo-Name=idle
diff --git a/plugins/rakia/CMakeLists.txt b/plugins/rakia/CMakeLists.txt
index bfa8da7..421728c 100644
--- a/plugins/rakia/CMakeLists.txt
+++ b/plugins/rakia/CMakeLists.txt
@@ -1,38 +1,38 @@
-project (kcmtelepathyaccounts-plugin-rakia)
+project (ktpaccountskcm-plugin-rakia)
include_directories (${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
-set (kcmtelepathyaccounts_plugin_rakia_SRCS
+set (ktpaccountskcm_plugin_rakia_SRCS
rakia-account-ui-plugin.cpp
rakia-account-ui.cpp
rakia-main-options-widget.cpp
rakia-advanced-options-widget.cpp
)
-kde4_add_ui_files (kcmtelepathyaccounts_plugin_rakia_SRCS
+kde4_add_ui_files (ktpaccountskcm_plugin_rakia_SRCS
rakia-main-options-widget.ui
rakia-advanced-options-widget.ui
)
-kde4_add_plugin (kcmtelepathyaccounts_plugin_rakia
- ${kcmtelepathyaccounts_plugin_rakia_SRCS}
+kde4_add_plugin (ktpaccountskcm_plugin_rakia
+ ${ktpaccountskcm_plugin_rakia_SRCS}
)
-target_link_libraries (kcmtelepathyaccounts_plugin_rakia
- kcmtelepathyaccounts
+target_link_libraries (ktpaccountskcm_plugin_rakia
+ ktpaccountskcminternal
${QT_LIBRARIES}
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
)
# Install:
-install (TARGETS kcmtelepathyaccounts_plugin_rakia
+install (TARGETS ktpaccountskcm_plugin_rakia
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-install (FILES kcmtelepathyaccounts_plugin_rakia.desktop
+install (FILES ktpaccountskcm_plugin_rakia.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
diff --git a/plugins/rakia/kcmtelepathyaccounts_plugin_rakia.desktop \
b/plugins/rakia/ktpaccountskcm_plugin_rakia.desktop similarity index 96%
rename from plugins/rakia/kcmtelepathyaccounts_plugin_rakia.desktop
rename to plugins/rakia/ktpaccountskcm_plugin_rakia.desktop
index 906f1d6..eb77843 100644
--- a/plugins/rakia/kcmtelepathyaccounts_plugin_rakia.desktop
+++ b/plugins/rakia/ktpaccountskcm_plugin_rakia.desktop
@@ -26,9 +26,9 @@ Name[sv]=Användargränssnitt för inställning av \
Rakia/SofiaSIP-konton Name[uk]=Інтерфейс користувача для \
налаштування Rakia/SofiaSIP Name[x-test]=xxRakia/SofiaSIP Account \
Configuration User Interfacexx Type=Service
-ServiceTypes=KCMTelepathyAccounts/AccountUiPlugin
+ServiceTypes=KTpAccountsKCM/AccountUiPlugin
-X-KDE-Library=kcmtelepathyaccounts_plugin_rakia
+X-KDE-Library=ktpaccountskcm_plugin_rakia
X-KDE-PluginInfo-Author=Florian Reinhard
X-KDE-PluginInfo-Email=florian.reinhard@googlemail.com
X-KDE-PluginInfo-Name=rakia
diff --git a/plugins/salut/CMakeLists.txt b/plugins/salut/CMakeLists.txt
index 80da74f..77bc29f 100644
--- a/plugins/salut/CMakeLists.txt
+++ b/plugins/salut/CMakeLists.txt
@@ -1,38 +1,38 @@
-project (kcmtelepathyaccounts-plugin-salut)
+project (ktpaccountskcm-plugin-salut)
include_directories (${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
-set (kcmtelepathyaccounts_plugin_salut_SRCS
+set (ktpaccountskcm_plugin_salut_SRCS
salut-account-ui-plugin.cpp
salut-account-ui.cpp
salut-main-options-widget.cpp
salut-advanced-options-widget.cpp
)
-kde4_add_ui_files (kcmtelepathyaccounts_plugin_salut_SRCS
+kde4_add_ui_files (ktpaccountskcm_plugin_salut_SRCS
salut-main-options-widget.ui
salut-advanced-options-widget.ui
)
-kde4_add_plugin (kcmtelepathyaccounts_plugin_salut
- ${kcmtelepathyaccounts_plugin_salut_SRCS}
+kde4_add_plugin (ktpaccountskcm_plugin_salut
+ ${ktpaccountskcm_plugin_salut_SRCS}
)
-target_link_libraries (kcmtelepathyaccounts_plugin_salut
- kcmtelepathyaccounts
+target_link_libraries (ktpaccountskcm_plugin_salut
+ ktpaccountskcminternal
${QT_LIBRARIES}
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
)
# Install:
-install (TARGETS kcmtelepathyaccounts_plugin_salut
+install (TARGETS ktpaccountskcm_plugin_salut
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-install (FILES kcmtelepathyaccounts_plugin_salut.desktop
+install (FILES ktpaccountskcm_plugin_salut.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
diff --git a/plugins/salut/kcmtelepathyaccounts_plugin_salut.desktop \
b/plugins/salut/ktpaccountskcm_plugin_salut.desktop similarity index 96%
rename from plugins/salut/kcmtelepathyaccounts_plugin_salut.desktop
rename to plugins/salut/ktpaccountskcm_plugin_salut.desktop
index 98ea8e3..5ed9c0e 100644
--- a/plugins/salut/kcmtelepathyaccounts_plugin_salut.desktop
+++ b/plugins/salut/ktpaccountskcm_plugin_salut.desktop
@@ -26,9 +26,9 @@ Name[sv]=Användargränssnitt för inställning av Salut-konton
Name[uk]=Інтерфейс користувача для налаштування \
Salut Name[x-test]=xxSalut Account Configuration User Interfacexx
Type=Service
-ServiceTypes=KCMTelepathyAccounts/AccountUiPlugin
+ServiceTypes=KTpAccountsKCM/AccountUiPlugin
-X-KDE-Library=kcmtelepathyaccounts_plugin_salut
+X-KDE-Library=ktpaccountskcm_plugin_salut
X-KDE-PluginInfo-Author=Florian Reinhard
X-KDE-PluginInfo-Email=florian.reinhard@googlemail.com
X-KDE-PluginInfo-Name=salut
diff --git a/plugins/sunshine/CMakeLists.txt b/plugins/sunshine/CMakeLists.txt
index 0a08d7a..4dec46d 100644
--- a/plugins/sunshine/CMakeLists.txt
+++ b/plugins/sunshine/CMakeLists.txt
@@ -1,38 +1,38 @@
-project (kcmtelepathyaccounts-plugin-sunshine)
+project (ktpaccountskcm-plugin-sunshine)
include_directories (${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
-set (kcmtelepathyaccounts_plugin_sunshine_SRCS
+set (ktpaccountskcm_plugin_sunshine_SRCS
sunshine-account-ui-plugin.cpp
sunshine-account-ui.cpp
sunshine-main-options-widget.cpp
sunshine-advanced-options-widget.cpp
)
-kde4_add_ui_files (kcmtelepathyaccounts_plugin_sunshine_SRCS
+kde4_add_ui_files (ktpaccountskcm_plugin_sunshine_SRCS
sunshine-main-options-widget.ui
sunshine-advanced-options-widget.ui
)
-kde4_add_plugin (kcmtelepathyaccounts_plugin_sunshine
- ${kcmtelepathyaccounts_plugin_sunshine_SRCS}
+kde4_add_plugin (ktpaccountskcm_plugin_sunshine
+ ${ktpaccountskcm_plugin_sunshine_SRCS}
)
-target_link_libraries (kcmtelepathyaccounts_plugin_sunshine
- kcmtelepathyaccounts
+target_link_libraries (ktpaccountskcm_plugin_sunshine
+ ktpaccountskcminternal
${QT_LIBRARIES}
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
)
# Install:
-install (TARGETS kcmtelepathyaccounts_plugin_sunshine
+install (TARGETS ktpaccountskcm_plugin_sunshine
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-install (FILES kcmtelepathyaccounts_plugin_sunshine.desktop
+install (FILES ktpaccountskcm_plugin_sunshine.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
diff --git a/plugins/sunshine/kcmtelepathyaccounts_plugin_sunshine.desktop \
b/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop similarity index 96%
rename from plugins/sunshine/kcmtelepathyaccounts_plugin_sunshine.desktop
rename to plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop
index aceac75..67a02e9 100644
--- a/plugins/sunshine/kcmtelepathyaccounts_plugin_sunshine.desktop
+++ b/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop
@@ -26,9 +26,9 @@ Name[sv]=Användargränssnitt för inställning av Gadu-Gadukonton
Name[uk]=Інтерфейс користувача для налаштування \
Gadu-Gadu Name[x-test]=xxGadu-Gadu Account Configuration User Interfacexx
Type=Service
-ServiceTypes=KCMTelepathyAccounts/AccountUiPlugin
+ServiceTypes=KTpAccountsKCM/AccountUiPlugin
-X-KDE-Library=kcmtelepathyaccounts_plugin_sunshine
+X-KDE-Library=ktpaccountskcm_plugin_sunshine
X-KDE-PluginInfo-Author=Florian Reinhard
X-KDE-PluginInfo-Email=florian.reinhard@googlemail.com
X-KDE-PluginInfo-Name=sunshine
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 60542b2..0927028 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,9 +4,9 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
add_subdirectory (KCMTelepathyAccounts)
-project (telepathy-accounts-kcm)
+project (ktp-accounts-kcm)
-set (telepathy_accounts_kcm_SRCS
+set (kcm_ktp_accounts_SRCS
salut-enabler.cpp
salut-message-widget.cpp
kcm-telepathy-accounts.cpp
@@ -18,28 +18,28 @@ set (telepathy_accounts_kcm_SRCS
accounts-list-delegate.cpp
)
-kde4_add_ui_files (telepathy_accounts_kcm_SRCS
+kde4_add_ui_files (kcm_ktp_accounts_SRCS
main-widget.ui
)
-kde4_add_plugin (kcm_telepathy_accounts
- ${telepathy_accounts_kcm_SRCS}
+kde4_add_plugin (kcm_ktp_accounts
+ ${kcm_ktp_accounts_SRCS}
)
-target_link_libraries (kcm_telepathy_accounts
- kcmtelepathyaccounts
+target_link_libraries (kcm_ktp_accounts
+ ktpaccountskcminternal
${QT_LIBRARIES}
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
- ${KTELEPATHY_LIBRARIES}
+ ${KTP_LIBRARIES}
)
# Install:
-install (TARGETS kcm_telepathy_accounts
+install (TARGETS kcm_ktp_accounts
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-install (FILES kcm_telepathy_accounts.desktop
+install (FILES kcm_ktp_accounts.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
diff --git a/src/KCMTelepathyAccounts/CMakeLists.txt \
b/src/KCMTelepathyAccounts/CMakeLists.txt index 581edcf..0991b4d 100644
--- a/src/KCMTelepathyAccounts/CMakeLists.txt
+++ b/src/KCMTelepathyAccounts/CMakeLists.txt
@@ -1,4 +1,4 @@
-project (libkcmtelepathyaccounts)
+project (libktpaccountskcminternal)
include_directories (${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
@@ -6,7 +6,7 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
add_definitions (-DMAKE_KCM_TELEPATHY_ACCOUNTS_LIB)
-set (libkcmtelepathyaccounts_SRCS
+set (libktpaccountskcminternal_SRCS
abstract-account-ui-plugin.cpp
abstract-account-ui.cpp
abstract-account-parameters-widget.cpp
@@ -25,7 +25,7 @@ set (libkcmtelepathyaccounts_SRCS
validated-line-edit.cpp
)
-set (libkcmtelepathyaccounts_HDRS
+set (libktpaccountskcminternal_HDRS
abstract-account-ui-plugin.h
abstract-account-ui.h
abstract-account-parameters-widget.h
@@ -40,7 +40,7 @@ set (libkcmtelepathyaccounts_HDRS
validated-line-edit.h
)
-set (libkcmtelepathyaccounts_PRETTY_HDRS
+set (libktpaccountskcminternal_PRETTY_HDRS
AbstractAccountUiPlugin
AbstractAccountUi
AbstractAccountParametersWidget
@@ -56,48 +56,48 @@ set (libkcmtelepathyaccounts_PRETTY_HDRS
ValidatedLineEdit
)
-kde4_add_ui_files (libkcmtelepathyaccounts_SRCS
+kde4_add_ui_files (libktpaccountskcminternal_SRCS
account-edit-widget.ui
parameter-edit-widget.ui
profile-select-widget.ui
)
-kde4_add_library (kcmtelepathyaccounts
+kde4_add_library (ktpaccountskcminternal
SHARED
- ${libkcmtelepathyaccounts_SRCS}
+ ${libktpaccountskcminternal_SRCS}
)
-target_link_libraries (kcmtelepathyaccounts
+target_link_libraries (ktpaccountskcminternal
${QT_LIBRARIES}
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
)
-set_target_properties (kcmtelepathyaccounts PROPERTIES
+set_target_properties (ktpaccountskcminternal PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
if (MSVC)
- set_target_properties (kcmtelepathyaccounts PROPERTIES
- OUTPUT_NAME libkcmtelepathyaccounts
+ set_target_properties (ktpaccountskcminternal PROPERTIES
+ OUTPUT_NAME libktpaccountskcminternal
)
endif (MSVC)
# Install:
-install (TARGETS kcmtelepathyaccounts
+install (TARGETS ktpaccountskcminternal
${INSTALL_TARGETS_DEFAULT_ARGS}
)
#install (FILES
-# ${libkcmtelepathyaccounts_HDRS}
-# ${libkcmtelepathyaccounts_PRETTY_HDRS}
+# ${libktpaccountskcminternal_HDRS}
+# ${libktpaccountskcminternal_PRETTY_HDRS}
# kcm_telepathy_accounts_export.h
# DESTINATION ${INCLUDE_INSTALL_DIR}/KCMTelepathyAccounts COMPONENT Devel
#)
install (FILES
- kcmtelepathyaccounts-accountuiplugin.desktop
+ ktpaccountskcminternal-accountuiplugin.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR}
)
diff --git a/src/KCMTelepathyAccounts/kcmtelepathyaccounts-accountuiplugin.desktop \
b/src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop similarity \
index 96% rename from \
src/KCMTelepathyAccounts/kcmtelepathyaccounts-accountuiplugin.desktop rename to \
src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop index \
76ec85c..35457ae 100644
--- a/src/KCMTelepathyAccounts/kcmtelepathyaccounts-accountuiplugin.desktop
+++ b/src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=KCMTelepathyAccounts/AccountUiPlugin
+X-KDE-ServiceType=KTpAccountsKCM/AccountUiPlugin
Comment=Telepathy Accounts KCM Module Account User Interface Plugins
Comment[da]=Plugins til KCM-modul til kontobrugerflade til Telepathy-konti
diff --git a/src/Messages.sh b/src/Messages.sh
index 1bc181e..e17afc6 100644
--- a/src/Messages.sh
+++ b/src/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-accounts-kcm.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/kcm_ktp_accounts.pot
rm -f rc.cpp
diff --git a/src/account-item.cpp b/src/account-item.cpp
index 533cb6e..bb26b9e 100644
--- a/src/account-item.cpp
+++ b/src/account-item.cpp
@@ -23,7 +23,7 @@
#include "accounts-list-model.h"
#include "edit-account-dialog.h"
-#include <KTelepathy/error-dictionary.h>
+#include <KTp/error-dictionary.h>
#include <KApplication>
#include <KDebug>
diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index acd0a9c..dee6e88 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -22,7 +22,7 @@
#include "add-account-assistant.h"
-#include <KTelepathy/wallet-interface.h>
+#include <KTp/wallet-interface.h>
#include "KCMTelepathyAccounts/abstract-account-parameters-widget.h"
#include "KCMTelepathyAccounts/abstract-account-ui.h"
diff --git a/src/edit-account-dialog.cpp b/src/edit-account-dialog.cpp
index 96f3092..11c3199 100644
--- a/src/edit-account-dialog.cpp
+++ b/src/edit-account-dialog.cpp
@@ -21,7 +21,7 @@
#include "edit-account-dialog.h"
-#include <KTelepathy/wallet-interface.h>
+#include <KTp/wallet-interface.h>
#include "KCMTelepathyAccounts/dictionary.h"
#include "KCMTelepathyAccounts/abstract-account-parameters-widget.h"
diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 55d2853..fea2ab8 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -28,7 +28,7 @@
#include "edit-account-dialog.h"
#include "accounts-list-delegate.h"
-#include <KTelepathy/wallet-interface.h>
+#include <KTp/wallet-interface.h>
#include <QLabel>
#include <QSortFilterProxyModel>
diff --git a/src/kcm_telepathy_accounts.desktop b/src/kcm_ktp_accounts.desktop
similarity index 97%
rename from src/kcm_telepathy_accounts.desktop
rename to src/kcm_ktp_accounts.desktop
index cd20e22..4794e62 100644
--- a/src/kcm_telepathy_accounts.desktop
+++ b/src/kcm_ktp_accounts.desktop
@@ -1,12 +1,12 @@
[Desktop Entry]
Type=Service
-Exec=kcmshell4 kcm_telepathy_accounts
+Exec=kcmshell4 kcm_ktp_accounts
StartupNotify=true
Terminal=false
X-KDE-ServiceTypes=KCModule
X-DBUS-StartupType=
X-KDE-HasReadOnlyMode=false
-X-KDE-Library=kcm_telepathy_accounts
+X-KDE-Library=kcm_ktp_accounts
X-KDE-ParentApp=kcontrol
X-KDE-SubstituteUID=false
X-KDE-RootOnly=false
diff --git a/src/salut-message-widget.cpp b/src/salut-message-widget.cpp
index f419486..1596b57 100644
--- a/src/salut-message-widget.cpp
+++ b/src/salut-message-widget.cpp
@@ -20,7 +20,7 @@
#include "salut-message-widget.h"
-#include <KTelepathy/circular-countdown.h>
+#include <KTp/circular-countdown.h>
#include <KLocalizedString>
#include <KIcon>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic