From 513d0163e99d4447deb274b9f0799bb390f26cfc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 17 Feb 2013 02:31:04 -0600 Subject: Fix FTBFS --- tderesources/kolab/kabc/CMakeLists.txt | 4 ++-- tderesources/kolab/kabc/Makefile.am | 8 ++++---- tderesources/kolab/kabc/kolab.desktop | 2 +- tderesources/kolab/kabc/resourcekolab.cpp | 2 +- tderesources/kolab/kabc/resourcekolab_plugin.cpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tderesources/kolab') diff --git a/tderesources/kolab/kabc/CMakeLists.txt b/tderesources/kolab/kabc/CMakeLists.txt index cd1371256..f3a5596e6 100644 --- a/tderesources/kolab/kabc/CMakeLists.txt +++ b/tderesources/kolab/kabc/CMakeLists.txt @@ -35,9 +35,9 @@ install( RENAME imap.desktop ) -##### kabc_kolab (module) ####################### +##### tdeabc_kolab (module) ####################### -tde_add_kpart( kabc_kolab AUTOMOC +tde_add_kpart( tdeabc_kolab AUTOMOC SOURCES resourcekolab_plugin.cpp LINK kabckolab-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/tderesources/kolab/kabc/Makefile.am b/tderesources/kolab/kabc/Makefile.am index 483cff5ed..7b552e903 100644 --- a/tderesources/kolab/kabc/Makefile.am +++ b/tderesources/kolab/kabc/Makefile.am @@ -11,13 +11,13 @@ libkabckolab_la_LIBADD = \ $(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \ -ltderesources -lkabc -kde_module_LTLIBRARIES = kabc_kolab.la +kde_module_LTLIBRARIES = tdeabc_kolab.la noinst_HEADERS = resourcekolab.h contact.h -kabc_kolab_la_SOURCES = resourcekolab_plugin.cpp -kabc_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -kabc_kolab_la_LIBADD = libkabckolab.la +tdeabc_kolab_la_SOURCES = resourcekolab_plugin.cpp +tdeabc_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined +tdeabc_kolab_la_LIBADD = libkabckolab.la servicedir = $(kde_servicesdir)/tderesources/tdeabc service_DATA = kolab.desktop diff --git a/tderesources/kolab/kabc/kolab.desktop b/tderesources/kolab/kabc/kolab.desktop index e0a478c0a..6250176f4 100644 --- a/tderesources/kolab/kabc/kolab.desktop +++ b/tderesources/kolab/kabc/kolab.desktop @@ -45,7 +45,7 @@ Name[tr]=KMail Aracılığı ile IMAP Sunucusunda Adres Defteri Name[uk]=Адресна книга на сервері IMAP через KMail Name[zh_CN]=通过 KMail 访问 IMAP 服务器上的地址簿 Name[zh_TW]=透過 KMail 取得 IMAP 伺服器上的通訊錄 -X-TDE-Library=kabc_kolab +X-TDE-Library=tdeabc_kolab Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/kabc/resourcekolab.cpp index 246c0eec2..226d7da89 100644 --- a/tderesources/kolab/kabc/resourcekolab.cpp +++ b/tderesources/kolab/kabc/resourcekolab.cpp @@ -69,7 +69,7 @@ class KolabFactory : public KRES::PluginFactoryBase } }; -K_EXPORT_COMPONENT_FACTORY(kabc_kolab,KolabFactory) +K_EXPORT_COMPONENT_FACTORY(tdeabc_kolab,KolabFactory) static const char* s_kmailContentsType = "Contact"; static const char* s_attachmentMimeTypeContact = "application/x-vnd.kolab.contact"; diff --git a/tderesources/kolab/kabc/resourcekolab_plugin.cpp b/tderesources/kolab/kabc/resourcekolab_plugin.cpp index 55ac64205..686f3403e 100644 --- a/tderesources/kolab/kabc/resourcekolab_plugin.cpp +++ b/tderesources/kolab/kabc/resourcekolab_plugin.cpp @@ -48,5 +48,5 @@ class KolabFactory : public KRES::PluginFactoryBase } }; -K_EXPORT_COMPONENT_FACTORY(kabc_kolab,KolabFactory) +K_EXPORT_COMPONENT_FACTORY(tdeabc_kolab,KolabFactory) -- cgit v1.2.1